X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.cpp;h=cb1e4a4895724acc7d90999c54cdafd9226fd281;hb=15be0323f62a228707f616c25c4b87cd1d68766f;hp=0a4d2c686560e1814719291e6246701aec0fbd44;hpb=a07c344063e6dca568add5f022c7aab495061d11;p=guile-irrlicht.git

diff --git a/src/device.cpp b/src/device.cpp
index 0a4d2c6..cb1e4a4 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -26,6 +26,8 @@
 #include "dimension2d.h"
 #include "driver-types.h"
 #include "event-receiver.h"
+#include "gsubr.h"
+#include "timer.h"
 #include "wchar.h"
 #include "wrapped.h"
 
@@ -35,13 +37,13 @@ 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-resizable!", 2, 0, 0, irr_setResizable);
+    DEFINE_GSUBR ("set-window-caption!", 2, 0, 0, irr_setWindowCaption);
+    DEFINE_GSUBR ("yield", 1, 0, 0, irr_yield);
   }
 
   DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
@@ -55,10 +57,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,
@@ -81,6 +83,13 @@ extern "C" {
     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)
   {
@@ -95,6 +104,15 @@ extern "C" {
     return scm_from_bool (device->run ());
   }
 
+  SCM
+  irr_setResizable (SCM wrapped_device,
+                    SCM resize)
+  {
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    device->setResizable (scm_to_bool (resize));
+    return SCM_UNSPECIFIED;
+  }
+
   SCM
   irr_setWindowCaption (SCM wrapped_device,
                         SCM text)