aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-05 19:22:57 +0200
committerLoïc Hoguin <[email protected]>2014-04-05 19:22:57 +0200
commit840f46a42e83aaac41e6e988b85729ac0d14a123 (patch)
tree104dfdfd213b5e10aac03f801200c5aec88e7da8
parent98b8a886c7f624cb6efb465a61197eaa3ede10e9 (diff)
downloadesdl2-840f46a42e83aaac41e6e988b85729ac0d14a123.tar.gz
esdl2-840f46a42e83aaac41e6e988b85729ac0d14a123.tar.bz2
esdl2-840f46a42e83aaac41e6e988b85729ac0d14a123.zip
Add sdl_renderer:draw_rect/{2,5}
-rw-r--r--c_src/esdl2.h1
-rw-r--r--c_src/sdl_renderer.c27
-rw-r--r--src/esdl2.erl4
-rw-r--r--src/sdl_renderer.erl9
4 files changed, 41 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h
index 6814280..590cb4c 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -177,6 +177,7 @@
F(render_draw_lines, 2) \
F(render_draw_point, 3) \
F(render_draw_points, 2) \
+ F(render_draw_rect, 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 12bbb67..d022d6a 100644
--- a/c_src/sdl_renderer.c
+++ b/c_src/sdl_renderer.c
@@ -494,6 +494,33 @@ NIF_FUNCTION(render_draw_points)
NIF_RES_GET(Renderer, renderer_res), points, len);
}
+// render_draw_rect
+
+NIF_CALL_HANDLER(thread_render_draw_rect)
+{
+ SDL_Rect rect = {(long)args[1], (long)args[2], (long)args[3], (long)args[4]};
+
+ if (SDL_RenderDrawRect(args[0], &rect))
+ return sdl_error_tuple(env);
+
+ return atom_ok;
+}
+
+NIF_FUNCTION(render_draw_rect)
+{
+ void* renderer_res;
+ int x, y, w, h;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Renderer, &renderer_res));
+ BADARG_IF(!enif_get_int(env, argv[1], &x));
+ BADARG_IF(!enif_get_int(env, argv[2], &y));
+ BADARG_IF(!enif_get_int(env, argv[3], &w));
+ BADARG_IF(!enif_get_int(env, argv[4], &h));
+
+ return nif_thread_call(env, thread_render_draw_rect, 5,
+ NIF_RES_GET(Renderer, renderer_res), x, y, w, h);
+}
+
// render_present
NIF_CAST_HANDLER(thread_render_present)
diff --git a/src/esdl2.erl b/src/esdl2.erl
index 681aa4d..414fb2d 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -65,6 +65,7 @@
-export([render_draw_lines/2]).
-export([render_draw_point/3]).
-export([render_draw_points/2]).
+-export([render_draw_rect/5]).
-export([render_present/1]).
-export([render_set_logical_size/3]).
-export([set_render_draw_color/5]).
@@ -249,6 +250,9 @@ render_draw_point(_, _, _) ->
render_draw_points(_, _) ->
erlang:nif_error({not_loaded, ?MODULE}).
+render_draw_rect(_, _, _, _, _) ->
+ 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 de55652..43a3359 100644
--- a/src/sdl_renderer.erl
+++ b/src/sdl_renderer.erl
@@ -29,6 +29,8 @@
-export([draw_point/2]).
-export([draw_point/3]).
-export([draw_points/2]).
+-export([draw_rect/2]).
+-export([draw_rect/5]).
-export([present/1]).
-export([set_draw_color/5]).
-export([set_logical_size/3]).
@@ -100,6 +102,13 @@ draw_points(Renderer, Points) ->
esdl2:render_draw_points(Renderer, Points),
receive {'_nif_thread_ret_', Ret} -> Ret end.
+draw_rect(Renderer, #{x:=X, y:=Y, w:=W, h:=H}) ->
+ draw_rect(Renderer, X, Y, W, H).
+
+draw_rect(Renderer, X, Y, W, H) ->
+ esdl2:render_draw_rect(Renderer, X, Y, W, H),
+ receive {'_nif_thread_ret_', Ret} -> Ret end.
+
present(Renderer) ->
esdl2:render_present(Renderer).