X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fdevice.scm;h=9f17902bee6ecb3685adc8a35eb16434e2d8da9e;hb=537c949563f0f1f0419aef8b84c75e5042fd1b08;hp=04988d39602e24deb51ead3f2cce967fccbaa750;hpb=384a8fb56d8500dc3551085191a39c9da70e221c;p=guile-irrlicht.git

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 04988d3..9f17902 100644
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -22,11 +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)
-  #:use-module (irrlicht video))
+  #:use-module ((irrlicht irr) #:select (<event-receiver> <reference-counted>)))
 
 
 ;; IrrlichtDevice
@@ -47,35 +43,36 @@
        receiver))
 
   (let* ((createDevice (get-irrlicht-proc "createDevice"))
-         (device-pointer (createDevice device-type window-size bits fullscreen stencilbuffer
-                                       vsync receiver)))
-    (cond ((null-pointer? device-pointer)
+         (device (createDevice device-type window-size bits fullscreen stencilbuffer
+                               vsync receiver)))
+    (cond ((null-object? device)
            (error "In procedure create-device: Device cannot be created"))
           (else
-           (make <irrlicht-device> #:irr-pointer device-pointer)))))
+           device))))
 
 (define-method (get-cursor-control (device <irrlicht-device>))
   (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))
-    (make <cursor-control>
-      #:irr-pointer (getCursorControl device))))
+    (getCursorControl device)))
 
 (define-method (get-file-system (device <irrlicht-device>))
   (let ((getFileSystem (get-irrlicht-proc "getFileSystem" device)))
-    (make <file-system>
-      #:irr-pointer (getFileSystem device))))
+    (getFileSystem device)))
 
 (define-method (get-gui-environment (device <irrlicht-device>))
   (let ((getGUIEnvironment (get-irrlicht-proc "getGUIEnvironment" device)))
-    (make <gui-environment>
-      #:irr-pointer (getGUIEnvironment device))))
+    (getGUIEnvironment device)))
 
 (define-method (get-scene-manager (device <irrlicht-device>))
-  (make <scene-manager>
-    #:irr-pointer ((get-irrlicht-proc "getSceneManager" device) device)))
+  (let ((getSceneManager (get-irrlicht-proc "getSceneManager" device)))
+    (getSceneManager device)))
+
+(define-method (get-timer (device <irrlicht-device>))
+  (let ((getTimer (get-irrlicht-proc "getTimer" device)))
+    (getTimer device)))
 
 (define-method (get-video-driver (device <irrlicht-device>))
-  (make <video-driver>
-    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) device)))
+  (let ((getVideoDriver (get-irrlicht-proc "getVideoDriver" device)))
+    (getVideoDriver device)))
 
 (define-method (is-window-active? (device <irrlicht-device>))
   (let ((isWindowActive (get-irrlicht-proc "isWindowActive" device)))
@@ -92,5 +89,6 @@
   (let ((yield (get-irrlicht-proc "yield" device)))
     (yield device)))
 
-(export create-device get-cursor-control get-file-system get-gui-environment get-scene-manager
-        get-video-driver is-window-active? run set-window-caption! yield-device)
+(export <irrlicht-device> create-device get-cursor-control get-file-system get-gui-environment
+        get-scene-manager get-timer get-video-driver is-window-active? run set-window-caption!
+        yield-device)