fixing bugs

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

diff --git a/src/device.cpp b/src/device.cpp
index 4ff21a56aa38a32e671f751a0535a1c52e459f72..63db119696fe5513bdd2c94238b903ad77db948f 100644 (file)
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -33,13 +33,13 @@ using namespace irr;
 
 template <typename TEventReceiver>
 SCM
-irr_createDevice (SCM device_type,
-                  SCM window_size,
-                  SCM bits,
-                  SCM fullscreen,
-                  SCM stencilbuffer,
-                  SCM vsync,
-                  SCM receiver)
+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),
@@ -54,7 +54,7 @@ irr_createDevice (SCM device_type,
 
 
 SCM
-irr_IrrlichtDevice_getCursorControl (SCM device)
+IrrlichtDevice_getCursorControl (SCM device)
 {
   gui::ICursorControl* cursor_control =
     ((IrrlichtDevice*)scm_to_pointer (device))->getCursorControl ();
@@ -63,7 +63,16 @@ irr_IrrlichtDevice_getCursorControl (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_getGUIEnvironment (SCM device)
+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 ();
@@ -72,7 +81,7 @@ irr_IrrlichtDevice_getGUIEnvironment (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_getSceneManager (SCM device)
+IrrlichtDevice_getSceneManager (SCM device)
 {
   scene::ISceneManager* manager =
     ((IrrlichtDevice*)scm_to_pointer (device))->getSceneManager ();
@@ -81,7 +90,7 @@ irr_IrrlichtDevice_getSceneManager (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_getTimer (SCM device)
+IrrlichtDevice_getTimer (SCM device)
 {
   ITimer* timer =
     ((IrrlichtDevice*)scm_to_pointer (device))->getTimer ();
@@ -90,7 +99,7 @@ irr_IrrlichtDevice_getTimer (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_getVideoDriver (SCM device)
+IrrlichtDevice_getVideoDriver (SCM device)
 {
   video::IVideoDriver* driver =
     ((IrrlichtDevice*)scm_to_pointer (device))->getVideoDriver ();
@@ -99,7 +108,7 @@ irr_IrrlichtDevice_getVideoDriver (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_isWindowActive (SCM device)
+IrrlichtDevice_isWindowActive (SCM device)
 {
   return scm_from_bool
     (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ());
@@ -107,7 +116,7 @@ irr_IrrlichtDevice_isWindowActive (SCM device)
 
 
 SCM
-irr_IrrlichtDevice_run (SCM device)
+IrrlichtDevice_run (SCM device)
 {
   return scm_from_bool
     (((IrrlichtDevice*)scm_to_pointer (device))->run ());
@@ -116,8 +125,8 @@ irr_IrrlichtDevice_run (SCM device)
 
 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));
@@ -126,8 +135,8 @@ irr_IrrlichtDevice_setEventReceiver (SCM device,
 
 
 SCM
-irr_IrrlichtDevice_setResizable (SCM device,
-                                 SCM resize)
+IrrlichtDevice_setResizable (SCM device,
+                             SCM resize)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->
     setResizable (scm_to_bool (resize));
@@ -136,8 +145,8 @@ irr_IrrlichtDevice_setResizable (SCM device,
 
 
 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));
@@ -146,7 +155,7 @@ irr_IrrlichtDevice_setWindowCaption (SCM device,
 
 
 SCM
-irr_IrrlichtDevice_yield (SCM device)
+IrrlichtDevice_yield (SCM device)
 {
   ((IrrlichtDevice*)scm_to_pointer (device))->yield ();
   return SCM_UNSPECIFIED;
@@ -158,31 +167,20 @@ 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);
+    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);
   }
 
 }