draw-all

diff --git a/irrlicht.scm b/irrlicht.scm
index b1c3a827d9679b142c3b76745d76e6104c22add0..45f3fc2fd6e690c0ea429a6830029d94d5d3af85 100644 (file)
--- a/irrlicht.scm
+++ b/irrlicht.scm
@@ -19,11 +19,13 @@
 
 
 (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 scene)
   #:use-module (irrlicht video)
   #:use-module (irrlicht base)
   #:use-module (irrlicht device)
   #:use-module (irrlicht gui)
   #:use-module (irrlicht scene)
   #:use-module (irrlicht video)

+  #:duplicates (merge-generics)

   #:re-export (add-animated-mesh-scene-node!
                add-camera-scene-node!
                add-static-text!
   #:re-export (add-animated-mesh-scene-node!
                add-camera-scene-node!
                add-static-text!


@@ -40,3 +42,6 @@
                set-material-texture!
                set-md2-animation!
                set-window-caption!))
                set-material-texture!
                set-md2-animation!
                set-window-caption!))

+
+;; Merged methods have to be exported apart
+(re-export draw-all)

diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm
index aa12d37424a7f70d806d9576f187f5d4a381f502..1d79f296ebff6d97ca88816fe3081f43e420d148 100644 (file)
--- a/irrlicht/gui.scm
+++ b/irrlicht/gui.scm
@@ -57,7 +57,11 @@
        id
        fill-background))))
 
        id
        fill-background))))
 

-(export <gui-environment> add-static-text!)
+(define-method (draw-all (gui-environment <gui-environment>))
+  ((get-irrlicht-proc "drawAll" gui-environment)
+   (irr-pointer gui-environment)))
+
+(export <gui-environment> add-static-text! draw-all)

 
 
 ;; IGUIStaticText
 
 
 ;; IGUIStaticText

diff --git a/irrlicht/scene.scm b/irrlicht/scene.scm
index c1fac94bea43aa1d63b0f6737d25a77d0af56a3d..cf51aa56866c7fa8c44f39d9a3d9b71abe8f5724 100644 (file)
--- a/irrlicht/scene.scm
+++ b/irrlicht/scene.scm
@@ -85,6 +85,10 @@
        id
        make-active))))
 
        id
        make-active))))
 

+(define-method (draw-all (scene-manager <scene-manager>))
+  ((get-irrlicht-proc "drawAll" scene-manager)
+   (irr-pointer scene-manager)))
+

 (define-method (get-mesh (scene-manager <scene-manager>) filename)
   (make <animated-mesh>
     #:irr-pointer
 (define-method (get-mesh (scene-manager <scene-manager>) filename)
   (make <animated-mesh>
     #:irr-pointer


@@ -92,7 +96,7 @@
      (irr-pointer scene-manager)
      filename)))
 
      (irr-pointer scene-manager)
      filename)))
 

-(export <scene-manager> add-animated-mesh-scene-node! add-camera-scene-node! get-mesh)
+(export <scene-manager> add-animated-mesh-scene-node! add-camera-scene-node! draw-all get-mesh)

 
 
 ;; ISceneNode
 
 
 ;; ISceneNode