X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fdevice.scm;h=24b3f8b2ae2da537de781f6b59de166fd34f302e;hb=eda821abcd7de9a335df931a2be7a6975b0cd9a8;hp=6049016fc1f8b5a2f5f92900ae128606c1f0f8d0;hpb=8c5c5f5fc4aef51c5dfa515b3a8eee67de3b8e9b;p=guile-irrlicht.git

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 6049016..24b3f8b 100644
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -22,6 +22,7 @@
   #:use-module (oop goops)
   #:use-module (irrlicht base)
   #:use-module (irrlicht foreign)
+  #:use-module (irrlicht io)
   #:use-module (irrlicht irr)
   #:use-module (irrlicht gui)
   #:use-module (irrlicht scene)
@@ -29,7 +30,8 @@
 
 
 ;; IrrlichtDevice
-(define-class <irrlicht-device> (<reference-counted>))
+(define-class <irrlicht-device> (<reference-counted>)
+  (irr-class #:init-value "IrrlichtDevice"))
 
 (define* (create-device #:key
                         (device-type 'software)
@@ -46,28 +48,44 @@
 
   (make <irrlicht-device>
     #:irr-pointer
-    (irr_createDevice
+    ((get-irrlicht-proc "createDevice")
      device-type
      window-size
      bits
      fullscreen
      stencilbuffer
      vsync
-     (irr-pointer receiver))))
+     receiver)))
+
+(define-method (get-cursor-control (device <irrlicht-device>))
+  (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))
+    (make <cursor-control>
+      #:irr-pointer (getCursorControl device))))
+
+(define-method (get-file-system (device <irrlicht-device>))
+  (let ((getFileSystem (get-irrlicht-proc "getFileSystem" device)))
+    (make <file-system>
+      #:irr-pointer (getFileSystem device))))
 
 (define-method (get-gui-environment (device <irrlicht-device>))
-  (make <gui-environment>
-    #:irr-pointer (irr_IrrlichtDevice_getGUIEnvironment (irr-pointer device))))
+  (let ((getGUIEnvironment (get-irrlicht-proc "getGUIEnvironment" device)))
+    (make <gui-environment>
+      #:irr-pointer (getGUIEnvironment device))))
 
 (define-method (get-scene-manager (device <irrlicht-device>))
   (make <scene-manager>
-    #:irr-pointer (irr_IrrlichtDevice_getSceneManager (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getSceneManager" device) device)))
 
 (define-method (get-video-driver (device <irrlicht-device>))
   (make <video-driver>
-    #:irr-pointer (irr_IrrlichtDevice_getVideoDriver (irr-pointer device))))
+    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) device)))
+
+(define-method (run (device <irrlicht-device>))
+  ((get-irrlicht-proc "run" device) device))
 
 (define-method (set-window-caption! (device <irrlicht-device>) text)
-  (irr_IrrlichtDevice_setWindowCaption (irr-pointer device) text))
+  ((get-irrlicht-proc "setWindowCaption" device)
+   device text))
 
-(export create-device get-gui-environment get-scene-manager get-video-driver set-window-caption!)
+(export create-device get-cursor-control get-file-system get-gui-environment get-scene-manager
+        get-video-driver run set-window-caption!)