From 9ea4c68e59a070c89914ab2c2b266a2bd41d1066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 4 Apr 2014 23:36:51 +0200 Subject: Add sdl_renderer:draw_lines/2 --- c_src/esdl2.h | 1 + c_src/sdl_renderer.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/esdl2.erl | 4 ++++ src/sdl_renderer.erl | 5 +++++ 4 files changed, 52 insertions(+) diff --git a/c_src/esdl2.h b/c_src/esdl2.h index 8899602..74e6115 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -174,6 +174,7 @@ F(render_copy, 4) \ F(render_copy_ex, 7) \ F(render_draw_line, 5) \ + F(render_draw_lines, 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 2d6c319..7229d21 100644 --- a/c_src/sdl_renderer.c +++ b/c_src/sdl_renderer.c @@ -387,6 +387,48 @@ NIF_FUNCTION(render_draw_line) NIF_RES_GET(Renderer, renderer_res), x1, y1, x2, y2); } +// render_draw_lines + +NIF_CALL_HANDLER(thread_render_draw_lines) +{ + int ret; + + ret = SDL_RenderDrawLines(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_lines) +{ + void* renderer_res; + unsigned int len; + SDL_Point* points; + 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); + + points = (SDL_Point*)enif_alloc(len * sizeof(SDL_Point)); + + list = argv[1]; + while (enif_get_list_cell(env, list, &head, &list)) { + if (!map_to_point(env, head, &(points[i++]))) { + enif_free(points); + return enif_make_badarg(env); + } + } + + return nif_thread_call(env, thread_render_draw_lines, 3, + NIF_RES_GET(Renderer, renderer_res), points, len); +} + // render_present NIF_CAST_HANDLER(thread_render_present) diff --git a/src/esdl2.erl b/src/esdl2.erl index 6f38c3b..0a1b421 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -62,6 +62,7 @@ -export([render_copy/4]). -export([render_copy_ex/7]). -export([render_draw_line/5]). +-export([render_draw_lines/2]). -export([render_present/1]). -export([render_set_logical_size/3]). -export([set_render_draw_color/5]). @@ -237,6 +238,9 @@ render_copy_ex(_, _, _, _, _, _, _) -> render_draw_line(_, _, _, _, _) -> erlang:nif_error({not_loaded, ?MODULE}). +render_draw_lines(_, _) -> + 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 624b296..45aa159 100644 --- a/src/sdl_renderer.erl +++ b/src/sdl_renderer.erl @@ -25,6 +25,7 @@ -export([copy/7]). -export([draw_line/3]). -export([draw_line/5]). +-export([draw_lines/2]). -export([present/1]). -export([set_draw_color/5]). -export([set_logical_size/3]). @@ -81,6 +82,10 @@ draw_line(Renderer, X1, Y1, X2, Y2) -> esdl2:render_draw_line(Renderer, X1, Y1, X2, Y2), receive {'_nif_thread_ret_', Ret} -> Ret end. +draw_lines(Renderer, Points) -> + esdl2:render_draw_lines(Renderer, Points), + receive {'_nif_thread_ret_', Ret} -> Ret end. + present(Renderer) -> esdl2:render_present(Renderer). -- cgit v1.2.3