X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fposition2d.cpp;h=0e41c50047e75da3f98b002241e6dd3ff6c2047b;hp=20fb74316f87b04a5e1779a69079fd7e04c4d6a3;hb=aa81b0c480d9d6d8d82de1d574f4cceb6178c722;hpb=190ad3402800a3f166392138013cd3c7862de6c5 diff --git a/src/position2d.cpp b/src/position2d.cpp index 20fb743..0e41c50 100644 --- a/src/position2d.cpp +++ b/src/position2d.cpp @@ -23,29 +23,29 @@ #include #include "position2d.h" -extern "C" { - - SCM - scm_from_position2d_s32 (irr::core::position2d position2d) - { - return scm_list_2 (scm_from_int32 (position2d.X), - scm_from_int32 (position2d.Y)); - } - - irr::core::position2d - scm_to_position2d_f32 (SCM position2d) - { - return irr::core::position2d - (scm_to_double (scm_car (position2d)), - scm_to_double (scm_cadr (position2d))); - } - - irr::core::position2d - scm_to_position2d_s32 (SCM position2d) - { - return irr::core::position2d - (scm_to_int32 (scm_car (position2d)), - scm_to_int32 (scm_cadr (position2d))); - } +using namespace irr; + + +SCM +scm_from_position2d_s32 (core::position2d position2d) +{ + return scm_list_2 (scm_from_int32 (position2d.X), + scm_from_int32 (position2d.Y)); +} + +core::position2d +scm_to_position2d_f32 (SCM position2d) +{ + return core::position2d + (scm_to_double (scm_car (position2d)), + scm_to_double (scm_cadr (position2d))); +} + +core::position2d +scm_to_position2d_s32 (SCM position2d) +{ + return core::position2d + (scm_to_int32 (scm_car (position2d)), + scm_to_int32 (scm_cadr (position2d))); }