aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-05 19:31:37 +0200
committerLoïc Hoguin <[email protected]>2014-04-05 19:31:37 +0200
commit3fc0e759e908bdf992c1f65f258be142e0bca6fa (patch)
tree5863982c16050b7ce2c7a5b652543a18593aeb18
parent840f46a42e83aaac41e6e988b85729ac0d14a123 (diff)
downloadesdl2-3fc0e759e908bdf992c1f65f258be142e0bca6fa.tar.gz
esdl2-3fc0e759e908bdf992c1f65f258be142e0bca6fa.tar.bz2
esdl2-3fc0e759e908bdf992c1f65f258be142e0bca6fa.zip
Add sdl_renderer:draw_rects/2
-rw-r--r--c_src/esdl2.h1
-rw-r--r--c_src/sdl_renderer.c42
-rw-r--r--src/esdl2.erl4
-rw-r--r--src/sdl_renderer.erl5
4 files changed, 52 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h
index 590cb4c..1dbc436 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -178,6 +178,7 @@
F(render_draw_point, 3) \
F(render_draw_points, 2) \
F(render_draw_rect, 5) \
+ F(render_draw_rects, 2) \
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 d022d6a..9891290 100644
--- a/c_src/sdl_renderer.c
+++ b/c_src/sdl_renderer.c
@@ -521,6 +521,48 @@ NIF_FUNCTION(render_draw_rect)
NIF_RES_GET(Renderer, renderer_res), x, y, w, h);
}
+// render_draw_rects
+
+NIF_CALL_HANDLER(thread_render_draw_rects)
+{
+ int ret;
+
+ ret = SDL_RenderDrawRects(args[0], args[1], (long)args[2]);
+
+ enif_free(args[1]);
+
+ if (ret)
+ return sdl_error_tuple(env);
+
+ return atom_ok;
+}
+
+NIF_FUNCTION(render_draw_rects)
+{
+ void* renderer_res;
+ unsigned int len;
+ SDL_Rect* rects;
+ ERL_NIF_TERM list, head;
+ int i = 0;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Renderer, &renderer_res));
+ BADARG_IF(!enif_get_list_length(env, argv[1], &len));
+ BADARG_IF(len < 2);
+
+ rects = (SDL_Rect*)enif_alloc(len * sizeof(SDL_Rect));
+
+ list = argv[1];
+ while (enif_get_list_cell(env, list, &head, &list)) {
+ if (!map_to_rect(env, head, &(rects[i++]))) {
+ enif_free(rects);
+ return enif_make_badarg(env);
+ }
+ }
+
+ return nif_thread_call(env, thread_render_draw_rects, 3,
+ NIF_RES_GET(Renderer, renderer_res), rects, len);
+}
+
// render_present
NIF_CAST_HANDLER(thread_render_present)
diff --git a/src/esdl2.erl b/src/esdl2.erl
index 414fb2d..405583f 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -66,6 +66,7 @@
-export([render_draw_point/3]).
-export([render_draw_points/2]).
-export([render_draw_rect/5]).
+-export([render_draw_rects/2]).
-export([render_present/1]).
-export([render_set_logical_size/3]).
-export([set_render_draw_color/5]).
@@ -253,6 +254,9 @@ render_draw_points(_, _) ->
render_draw_rect(_, _, _, _, _) ->
erlang:nif_error({not_loaded, ?MODULE}).
+render_draw_rects(_, _) ->
+ 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 43a3359..450a9cf 100644
--- a/src/sdl_renderer.erl
+++ b/src/sdl_renderer.erl
@@ -31,6 +31,7 @@
-export([draw_points/2]).
-export([draw_rect/2]).
-export([draw_rect/5]).
+-export([draw_rects/2]).
-export([present/1]).
-export([set_draw_color/5]).
-export([set_logical_size/3]).
@@ -109,6 +110,10 @@ draw_rect(Renderer, X, Y, W, H) ->
esdl2:render_draw_rect(Renderer, X, Y, W, H),
receive {'_nif_thread_ret_', Ret} -> Ret end.
+draw_rects(Renderer, Rects) ->
+ esdl2:render_draw_rects(Renderer, Rects),
+ receive {'_nif_thread_ret_', Ret} -> Ret end.
+
present(Renderer) ->
esdl2:render_present(Renderer).