X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.cpp;h=55c752fec4b1866a097dfd86a2169601d91297c2;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=10ba8ad6c2e67086e5dc27ddcc76e685c3916b1e;hpb=d78951bd91783c61b312451198beb31f70b0f8b2;p=guile-irrlicht.git

diff --git a/src/device.cpp b/src/device.cpp
index 10ba8ad..55c752f 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -27,19 +27,16 @@
 #include "gsubr.h"
 #include "wchar.h"
 
-
 using namespace irr;
 
-
-template <typename TEventReceiver>
 SCM
-createDevice (SCM device_type,
-              SCM window_size,
-              SCM bits,
-              SCM fullscreen,
-              SCM stencilbuffer,
-              SCM vsync,
-              SCM receiver)
+irr_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),
@@ -48,11 +45,10 @@ createDevice (SCM device_type,
                   scm_to_bool (fullscreen),
                   scm_to_bool (stencilbuffer),
                   scm_to_bool (vsync),
-                  (TEventReceiver)scm_to_pointer (receiver));
+                  (IEventReceiver*)scm_to_pointer (receiver));
   return scm_from_pointer ((void*)device, NULL);
 }
 
-
 SCM
 IrrlichtDevice_getCursorControl (SCM device)
 {
@@ -61,6 +57,13 @@ IrrlichtDevice_getCursorControl (SCM device)
   return scm_from_pointer ((void*)cursor_control, NULL);
 }
 
+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)
@@ -70,7 +73,6 @@ IrrlichtDevice_getGUIEnvironment (SCM device)
   return scm_from_pointer ((void*)gui_env, NULL);
 }
 
-
 SCM
 IrrlichtDevice_getSceneManager (SCM device)
 {
@@ -79,7 +81,6 @@ IrrlichtDevice_getSceneManager (SCM device)
   return scm_from_pointer ((void*)manager, NULL);
 }
 
-
 SCM
 IrrlichtDevice_getTimer (SCM device)
 {
@@ -88,7 +89,6 @@ IrrlichtDevice_getTimer (SCM device)
   return scm_from_pointer ((void*)timer, NULL);
 }
 
-
 SCM
 IrrlichtDevice_getVideoDriver (SCM device)
 {
@@ -97,7 +97,6 @@ IrrlichtDevice_getVideoDriver (SCM device)
   return scm_from_pointer ((void*)driver, NULL);
 }
 
-
 SCM
 IrrlichtDevice_isWindowActive (SCM device)
 {
@@ -105,7 +104,6 @@ IrrlichtDevice_isWindowActive (SCM device)
     (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ());
 }
 
-
 SCM
 IrrlichtDevice_run (SCM device)
 {
@@ -113,7 +111,6 @@ IrrlichtDevice_run (SCM device)
     (((IrrlichtDevice*)scm_to_pointer (device))->run ());
 }
 
-
 template <typename TEventReceiver>
 SCM
 IrrlichtDevice_setEventReceiver (SCM device,
@@ -124,7 +121,6 @@ IrrlichtDevice_setEventReceiver (SCM device,
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
 IrrlichtDevice_setResizable (SCM device,
                              SCM resize)
@@ -134,7 +130,6 @@ IrrlichtDevice_setResizable (SCM device,
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
 IrrlichtDevice_setWindowCaption (SCM device,
                                  SCM text)
@@ -144,7 +139,6 @@ IrrlichtDevice_setWindowCaption (SCM device,
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
 IrrlichtDevice_yield (SCM device)
 {
@@ -152,37 +146,21 @@ IrrlichtDevice_yield (SCM device)
   return SCM_UNSPECIFIED;
 }
 
-
-extern "C" {
-
-  void
-  init_device (void)
-  {
-    init_device_type ();
-    DEFINE_GSUBR ("createDevice_IEventReceiver", 7, 0, 0,
-                  createDevice<IEventReceiver*>);
-    DEFINE_GSUBR ("IrrlichtDevice_getCursorControl", 1, 0, 0,
-                  IrrlichtDevice_getCursorControl);
-    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);
-  }
-
+void
+init_device (void)
+{
+  DEFINE_GSUBR ("createDevice", 7, 0, 0, irr_createDevice);
+  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);
 }