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

diff --git a/irrlicht.scm b/irrlicht.scm
index d6d64ad..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,18 +19,36 @@
 
 
 (define-module (irrlicht)
-  #:use-module (ice-9 match)
-  #:use-module ((irrlicht bindings) #:prefix ffi:)
-  #:use-module ((irrlicht bindings video) #:prefix ffi-video:)
-  #:export (create-device))
+  #: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))
-  (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))))
-    (ffi:create-device driver)))
+;; Merged methods have to be exported apart
+(re-export draw-all)