X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=irrlicht.scm;h=65085372eee5cdc300a2bac66e270ffac9336886;hp=aaa58ea9d947ab708ab763f018d7684cccaa2f29;hb=e6792f323493078dceac0566f5d27786fc76225d;hpb=ca1d1d0dd811558f133bfdad62b2b645a31695ff

diff --git a/irrlicht.scm b/irrlicht.scm
index aaa58ea..6508537 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.
 ;;;
@@ -18,20 +18,38 @@
 ;;; <http://www.gnu.org/licenses/>.
 
 
-(define-module (irrlicht))
+(define-module (irrlicht)
+  #: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-octree-scene-node!
+               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!))
 
-(eval-when (eval load compile)
-  ;; load public symbols into current module
-  (let ((public-modules
-         '((irrlicht aabbox3d)
-           (irrlicht device)
-           (irrlicht gui)
-           (irrlicht io)
-           (irrlicht scene)
-           (irrlicht video)))
-        (current-interface
-         (module-public-interface (current-module))))
-    (for-each
-     (lambda (m)
-       (module-use! current-interface (resolve-interface m)))
-     public-modules)))
+;; Merged methods have to be exported apart
+(re-export draw-all)