From 57a5de4074651269f289f23dcc691db70d1c92d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 5 Apr 2014 20:03:58 +0200 Subject: Add sdl_renderer:fill_rect/{2,5} --- c_src/esdl2.h | 1 + c_src/sdl_renderer.c | 27 +++++++++++++++++++++++++++ src/esdl2.erl | 4 ++++ src/sdl_renderer.erl | 9 +++++++++ 4 files changed, 41 insertions(+) diff --git a/c_src/esdl2.h b/c_src/esdl2.h index 1dbc436..e57da47 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -179,6 +179,7 @@ F(render_draw_points, 2) \ F(render_draw_rect, 5) \ F(render_draw_rects, 2) \ + F(render_fill_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 9891290..3a43dd9 100644 --- a/c_src/sdl_renderer.c +++ b/c_src/sdl_renderer.c @@ -563,6 +563,33 @@ NIF_FUNCTION(render_draw_rects) NIF_RES_GET(Renderer, renderer_res), rects, len); } +// render_fill_rect + +NIF_CALL_HANDLER(thread_render_fill_rect) +{ + SDL_Rect rect = {(long)args[1], (long)args[2], (long)args[3], (long)args[4]}; + + if (SDL_RenderFillRect(args[0], &rect)) + return sdl_error_tuple(env); + + return atom_ok; +} + +NIF_FUNCTION(render_fill_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_fill_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 405583f..8063aae 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -67,6 +67,7 @@ -export([render_draw_points/2]). -export([render_draw_rect/5]). -export([render_draw_rects/2]). +-export([render_fill_rect/5]). -export([render_present/1]). -export([render_set_logical_size/3]). -export([set_render_draw_color/5]). @@ -257,6 +258,9 @@ render_draw_rect(_, _, _, _, _) -> render_draw_rects(_, _) -> erlang:nif_error({not_loaded, ?MODULE}). +render_fill_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 450a9cf..15abc40 100644 --- a/src/sdl_renderer.erl +++ b/src/sdl_renderer.erl @@ -32,6 +32,8 @@ -export([draw_rect/2]). -export([draw_rect/5]). -export([draw_rects/2]). +-export([fill_rect/2]). +-export([fill_rect/5]). -export([present/1]). -export([set_draw_color/5]). -export([set_logical_size/3]). @@ -114,6 +116,13 @@ draw_rects(Renderer, Rects) -> esdl2:render_draw_rects(Renderer, Rects), receive {'_nif_thread_ret_', Ret} -> Ret end. +fill_rect(Renderer, #{x:=X, y:=Y, w:=W, h:=H}) -> + fill_rect(Renderer, X, Y, W, H). + +fill_rect(Renderer, X, Y, W, H) -> + esdl2:render_fill_rect(Renderer, X, Y, W, H), + receive {'_nif_thread_ret_', Ret} -> Ret end. + present(Renderer) -> esdl2:render_present(Renderer). -- cgit v1.2.3