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

diff --git a/irrlicht.scm b/irrlicht.scm
index f3474c6..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.
 ;;;
@@ -18,19 +18,37 @@
 ;;; <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-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 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)