X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fdevice.h;h=3e0e27b0dc96af4b13234622f0bcedf6c36a7f17;hb=21c2a906c994af63024cbf38c7849f8976300bbb;hp=d95e458fecf120b1ae9b2aa16eddab30fdbda2ea;hpb=0193dc05fd03de73ef1e87a5e98a5d4060e07af8;p=guile-irrlicht.git

diff --git a/src/device.h b/src/device.h
index d95e458..3e0e27b 100644
--- a/src/device.h
+++ b/src/device.h
@@ -24,58 +24,57 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-#include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_device (void);
+template <typename TEventReceiver>
+SCM
+irr_createDevice (SCM device_type,
+                  SCM window_size,
+                  SCM bits,
+                  SCM fullscreen,
+                  SCM stencilbuffer,
+                  SCM vsync,
+                  SCM receiver);
 
-  DECLARE_WRAPPED_TYPE (irr::IrrlichtDevice*, init_device_type,
-                        device_p, wrap_device, unwrap_device);
+SCM
+irr_IrrlichtDevice_getCursorControl (SCM device);
 
-  SCM
-  irr_createDevice (SCM device_type,
-                    SCM window_size,
-                    SCM bits,
-                    SCM fullscreen,
-                    SCM stencilbuffer,
-                    SCM vsync,
-                    SCM receiver);
+SCM
+irr_IrrlichtDevice_getGUIEnvironment (SCM device);
 
-  SCM
-  irr_IrrlichtDevice_getGUIEnvironment (SCM device);
+SCM
+irr_IrrlichtDevice_getSceneManager (SCM device);
 
-  SCM
-  irr_IrrlichtDevice_getSceneManager (SCM device);
+SCM
+irr_IrrlichtDevice_getTimer (SCM device);
 
-  SCM
-  irr_IrrlichtDevice_getVideoDriver (SCM device);
+SCM
+irr_IrrlichtDevice_getVideoDriver (SCM device);
 
-  SCM
-  irr_IrrlichtDevice_setWindowCaption (SCM device,
-                                       SCM text);
+SCM
+irr_IrrlichtDevice_isWindowActive (SCM device);
 
-  SCM
-  irr_getTimer (SCM wrapped_device);
+SCM
+irr_IrrlichtDevice_run (SCM device);
 
-  SCM
-  irr_isWindowActive (SCM wrapped_device);
+template <typename TEventReceiver>
+SCM
+irr_IrrlichtDevice_setEventReceiver (SCM device,
+                                     SCM receiver);
 
-  SCM
-  irr_run (SCM wrapped_device);
+SCM
+irr_IrrlichtDevice_setResizable (SCM device,
+                                 SCM resize);
 
-  SCM
-  irr_setEventReceiver (SCM wrapped_device,
-                        SCM receiver);
+SCM
+irr_IrrlichtDevice_setWindowCaption (SCM device,
+                                     SCM text);
 
-  SCM
-  irr_setResizable (SCM wrapped_device,
-                    SCM resize);
-
-  SCM
-  irr_yield (SCM wrapped_device);
+SCM
+irr_IrrlichtDevice_yield (SCM device);
 
+extern "C" {
+  void
+  init_device (void);
 }
 
 #endif