X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fdevice.cpp;h=63db119696fe5513bdd2c94238b903ad77db948f;hp=3b5b9b9f76d1b820c755e6580b71d7db9bd9dd51;hb=19663b6c5766b06c73148fdf803ce3555052a23e;hpb=3394d6066c9092a5444c9273f52cea01e2eaf10f

diff --git a/src/device.cpp b/src/device.cpp
index 3b5b9b9..63db119 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -21,75 +21,166 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "device.h"
 #include "dimension2d.h"
 #include "driver-types.h"
+#include "gsubr.h"
 #include "wchar.h"
-#include "wrapped.h"
 
-extern "C" {
 
-  void
-  init_device (void)
-  {
-    init_device_type ();
-    scm_c_define_gsubr ("create-device", 0, 0, 1, (scm_t_subr)irr_createDevice);
-    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_export ("create-device", "run", "set-window-caption!", NULL);
-  }
+using namespace irr;
+
+
+template <typename TEventReceiver>
+SCM
+createDevice (SCM device_type,
+              SCM window_size,
+              SCM bits,
+              SCM fullscreen,
+              SCM stencilbuffer,
+              SCM vsync,
+              SCM receiver)
+{
+  IrrlichtDevice* device =
+    createDevice (scm_to_driver_type (device_type),
+                  scm_to_dimension2d_u32 (window_size),
+                  scm_to_uint32 (bits),
+                  scm_to_bool (fullscreen),
+                  scm_to_bool (stencilbuffer),
+                  scm_to_bool (vsync),
+                  (TEventReceiver)scm_to_pointer (receiver));
+  return scm_from_pointer ((void*)device, NULL);
+}
 
-  DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
-                       init_device_type, device_p,
-                       wrap_device, unwrap_device);
 
-  SCM
-  irr_createDevice (SCM rest)
-  {
-    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_from_bool (0);
-    SCM stencilbuffer = scm_from_bool (0);
-    SCM vsync = scm_from_bool (0);
-    SCM receiver = scm_from_bool (0);
-
-    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);
-
-    irr::IrrlichtDevice* device =
-      irr::createDevice (scm_to_driver_type (device_type),
-                         scm_to_dimension2d_u32 (window_size),
-                         scm_to_uint32 (bits),
-                         scm_to_bool (fullscreen),
-                         scm_to_bool (stencilbuffer),
-                         scm_to_bool (vsync));
-    return wrap_device (device);
-  }
+SCM
+IrrlichtDevice_getCursorControl (SCM device)
+{
+  gui::ICursorControl* cursor_control =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getCursorControl ();
+  return scm_from_pointer ((void*)cursor_control, NULL);
+}
 
-  SCM
-  irr_run (SCM wrapped_device)
-  {
-    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
-    return scm_from_bool (device->run ());
-  }
 
-  SCM
-  irr_setWindowCaption (SCM wrapped_device,
-                        SCM text)
+SCM
+IrrlichtDevice_getFileSystem (SCM device)
+{
+  io::IFileSystem* file_system =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getFileSystem ();
+  return scm_from_pointer ((void*)file_system, NULL);
+}
+
+
+SCM
+IrrlichtDevice_getGUIEnvironment (SCM device)
+{
+  gui::IGUIEnvironment* gui_env =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getGUIEnvironment ();
+  return scm_from_pointer ((void*)gui_env, NULL);
+}
+
+
+SCM
+IrrlichtDevice_getSceneManager (SCM device)
+{
+  scene::ISceneManager* manager =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getSceneManager ();
+  return scm_from_pointer ((void*)manager, NULL);
+}
+
+
+SCM
+IrrlichtDevice_getTimer (SCM device)
+{
+  ITimer* timer =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getTimer ();
+  return scm_from_pointer ((void*)timer, NULL);
+}
+
+
+SCM
+IrrlichtDevice_getVideoDriver (SCM device)
+{
+  video::IVideoDriver* driver =
+    ((IrrlichtDevice*)scm_to_pointer (device))->getVideoDriver ();
+  return scm_from_pointer ((void*)driver, NULL);
+}
+
+
+SCM
+IrrlichtDevice_isWindowActive (SCM device)
+{
+  return scm_from_bool
+    (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ());
+}
+
+
+SCM
+IrrlichtDevice_run (SCM device)
+{
+  return scm_from_bool
+    (((IrrlichtDevice*)scm_to_pointer (device))->run ());
+}
+
+
+template <typename TEventReceiver>
+SCM
+IrrlichtDevice_setEventReceiver (SCM device,
+                                 SCM receiver)
+{
+  ((IrrlichtDevice*)scm_to_pointer (device))->
+    setEventReceiver ((TEventReceiver)scm_to_pointer (receiver));
+  return SCM_UNSPECIFIED;
+}
+
+
+SCM
+IrrlichtDevice_setResizable (SCM device,
+                             SCM resize)
+{
+  ((IrrlichtDevice*)scm_to_pointer (device))->
+    setResizable (scm_to_bool (resize));
+  return SCM_UNSPECIFIED;
+}
+
+
+SCM
+IrrlichtDevice_setWindowCaption (SCM device,
+                                 SCM text)
+{
+  ((IrrlichtDevice*)scm_to_pointer (device))->
+    setWindowCaption (scm_to_wide_char_string (text));
+  return SCM_UNSPECIFIED;
+}
+
+
+SCM
+IrrlichtDevice_yield (SCM device)
+{
+  ((IrrlichtDevice*)scm_to_pointer (device))->yield ();
+  return SCM_UNSPECIFIED;
+}
+
+
+extern "C" {
+
+  void
+  init_device (void)
   {
-    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
-    device->setWindowCaption (scm_to_wide_char_string (text));
-    return SCM_UNSPECIFIED;
+    DEFINE_GSUBR ("createDevice_IEventReceiver", 7, 0, 0, createDevice<IEventReceiver*>);
+    DEFINE_GSUBR ("IrrlichtDevice_getCursorControl", 1, 0, 0, IrrlichtDevice_getCursorControl);
+    DEFINE_GSUBR ("IrrlichtDevice_getFileSystem", 1, 0, 0, IrrlichtDevice_getFileSystem);
+    DEFINE_GSUBR ("IrrlichtDevice_getGUIEnvironment", 1, 0, 0, IrrlichtDevice_getGUIEnvironment);
+    DEFINE_GSUBR ("IrrlichtDevice_getSceneManager", 1, 0, 0, IrrlichtDevice_getSceneManager);
+    DEFINE_GSUBR ("IrrlichtDevice_getTimer", 1, 0, 0, IrrlichtDevice_getTimer);
+    DEFINE_GSUBR ("IrrlichtDevice_getVideoDriver", 1, 0, 0, IrrlichtDevice_getVideoDriver);
+    DEFINE_GSUBR ("IrrlichtDevice_isWindowActive", 1, 0, 0, IrrlichtDevice_isWindowActive);
+    DEFINE_GSUBR ("IrrlichtDevice_run", 1, 0, 0, IrrlichtDevice_run);
+    DEFINE_GSUBR ("IrrlichtDevice_setEventReceiver_IEventReceiver", 2, 0, 0,
+                  IrrlichtDevice_setEventReceiver<IEventReceiver*>);
+    DEFINE_GSUBR ("IrrlichtDevice_setResizable", 2, 0, 0, IrrlichtDevice_setResizable);
+    DEFINE_GSUBR ("IrrlichtDevice_setWindowCaption", 2, 0, 0, IrrlichtDevice_setWindowCaption);
+    DEFINE_GSUBR ("IrrlichtDevice_yield", 1, 0, 0, IrrlichtDevice_yield);
   }
 
 }