GOOPS and POC with create-device

[guile-irrlicht.git] / src / device.cpp

diff --git a/src/device.cpp b/src/device.cpp
index 3b4dc10207f76d98b2c650ab6955deb2a8812240..0ecb69435ee3a9ce77b76248f9807ff0c7f47e2f 100644 (file)
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -37,7 +37,7 @@ extern "C" {
   init_device (void)
   {
     init_device_type ();
-    DEFINE_GSUBR ("create-device", 0, 0, 1, irr_createDevice);
+    DEFINE_GSUBR ("irr_createDevice", 7, 0, 0, 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);
@@ -52,26 +52,15 @@ extern "C" {
                        wrap_device, unwrap_device);
 
   SCM
-  irr_createDevice (SCM rest)
+  irr_createDevice (SCM device_type,
+                    SCM window_size,
+                    SCM bits,
+                    SCM fullscreen,
+                    SCM stencilbuffer,
+                    SCM vsync,
+                    SCM receiver)
   {
-    SCM device_type = scm_from_utf8_symbol ("software");
-    SCM window_size = scm_list_2 (scm_from_uint32 (640),
-                                  scm_from_uint32 (480));
-    SCM bits = scm_from_uint32 (16);
-    SCM fullscreen = SCM_BOOL_F;
-    SCM stencilbuffer = SCM_BOOL_F;
-    SCM vsync = SCM_BOOL_F;
-    SCM receiver = SCM_UNDEFINED;
-
-    scm_c_bind_keyword_arguments ("create-device", rest, (scm_t_keyword_arguments_flags)0,
-                                  scm_from_utf8_keyword ("device-type"), &device_type,
-                                  scm_from_utf8_keyword ("window-size"), &window_size,
-                                  scm_from_utf8_keyword ("bits"), &bits,
-                                  scm_from_utf8_keyword ("fullscreen"), &fullscreen,
-                                  scm_from_utf8_keyword ("stencilbuffer"), &stencilbuffer,
-                                  scm_from_utf8_keyword ("vsync"), &vsync,
-                                  scm_from_utf8_keyword ("receiver"), &receiver,
-                                  SCM_UNDEFINED);
+    UNWRAP (receiver);
 
     irr::IrrlichtDevice* device =
       irr::createDevice (scm_to_driver_type (device_type),
@@ -80,8 +69,8 @@ extern "C" {
                          scm_to_bool (fullscreen),
                          scm_to_bool (stencilbuffer),
                          scm_to_bool (vsync),
-                         receiver == SCM_UNDEFINED ? 0 : unwrap_event_receiver (receiver));
-    return wrap_device (device);
+                         UNWRAPPED (receiver));
+    return scm_from_pointer (device, NULL);
   }
 
   SCM