From 274263806ecd80d6d87ea8d771eacd72128734cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 7 Apr 2014 17:16:58 +0200 Subject: Add sdl_renderer:set_viewport/{2,5} --- c_src/esdl2.h | 1 + c_src/sdl_renderer.c | 27 +++++++++++++++++++++++++++ src/esdl2.erl | 4 ++++ src/sdl_renderer.erl | 12 ++++++++++-- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/c_src/esdl2.h b/c_src/esdl2.h index 021d5bb..e335ae3 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -189,6 +189,7 @@ F(render_set_clip_rect, 5) \ F(render_set_logical_size, 3) \ F(render_set_scale, 3) \ + F(render_set_viewport, 5) \ F(set_render_draw_color, 5) \ /* sdl_surface */ \ F(img_load, 1) \ diff --git a/c_src/sdl_renderer.c b/c_src/sdl_renderer.c index 85432c2..c7354c7 100644 --- a/c_src/sdl_renderer.c +++ b/c_src/sdl_renderer.c @@ -848,6 +848,33 @@ NIF_FUNCTION(render_set_scale) NIF_RES_GET(Renderer, renderer_res), scaleXPtr, scaleYPtr); } +// render_set_viewport + +NIF_CALL_HANDLER(thread_render_set_viewport) +{ + SDL_Rect rect = {(long)args[1], (long)args[2], (long)args[3], (long)args[4]}; + + if (SDL_RenderSetViewport(args[0], &rect)) + return sdl_error_tuple(env); + + return atom_ok; +} + +NIF_FUNCTION(render_set_viewport) +{ + 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_set_viewport, 5, + NIF_RES_GET(Renderer, renderer_res), x, y, w, h); +} + // set_render_draw_color NIF_CALL_HANDLER(thread_set_render_draw_color) diff --git a/src/esdl2.erl b/src/esdl2.erl index e3815c6..61ca09c 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -77,6 +77,7 @@ -export([render_set_clip_rect/5]). -export([render_set_logical_size/3]). -export([render_set_scale/3]). +-export([render_set_viewport/5]). -export([set_render_draw_color/5]). %% sdl_surface @@ -295,6 +296,9 @@ render_set_logical_size(_, _, _) -> render_set_scale(_, _, _) -> erlang:nif_error({not_loaded, ?MODULE}). +render_set_viewport(_, _, _, _, _) -> + erlang:nif_error({not_loaded, ?MODULE}). + set_render_draw_color(_, _, _, _, _) -> erlang:nif_error({not_loaded, ?MODULE}). diff --git a/src/sdl_renderer.erl b/src/sdl_renderer.erl index fbe2518..12ca9bf 100644 --- a/src/sdl_renderer.erl +++ b/src/sdl_renderer.erl @@ -45,6 +45,8 @@ -export([set_draw_color/5]). -export([set_logical_size/3]). -export([set_scale/3]). +-export([set_viewport/2]). +-export([set_viewport/5]). clear(Renderer) -> esdl2:render_clear(Renderer), @@ -155,8 +157,7 @@ present(Renderer) -> esdl2:render_present(Renderer). set_clip_rect(Renderer, #{x:=X, y:=Y, w:=W, h:=H}) -> - esdl2:render_set_clip_rect(Renderer, X, Y, W, H), - receive {'_nif_thread_ret_', Ret} -> Ret end. + set_clip_rect(Renderer, X, Y, W, H). set_clip_rect(Renderer, X, Y, W, H) -> esdl2:render_set_clip_rect(Renderer, X, Y, W, H), @@ -173,3 +174,10 @@ set_logical_size(Renderer, W, H) -> set_scale(Renderer, ScaleX, ScaleY) -> esdl2:render_set_scale(Renderer, ScaleX, ScaleY), receive {'_nif_thread_ret_', Ret} -> Ret end. + +set_viewport(Renderer, #{x:=X, y:=Y, w:=W, h:=H}) -> + set_viewport(Renderer, X, Y, W, H). + +set_viewport(Renderer, X, Y, W, H) -> + esdl2:render_set_viewport(Renderer, X, Y, W, H), + receive {'_nif_thread_ret_', Ret} -> Ret end. -- cgit v1.2.3