X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fdevice.scm;h=c922cece2076b139f62b51f36fd0e51cb2129a2b;hb=e310847d00a2fd941405b0d417542310dad63965;hp=97e2bbab2d207f3ffb23dfb1350464cc00e3ce2e;hpb=c4d9e46f268b4f7f738dd77685c632991125cec9;p=guile-irrlicht.git

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 97e2bba..c922cec 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)
@@ -30,7 +31,7 @@
 
 ;; IrrlichtDevice
 (define-class <irrlicht-device> (<reference-counted>)
-  (irr-class #:init-value "IrrlichtDevice" #:getter irr-class))
+  (irr-class #:init-value "IrrlichtDevice"))
 
 (define* (create-device #:key
                         (device-type 'software)
@@ -45,29 +46,37 @@
        "In procedure create-device: Wrong type argument (expecting <event-receiver>):"
        receiver))
 
-  (make <irrlicht-device>
-    #:irr-pointer
-    ((get-irrlicht-proc "createDevice")
-     device-type
-     window-size
-     bits
-     fullscreen
-     stencilbuffer
-     vsync
-     receiver)))
+  (let* ((createDevice (get-irrlicht-proc "createDevice"))
+         (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
+           device))))
+
+(define-method (get-cursor-control (device <irrlicht-device>))
+  (let ((getCursorControl (get-irrlicht-proc "getCursorControl" device)))
+    (getCursorControl device)))
+
+(define-method (get-file-system (device <irrlicht-device>))
+  (let ((getFileSystem (get-irrlicht-proc "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-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)))
+    (isWindowActive device)))
 
 (define-method (run (device <irrlicht-device>))
   ((get-irrlicht-proc "run" device) device))
@@ -76,5 +85,9 @@
   ((get-irrlicht-proc "setWindowCaption" device)
    device text))
 
-(export create-device get-gui-environment get-scene-manager get-video-driver run
-        set-window-caption!)
+(define-method (yield-device (device <irrlicht-device>))
+  (let ((yield (get-irrlicht-proc "yield" device)))
+    (yield device)))
+
+(export <irrlicht-device> 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)