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

diff --git a/irrlicht/device.scm b/irrlicht/device.scm
index 928a6c8..04988d3 100644
--- a/irrlicht/device.scm
+++ b/irrlicht/device.scm
@@ -1,5 +1,5 @@
 ;;; guile-irrlicht --- FFI bindings for Irrlicht Engine
-;;; Copyright (C) 2019 Javier Sancho <jsf@jsancho.org>
+;;; Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
 ;;;
 ;;; This file is part of guile-irrlicht.
 ;;;
@@ -19,22 +19,19 @@
 
 
 (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:)
-  #:use-module (irrlicht util)
-  #:export (create-device
-            get-cursor-control
-            get-file-system
-            get-video-driver
-            get-gui-environment
-            get-scene-manager
-            is-window-active?
-            set-window-caption!
-            device-run?
-            device-drop!))
+  #: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))
+
+
+;; IrrlichtDevice
+(define-class <irrlicht-device> (<reference-counted>)
+  (irr-class #:init-value "IrrlichtDevice"))
 
 (define* (create-device #:key
                         (device-type 'software)
@@ -42,45 +39,58 @@
                         (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
-                                     (bool->integer fullscreen)
-                                     (bool->integer stencilbuffer)
-                                     (bool->integer vsync))))
-      (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)
-  (integer->bool (ffi:is-window-active device)))
-
-(define (set-window-caption! device text)
-  (ffi:set-window-caption device (string->pointer text)))
-
-(define (device-run? device)
-  (integer->bool (ffi:run device)))
-
-(define (device-drop! device)
-  (integer->bool (ffi:drop device)))
+                        (vsync #f)
+                        (receiver (make <event-receiver>)))
+  (if (not (is-a? receiver <event-receiver>))
+      (error
+       "In procedure create-device: Wrong type argument (expecting <event-receiver>):"
+       receiver))
+
+  (let* ((createDevice (get-irrlicht-proc "createDevice"))
+         (device-pointer (createDevice device-type window-size bits fullscreen stencilbuffer
+                                       vsync receiver)))
+    (cond ((null-pointer? device-pointer)
+           (error "In procedure create-device: Device cannot be created"))
+          (else
+           (make <irrlicht-device> #:irr-pointer device-pointer)))))
+
+(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>))
+  (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 ((get-irrlicht-proc "getSceneManager" device) device)))
+
+(define-method (get-video-driver (device <irrlicht-device>))
+  (make <video-driver>
+    #:irr-pointer ((get-irrlicht-proc "getVideoDriver" device) 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))
+
+(define-method (set-window-caption! (device <irrlicht-device>) text)
+  ((get-irrlicht-proc "setWindowCaption" device)
+   device text))
+
+(define-method (yield-device (device <irrlicht-device>))
+  (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)