X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fvideo-driver.cpp;h=61683f2436459c24734641160e9588b227ab27e1;hb=f842432ad7cfd7f530188e2a4848aea3da03719e;hp=9c81120fb97825ad23f422146a0795569705a9bf;hpb=f0d999bd6865a03c42a2d7378fd60c7a469201f2;p=guile-irrlicht.git

diff --git a/src/video-driver.cpp b/src/video-driver.cpp
index 9c81120..61683f2 100644
--- a/src/video-driver.cpp
+++ b/src/video-driver.cpp
@@ -23,7 +23,7 @@
 #include <libguile.h>
 
 #include "color.h"
-#include "device.h"
+#include "gsubr.h"
 #include "gui-environment.h"
 #include "material.h"
 #include "matrix4.h"
@@ -41,16 +41,12 @@ extern "C" {
   init_video_driver (void)
   {
     init_video_driver_type ();
-    scm_c_define_gsubr ("begin-scene", 1, 0, 1, (scm_t_subr)irr_video_beginScene);
-    scm_c_define_gsubr ("draw-vertex-primitive-list", 3, 0, 1,
-                        (scm_t_subr)irr_video_drawVertexPrimitiveList);
-    scm_c_define_gsubr ("end-scene", 1, 0, 0, (scm_t_subr)irr_video_endScene);
-    scm_c_define_gsubr ("get-fps", 1, 0, 0, (scm_t_subr)irr_video_getFPS);
-    scm_c_define_gsubr ("get-texture", 2, 0, 0, (scm_t_subr)irr_video_getTexture);
-    scm_c_define_gsubr ("get-video-driver", 1, 0, 0, (scm_t_subr)irr_getVideoDriver);
-    scm_c_define_gsubr ("set-transform!", 3, 0, 0, (scm_t_subr)irr_video_setTransform);
-    scm_c_export ("begin-scene", "draw-vertex-primitive-list", "end-scene", "get-fps",
-                  "get-texture", "get-video-driver", "set-transform!", NULL);
+    DEFINE_GSUBR ("begin-scene", 1, 0, 1, irr_video_beginScene);
+    DEFINE_GSUBR ("draw-vertex-primitive-list", 3, 0, 1, irr_video_drawVertexPrimitiveList);
+    DEFINE_GSUBR ("end-scene", 1, 0, 0, irr_video_endScene);
+    DEFINE_GSUBR ("get-fps", 1, 0, 0, irr_video_getFPS);
+    DEFINE_GSUBR ("get-texture", 2, 0, 0, irr_video_getTexture);
+    DEFINE_GSUBR ("set-transform!", 3, 0, 0, irr_video_setTransform);
   }
 
   DEFINE_WRAPPED_TYPE (irr::video::IVideoDriver*, "video-driver",
@@ -61,14 +57,14 @@ extern "C" {
   irr_video_beginScene (SCM wrapped_video_driver,
                         SCM rest)
   {
-    SCM back_buffer = scm_from_bool(1);
-    SCM z_buffer = scm_from_bool(1);
+    SCM back_buffer = SCM_BOOL_T;
+    SCM z_buffer = SCM_BOOL_T;
     SCM color = scm_list_4 (scm_from_uint32 (255),
                             scm_from_uint32 (0),
                             scm_from_uint32 (0),
                             scm_from_uint32 (0));
-    SCM video_data = scm_from_bool(0);
-    SCM source_rect = scm_from_bool(0);
+    SCM video_data = SCM_BOOL_F;
+    SCM source_rect = SCM_UNDEFINED;
 
     scm_c_bind_keyword_arguments ("begin-scene", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("back-buffer"), &back_buffer,
@@ -80,7 +76,7 @@ extern "C" {
 
     irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver);
     irr::core::rect<irr::s32>* sourceRectAddress = 0;
-    if (!scm_is_false (source_rect))
+    if (source_rect != SCM_UNDEFINED)
       {
         irr::core::rect<irr::s32> sourceRect = scm_to_rect_s32 (source_rect);
         sourceRectAddress = &sourceRect;
@@ -184,22 +180,6 @@ extern "C" {
     return SCM_UNSPECIFIED;
   }
 
-  SCM
-  irr_getVideoDriver (SCM wrapped_obj)
-  {
-    irr::video::IVideoDriver* driver;
-    if (device_p (wrapped_obj))
-      {
-        driver = unwrap_device (wrapped_obj)->getVideoDriver ();
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Cannot get video driver from object: ~S",
-                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
-      }
-    return wrap_video_driver (driver);
-  }
-
   irr::video::E_TRANSFORMATION_STATE
   scm_to_transformation_state (SCM transformation_state)
   {