X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=irrlicht.scm;h=75e03f78bb296bf6a3824adce91b9cd20e8ab065;hp=8c5178001bdd8384238219fd8347165c7cb95974;hb=06d4163c5154f0fd2e934e197bb55d06e1a2b0fa;hpb=08677eca02dfe600ae413ec9f052308b322ad767

diff --git a/irrlicht.scm b/irrlicht.scm
index 8c51780..75e03f7 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,23 +19,93 @@
 
 
 (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))
+  #:use-module (oop goops)
+  #:use-module (irrlicht base)
+  #:use-module (irrlicht core)
+  #: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 (;; classes
+               <animated-mesh>
+               <animated-mesh-scene-node>
+               <attribute-exchanging-object>
+               <box3d>
+               <camera-scene-node>
+               <cursor-control>
+               <event>
+               <event-receiver>
+               <file-archive>
+               <file-system>
+               <gui-element>
+               <gui-environment>
+               <gui-static-text>
+               <irrlicht-device>
+               <key-map>
+               <material>
+               <mesh>
+               <mesh-scene-node>
+               <reference-counted>
+               <scene-manager>
+               <scene-node>
+               <scene-node-animator>
+               <texture>
+               <vertex3d>
+               <video-driver>
+               ;; methods
+               add-animated-mesh-scene-node!
+               add-animator!
+               add-camera-scene-node!
+               add-camera-scene-node-fps!
+               add-cube-scene-node!
+               add-custom-scene-node!
+               add-file-archive!
+               add-internal-point!
+               add-octree-scene-node!
+               add-sphere-scene-node!
+               add-static-text!
+               begin-scene
+               create-device
+               create-fly-circle-animator
+               create-fly-straight-animator
+               create-rotation-animator
+               draw-vertex-primitive-list
+               drop!
+               end-scene
+               get-absolute-transformation
+               get-cursor-control
+               get-event-type
+               get-file-system
+               get-fps
+               get-gui-environment
+               get-mesh
+               get-name
+               get-position
+               get-root-scene-node
+               get-scene-manager
+               get-texture
+               get-video-driver
+               is-window-active?
+               make-box3d
+               make-event-receiver
+               make-material
+               make-vertex3d
+               reset-box3d!
+               run
+               set-animation-speed!
+               set-frame-loop!
+               set-material!
+               set-material-flag!
+               set-material-texture!
+               set-md2-animation!
+               set-position!
+               set-transform!
+               set-visible!
+               set-window-caption!
+               yield-device))
 
-(define* (create-device #:optional
-                        (device-type 'software)
-                        (window-size '(640 480)))
-  (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)))
+;; Merged methods have to be exported apart
+(re-export draw-all)