From: Javier Sancho Date: Tue, 12 May 2020 06:20:14 +0000 (+0200) Subject: draw-all X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=commitdiff_plain;h=3a61cfa560b91b5a87dc1a87f33e7bacccc1084e draw-all --- diff --git a/irrlicht.scm b/irrlicht.scm index b1c3a82..45f3fc2 100644 --- a/irrlicht.scm +++ b/irrlicht.scm @@ -19,11 +19,13 @@ (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) + #:duplicates (merge-generics) #: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!)) + +;; Merged methods have to be exported apart +(re-export draw-all) diff --git a/irrlicht/gui.scm b/irrlicht/gui.scm index aa12d37..1d79f29 100644 --- a/irrlicht/gui.scm +++ b/irrlicht/gui.scm @@ -57,7 +57,11 @@ id fill-background)))) -(export add-static-text!) +(define-method (draw-all (gui-environment )) + ((get-irrlicht-proc "drawAll" gui-environment) + (irr-pointer gui-environment))) + +(export add-static-text! draw-all) ;; IGUIStaticText diff --git a/irrlicht/scene.scm b/irrlicht/scene.scm index c1fac94..cf51aa5 100644 --- a/irrlicht/scene.scm +++ b/irrlicht/scene.scm @@ -85,6 +85,10 @@ id make-active)))) +(define-method (draw-all (scene-manager )) + ((get-irrlicht-proc "drawAll" scene-manager) + (irr-pointer scene-manager))) + (define-method (get-mesh (scene-manager ) filename) (make #:irr-pointer @@ -92,7 +96,7 @@ (irr-pointer scene-manager) filename))) -(export add-animated-mesh-scene-node! add-camera-scene-node! get-mesh) +(export add-animated-mesh-scene-node! add-camera-scene-node! draw-all get-mesh) ;; ISceneNode