aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-05 20:06:08 +0200
committerLoïc Hoguin <[email protected]>2014-04-05 20:06:08 +0200
commit32f1051596d1d60551c2a15b4c6bec66f6832145 (patch)
tree37523f2cc91ec9c454f45c5ed00a9d748b8de3f6
parent57a5de4074651269f289f23dcc691db70d1c92d4 (diff)
downloadesdl2-32f1051596d1d60551c2a15b4c6bec66f6832145.tar.gz
esdl2-32f1051596d1d60551c2a15b4c6bec66f6832145.tar.bz2
esdl2-32f1051596d1d60551c2a15b4c6bec66f6832145.zip
Add sdl_renderer:fill_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 e57da47..4bb1c91 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -180,6 +180,7 @@
F(render_draw_rect, 5) \
F(render_draw_rects, 2) \
F(render_fill_rect, 5) \
+ F(render_fill_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 3a43dd9..e036c12 100644
--- a/c_src/sdl_renderer.c
+++ b/c_src/sdl_renderer.c
@@ -590,6 +590,48 @@ NIF_FUNCTION(render_fill_rect)
NIF_RES_GET(Renderer, renderer_res), x, y, w, h);
}
+// render_fill_rects
+
+NIF_CALL_HANDLER(thread_render_fill_rects)
+{
+ int ret;
+
+ ret = SDL_RenderFillRects(args[0], args[1], (long)args[2]);
+
+ enif_free(args[1]);
+
+ if (ret)
+ return sdl_error_tuple(env);
+
+ return atom_ok;
+}
+
+NIF_FUNCTION(render_fill_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_fill_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 8063aae..c71e7de 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -68,6 +68,7 @@
-export([render_draw_rect/5]).
-export([render_draw_rects/2]).
-export([render_fill_rect/5]).
+-export([render_fill_rects/2]).
-export([render_present/1]).
-export([render_set_logical_size/3]).
-export([set_render_draw_color/5]).
@@ -261,6 +262,9 @@ render_draw_rects(_, _) ->
render_fill_rect(_, _, _, _, _) ->
erlang:nif_error({not_loaded, ?MODULE}).
+render_fill_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 15abc40..4f02c65 100644
--- a/src/sdl_renderer.erl
+++ b/src/sdl_renderer.erl
@@ -34,6 +34,7 @@
-export([draw_rects/2]).
-export([fill_rect/2]).
-export([fill_rect/5]).
+-export([fill_rects/2]).
-export([present/1]).
-export([set_draw_color/5]).
-export([set_logical_size/3]).
@@ -123,6 +124,10 @@ fill_rect(Renderer, X, Y, W, H) ->
esdl2:render_fill_rect(Renderer, X, Y, W, H),
receive {'_nif_thread_ret_', Ret} -> Ret end.
+fill_rects(Renderer, Rects) ->
+ esdl2:render_fill_rects(Renderer, Rects),
+ receive {'_nif_thread_ret_', Ret} -> Ret end.
+
present(Renderer) ->
esdl2:render_present(Renderer).