aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-07 13:39:09 +0200
committerLoïc Hoguin <[email protected]>2014-04-07 13:39:09 +0200
commit1a7bc88088c43d7945ec303ae199e6eaa3e1dddd (patch)
treeec8908268986b98987c364c6dd902de0e3166a61
parent515c01af51fef104665bb29b75abf954a5b35601 (diff)
downloadesdl2-1a7bc88088c43d7945ec303ae199e6eaa3e1dddd.tar.gz
esdl2-1a7bc88088c43d7945ec303ae199e6eaa3e1dddd.tar.bz2
esdl2-1a7bc88088c43d7945ec303ae199e6eaa3e1dddd.zip
Add sdl_renderer:get_scale/1
-rw-r--r--c_src/esdl2.h1
-rw-r--r--c_src/sdl_renderer.c25
-rw-r--r--src/esdl2.erl4
-rw-r--r--src/sdl_renderer.erl5
4 files changed, 35 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h
index 2f5a392..d75caf3 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -183,6 +183,7 @@
F(render_fill_rects, 2) \
F(render_get_clip_rect, 1) \
F(render_get_logical_size, 1) \
+ F(render_get_scale, 1) \
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 547f0ca..32a4928 100644
--- a/c_src/sdl_renderer.c
+++ b/c_src/sdl_renderer.c
@@ -686,6 +686,31 @@ NIF_FUNCTION(render_get_logical_size)
NIF_RES_GET(Renderer, renderer_res));
}
+// render_get_scale
+
+NIF_CALL_HANDLER(thread_render_get_scale)
+{
+ SDL_Rect rect;
+ float scaleX, scaleY;
+
+ SDL_RenderGetScale(args[0], &scaleX, &scaleY);
+
+ return enif_make_tuple2(env,
+ enif_make_double(env, scaleX),
+ enif_make_double(env, scaleY)
+ );
+}
+
+NIF_FUNCTION(render_get_scale)
+{
+ void* renderer_res;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Renderer, &renderer_res));
+
+ return nif_thread_call(env, thread_render_get_scale, 1,
+ NIF_RES_GET(Renderer, renderer_res));
+}
+
// render_present
NIF_CAST_HANDLER(thread_render_present)
diff --git a/src/esdl2.erl b/src/esdl2.erl
index c214ba9..b5491f6 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -71,6 +71,7 @@
-export([render_fill_rects/2]).
-export([render_get_clip_rect/1]).
-export([render_get_logical_size/1]).
+-export([render_get_scale/1]).
-export([render_present/1]).
-export([render_set_logical_size/3]).
-export([set_render_draw_color/5]).
@@ -273,6 +274,9 @@ render_get_clip_rect(_) ->
render_get_logical_size(_) ->
erlang:nif_error({not_loaded, ?MODULE}).
+render_get_scale(_) ->
+ 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 0d8622f..f31ea3e 100644
--- a/src/sdl_renderer.erl
+++ b/src/sdl_renderer.erl
@@ -37,6 +37,7 @@
-export([fill_rects/2]).
-export([get_clip_rect/1]).
-export([get_logical_size/1]).
+-export([get_scale/1]).
-export([present/1]).
-export([set_draw_color/5]).
-export([set_logical_size/3]).
@@ -138,6 +139,10 @@ get_logical_size(Renderer) ->
esdl2:render_get_logical_size(Renderer),
receive {'_nif_thread_ret_', Ret} -> Ret end.
+get_scale(Renderer) ->
+ esdl2:render_get_scale(Renderer),
+ receive {'_nif_thread_ret_', Ret} -> Ret end.
+
present(Renderer) ->
esdl2:render_present(Renderer).