X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=irrlicht.scm;h=c1e52c2c50d04f3a7f257e740e18758eb5f5eea2;hp=6da6ce90d610eb00e9be290e58848fc258570089;hb=09e9ed196aadab0f77e831c134fce8bdb58b772b;hpb=a0bd5bb1a5cb96586af24eaab0a4393fdb44127c

diff --git a/irrlicht.scm b/irrlicht.scm
index 6da6ce9..c1e52c2 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,34 +19,36 @@
 
 
 (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))
+  #:use-module (oop goops)
+  #:use-module (irrlicht base)
+  #:use-module (irrlicht device)
+  #:use-module (irrlicht gui)
+  #:use-module (irrlicht io)
+  #:use-module (irrlicht irr)
+  #:use-module (irrlicht scene)
+  #:use-module (irrlicht video)
+  #:duplicates (merge-generics)
+  #:re-export (add-animated-mesh-scene-node!
+               add-camera-scene-node!
+               add-file-archive!
+               add-static-text!
+               begin-scene
+               create-device
+               drop!
+               end-scene
+               get-file-system
+               get-gui-environment
+               get-mesh
+               get-name
+               get-scene-manager
+               get-texture
+               get-video-driver
+               is-empty?
+               run
+               set-material-flag!
+               set-material-texture!
+               set-md2-animation!
+               set-window-caption!))
 
-(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)))
-    (ffi:create-device driver wsize bits
-                       (if fullscreen 1 0)
-                       (if stencilbuffer 1 0)
-                       (if vsync 1 0))))
-
-(define (get-video-driver device)
-  (ffi:get-video-driver device))
+;; Merged methods have to be exported apart
+(re-export draw-all)