X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.cpp;h=96442c7e3797300654efd3964cb0901c94b3bdd8;hb=9137f8fdb1e89ffdec1fb498084f71e92e7f02a9;hp=41d6193344190efb3fc45c536a513a82308d09fd;hpb=e3b7978afe8f8968242919e6e93c9a637233801a;p=guile-irrlicht.git

diff --git a/src/device.cpp b/src/device.cpp
index 41d6193..96442c7 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -25,6 +25,9 @@
 #include "device.h"
 #include "dimension2d.h"
 #include "driver-types.h"
+#include "event-receiver.h"
+#include "gsubr.h"
+#include "timer.h"
 #include "wchar.h"
 #include "wrapped.h"
 
@@ -34,13 +37,12 @@ extern "C" {
   init_device (void)
   {
     init_device_type ();
-    scm_c_define_gsubr ("create-device", 0, 0, 1, (scm_t_subr)irr_createDevice);
-    scm_c_define_gsubr ("is-window-active?", 1, 0, 0, (scm_t_subr)irr_isWindowActive);
-    scm_c_define_gsubr ("run", 1, 0, 0, (scm_t_subr)irr_run);
-    scm_c_define_gsubr ("set-window-caption!", 2, 0, 0, (scm_t_subr)irr_setWindowCaption);
-    scm_c_define_gsubr ("yield", 1, 0, 0, (scm_t_subr)irr_yield);
-    scm_c_export ("create-device", "is-window-active?", "run",
-                  "set-window-caption!", "yield", NULL);
+    DEFINE_GSUBR ("create-device", 0, 0, 1, irr_createDevice);
+    DEFINE_GSUBR ("get-timer", 1, 0, 0, irr_getTimer);
+    DEFINE_GSUBR ("is-window-active?", 1, 0, 0, irr_isWindowActive);
+    DEFINE_GSUBR ("run", 1, 0, 0, irr_run);
+    DEFINE_GSUBR ("set-window-caption!", 2, 0, 0, irr_setWindowCaption);
+    DEFINE_GSUBR ("yield", 1, 0, 0, irr_yield);
   }
 
   DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
@@ -54,10 +56,10 @@ extern "C" {
     SCM window_size = scm_list_2 (scm_from_uint32 (640),
                                   scm_from_uint32 (480));
     SCM bits = scm_from_uint32 (16);
-    SCM fullscreen = scm_from_bool (0);
-    SCM stencilbuffer = scm_from_bool (0);
-    SCM vsync = scm_from_bool (0);
-    SCM receiver = scm_from_bool (0);
+    SCM fullscreen = SCM_BOOL_F;
+    SCM stencilbuffer = SCM_BOOL_F;
+    SCM vsync = SCM_BOOL_F;
+    SCM receiver = SCM_BOOL_F;
 
     scm_c_bind_keyword_arguments ("create-device", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("device-type"), &device_type,
@@ -75,10 +77,18 @@ extern "C" {
                          scm_to_uint32 (bits),
                          scm_to_bool (fullscreen),
                          scm_to_bool (stencilbuffer),
-                         scm_to_bool (vsync));
+                         scm_to_bool (vsync),
+                         scm_is_false (receiver) ? 0 : unwrap_event_receiver (receiver));
     return wrap_device (device);
   }
 
+  SCM
+  irr_getTimer (SCM wrapped_device)
+  {
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    return wrap_timer (device->getTimer ());
+  }
+
   SCM
   irr_isWindowActive (SCM wrapped_device)
   {