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

diff --git a/src/device.cpp b/src/device.cpp
index 4ff21a5..55c752f 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -27,11 +27,8 @@
 #include "gsubr.h"
 #include "wchar.h"
 
-
 using namespace irr;
 
-
-template <typename TEventReceiver>
 SCM
 irr_createDevice (SCM device_type,
                   SCM window_size,
@@ -48,141 +45,122 @@ irr_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
-irr_IrrlichtDevice_getCursorControl (SCM device)
+IrrlichtDevice_getCursorControl (SCM device)
 {
   gui::ICursorControl* cursor_control =
     ((IrrlichtDevice*)scm_to_pointer (device))->getCursorControl ();
   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
-irr_IrrlichtDevice_getGUIEnvironment (SCM device)
+IrrlichtDevice_getGUIEnvironment (SCM device)
 {
   gui::IGUIEnvironment* gui_env =
     ((IrrlichtDevice*)scm_to_pointer (device))->getGUIEnvironment ();
   return scm_from_pointer ((void*)gui_env, NULL);
 }
 
-
 SCM
-irr_IrrlichtDevice_getSceneManager (SCM device)
+IrrlichtDevice_getSceneManager (SCM device)
 {
   scene::ISceneManager* manager =
     ((IrrlichtDevice*)scm_to_pointer (device))->getSceneManager ();
   return scm_from_pointer ((void*)manager, NULL);
 }
 
-
 SCM
-irr_IrrlichtDevice_getTimer (SCM device)
+IrrlichtDevice_getTimer (SCM device)
 {
   ITimer* timer =
     ((IrrlichtDevice*)scm_to_pointer (device))->getTimer ();
   return scm_from_pointer ((void*)timer, NULL);
 }
 
-
 SCM
-irr_IrrlichtDevice_getVideoDriver (SCM device)
+IrrlichtDevice_getVideoDriver (SCM device)
 {
   video::IVideoDriver* driver =
     ((IrrlichtDevice*)scm_to_pointer (device))->getVideoDriver ();
   return scm_from_pointer ((void*)driver, NULL);
 }
 
-
 SCM
-irr_IrrlichtDevice_isWindowActive (SCM device)
+IrrlichtDevice_isWindowActive (SCM device)
 {
   return scm_from_bool
     (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ());
 }
 
-
 SCM
-irr_IrrlichtDevice_run (SCM device)
+IrrlichtDevice_run (SCM device)
 {
   return scm_from_bool
     (((IrrlichtDevice*)scm_to_pointer (device))->run ());
 }
 
-
 template <typename TEventReceiver>
 SCM
-irr_IrrlichtDevice_setEventReceiver (SCM device,
-                                     SCM receiver)
+IrrlichtDevice_setEventReceiver (SCM device,
+                                 SCM receiver)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->
     setEventReceiver ((TEventReceiver)scm_to_pointer (receiver));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-irr_IrrlichtDevice_setResizable (SCM device,
-                                 SCM resize)
+IrrlichtDevice_setResizable (SCM device,
+                             SCM resize)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->
     setResizable (scm_to_bool (resize));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-irr_IrrlichtDevice_setWindowCaption (SCM device,
-                                     SCM text)
+IrrlichtDevice_setWindowCaption (SCM device,
+                                 SCM text)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->
     setWindowCaption (scm_to_wide_char_string (text));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-irr_IrrlichtDevice_yield (SCM device)
+IrrlichtDevice_yield (SCM device)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->yield ();
   return SCM_UNSPECIFIED;
 }
 
-
-extern "C" {
-
-  void
-  init_device (void)
-  {
-    init_device_type ();
-    DEFINE_GSUBR ("irr_createDevice_IEventReceiver", 7, 0, 0,
-                  irr_createDevice<IEventReceiver*>);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_getCursorControl", 1, 0, 0,
-                  irr_IrrlichtDevice_getCursorControl);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_getGUIEnvironment", 1, 0, 0,
-                  irr_IrrlichtDevice_getGUIEnvironment);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_getSceneManager", 1, 0, 0,
-                  irr_IrrlichtDevice_getSceneManager);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_getTimer", 1, 0, 0,
-                  irr_IrrlichtDevice_getTimer);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_getVideoDriver", 1, 0, 0,
-                  irr_IrrlichtDevice_getVideoDriver);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_isWindowActive", 1, 0, 0,
-                  irr_IrrlichtDevice_isWindowActive);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_run", 1, 0, 0,
-                  irr_IrrlichtDevice_run);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_setEventReceiver_IEventReceiver", 2, 0, 0,
-                  irr_IrrlichtDevice_setEventReceiver<IEventReceiver*>);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_setResizable", 2, 0, 0,
-                  irr_IrrlichtDevice_setResizable);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_setWindowCaption", 2, 0, 0,
-                  irr_IrrlichtDevice_setWindowCaption);
-    DEFINE_GSUBR ("irr_IrrlichtDevice_yield", 1, 0, 0,
-                  irr_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);
 }