diff options
| author | Loïc Hoguin <[email protected]> | 2014-04-04 21:54:01 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-04-04 21:54:01 +0200 |
| commit | 372f50eb8c9d4ea9e7e9ff78a76b8320e8acd018 (patch) | |
| tree | 39fa7f11fbac1b8a47b252373c3b145052703be9 | |
| parent | be44046850adf018e648752571247115638df75b (diff) | |
| download | esdl2-372f50eb8c9d4ea9e7e9ff78a76b8320e8acd018.tar.gz esdl2-372f50eb8c9d4ea9e7e9ff78a76b8320e8acd018.tar.bz2 esdl2-372f50eb8c9d4ea9e7e9ff78a76b8320e8acd018.zip | |
Add sdl_renderer:draw_line/{3,5}
| -rw-r--r-- | c_src/esdl2.h | 1 | ||||
| -rw-r--r-- | c_src/sdl_renderer.c | 25 | ||||
| -rw-r--r-- | src/esdl2.erl | 4 | ||||
| -rw-r--r-- | src/sdl_renderer.erl | 9 |
4 files changed, 39 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h index 6dbc43f..8899602 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -173,6 +173,7 @@ F(render_clear, 1) \ F(render_copy, 4) \ F(render_copy_ex, 7) \ + F(render_draw_line, 5) \ F(render_present, 1) \ F(render_set_logical_size, 3) \ F(set_render_draw_color, 5) \ diff --git a/c_src/sdl_renderer.c b/c_src/sdl_renderer.c index 5fa9628..2d6c319 100644 --- a/c_src/sdl_renderer.c +++ b/c_src/sdl_renderer.c @@ -362,6 +362,31 @@ render_copy_ex_badarg: return enif_make_badarg(env); } +// render_draw_line + +NIF_CALL_HANDLER(thread_render_draw_line) +{ + if (SDL_RenderDrawLine(args[0], (long)args[1], (long)args[2], (long)args[3], (long)args[4])) + return sdl_error_tuple(env); + + return atom_ok; +} + +NIF_FUNCTION(render_draw_line) +{ + void* renderer_res; + int x1, y1, x2, y2; + + BADARG_IF(!enif_get_resource(env, argv[0], res_Renderer, &renderer_res)); + BADARG_IF(!enif_get_int(env, argv[1], &x1)); + BADARG_IF(!enif_get_int(env, argv[2], &y1)); + BADARG_IF(!enif_get_int(env, argv[3], &x2)); + BADARG_IF(!enif_get_int(env, argv[4], &y2)); + + return nif_thread_call(env, thread_render_draw_line, 5, + NIF_RES_GET(Renderer, renderer_res), x1, y1, x2, y2); +} + // render_present NIF_CAST_HANDLER(thread_render_present) diff --git a/src/esdl2.erl b/src/esdl2.erl index e9bca0f..6f38c3b 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -61,6 +61,7 @@ -export([render_clear/1]). -export([render_copy/4]). -export([render_copy_ex/7]). +-export([render_draw_line/5]). -export([render_present/1]). -export([render_set_logical_size/3]). -export([set_render_draw_color/5]). @@ -233,6 +234,9 @@ render_copy(_, _, _, _) -> render_copy_ex(_, _, _, _, _, _, _) -> erlang:nif_error({not_loaded, ?MODULE}). +render_draw_line(_, _, _, _, _) -> + erlang:nif_error({not_loaded, ?MODULE}). + render_present(_) -> erlang:nif_error({not_loaded, ?MODULE}). diff --git a/src/sdl_renderer.erl b/src/sdl_renderer.erl index 3994ab7..624b296 100644 --- a/src/sdl_renderer.erl +++ b/src/sdl_renderer.erl @@ -23,6 +23,8 @@ -export([copy/2]). -export([copy/4]). -export([copy/7]). +-export([draw_line/3]). +-export([draw_line/5]). -export([present/1]). -export([set_draw_color/5]). -export([set_logical_size/3]). @@ -72,6 +74,13 @@ copy(Renderer, Texture, SrcRect, DstRect, Angle, CenterPoint, FlipFlags) -> esdl2:render_copy_ex(Renderer, Texture, SrcRect, DstRect, Angle, CenterPoint, FlipFlags), receive {'_nif_thread_ret_', Ret} -> Ret end. +draw_line(Renderer, #{x:=X1, y:=Y1}, #{x:=X2, y:=Y2}) -> + draw_line(Renderer, X1, Y1, X2, Y2). + +draw_line(Renderer, X1, Y1, X2, Y2) -> + esdl2:render_draw_line(Renderer, X1, Y1, X2, Y2), + receive {'_nif_thread_ret_', Ret} -> Ret end. + present(Renderer) -> esdl2:render_present(Renderer). |