X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fdevice.scm;h=2a61890ab80f9de069fa852b99dff8e7ec0671b8;hb=21f12bf4ba8c031b36784e1e0a479535f477cc59;hp=9a009ef2cd13f8d5cd3fde000533f10e228a3d1c;hpb=eaa186435f0c641c53841d8d15581525bd542249;p=guile-irrlicht.git

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 9a009ef..2a61890 100644
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -19,67 +19,28 @@
 
 
 (define-module (irrlicht device)
-  #:use-module (ice-9 match)
-  #:use-module (system foreign)
-  #:use-module ((irrlicht bindings) #:prefix ffi:)
-  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
-  #:use-module ((irrlicht bindings video) #:prefix ffi-video:)
   #:export (create-device
-            get-cursor-control
-            get-file-system
-            get-video-driver
+            device-drop!
             get-gui-environment
             get-scene-manager
-            is-window-active?
-            set-window-caption!
-            device-run?
-            device-drop!))
+            get-video-driver
+            set-window-caption!))
+
+(load-extension "libguile-irrlicht" "init_guile_irrlicht")
 
+(define irr-create-device create-device)
 (define* (create-device #:key
                         (device-type 'software)
                         (window-size '(640 480))
                         (bits 16)
                         (fullscreen #f)
                         (stencilbuffer #f)
-                        (vsync #f))
-  (let ((driver (match device-type
-                       ('null ffi-video:EDT_NULL)
-                       ('software ffi-video:EDT_SOFTWARE)
-                       ('burnings ffi-video:EDT_BURNINGSVIDEO)
-                       ('direct3d8 ffi-video:EDT_DIRECT3D8)
-                       ('direct3d9 ffi-video:EDT_DIRECT3D9)
-                       ('opengl ffi-video:EDT_OPENGL)
-                       ('count ffi-video:EDT_COUNT)))
-        (wsize (make-c-struct ffi-core:dimension2d window-size)))
-    (let ((device (ffi:create-device driver wsize bits
-                                     (if fullscreen 1 0)
-                                     (if stencilbuffer 1 0)
-                                     (if vsync 1 0))))
-      (if (null-pointer? device) #f device))))
-
-(define (get-cursor-control device)
-  (ffi:get-cursor-control device))
-
-(define (get-file-system device)
-  (ffi:get-file-system device))
-
-(define (get-video-driver device)
-  (ffi:get-video-driver device))
-
-(define (get-gui-environment device)
-  (ffi:get-gui-environment device))
-
-(define (get-scene-manager device)
-  (ffi:get-scene-manager device))
-
-(define (is-window-active? device)
-  (if (> (ffi:is-window-active device) 0) #t #f))
-
-(define (set-window-caption! device text)
-  (ffi:set-window-caption device (string->pointer text)))
-
-(define (device-run? device)
-  (if (> (ffi:run device) 0) #t #f))
-
-(define (device-drop! device)
-  (if (> (ffi:drop device) 0) #t #f))
+                        (vsync #f)
+                        (receiver 0))
+  (irr-create-device device-type
+                     window-size
+                     bits
+                     fullscreen
+                     stencilbuffer
+                     vsync
+                     receiver))