X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht.scm;h=dcb4de5bd907af80a465d628fbf661d00f4271cd;hb=f87cd7913fc377761f6212859d84e0369b64fa49;hp=0ff6e3a6083358af344f25911a9f21b2be555abb;hpb=6926f985d7c92c543969ae8957645815dc58f098;p=guile-irrlicht.git

diff --git a/irrlicht.scm b/irrlicht.scm
index 0ff6e3a..dcb4de5 100644
--- a/irrlicht.scm
+++ b/irrlicht.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,51 +19,16 @@
 
 
 (define-module (irrlicht)
-  #: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-video-driver
-            get-scene-manager
-            set-window-caption!
-            device-run?
-            device-drop!))
-
-(define* (create-device #:optional
-                        (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-video-driver device)
-  (ffi:get-video-driver device))
-
-(define (get-scene-manager device)
-  (ffi:get-scene-manager device))
-
-(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))
+  #:use-module (irrlicht base)
+  #:use-module (irrlicht device)
+  #:use-module (irrlicht gui)
+  #:use-module (irrlicht scene)
+  #:re-export (add-animated-mesh-scene-node!
+               add-static-text!
+               create-device
+               get-gui-environment
+               get-mesh
+               get-scene-manager
+               get-video-driver
+               is-empty?
+               set-window-caption!))