X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fscene.scm;h=d268dea8a583492e5f8fddafb7478c3a0b9a061a;hb=fc3be36ca8e29c32e1758ae99c9982aa287d8920;hp=ee47d4c57fccee84f9beab104ff3ae63bb15c2a7;hpb=5cd7046669d8cb991f75e1e56b4155f29bb80935;p=guile-irrlicht.git

diff --git a/irrlicht/scene.scm b/irrlicht/scene.scm
index ee47d4c..d268dea 100644
--- a/irrlicht/scene.scm
+++ b/irrlicht/scene.scm
@@ -24,28 +24,31 @@
   #:use-module (irrlicht base)
   #:use-module (irrlicht foreign)
   #:use-module (irrlicht io)
-  #:use-module (irrlicht irr))
+  #:use-module (irrlicht irr)
+  #:use-module (irrlicht video))
 
 
 ;; IMesh
 (define-class <mesh> (<reference-counted>)
-  (irr-class #:init-value "IMesh" #:getter irr-class))
+  (irr-class #:init-value "IMesh"))
 
 (export <mesh>)
 
 
 ;; IAnimatedMesh
 (define-class <animated-mesh> (<mesh>)
-  (irr-class #:init-value "IAnimatedMesh" #:getter irr-class))
+  (irr-class #:init-value "IAnimatedMesh"))
 
 (export <animated-mesh>)
 
 
 ;; ISceneManager
 (define-class <scene-manager> (<reference-counted>)
-  (irr-class #:init-value "ISceneManager" #:getter irr-class))
+  (irr-class #:init-value "ISceneManager"))
 
-(define-method (add-animated-mesh-scene-node! (scene-manager <scene-manager>) mesh . rest)
+(define-method (add-animated-mesh-scene-node! (scene-manager <scene-manager>)
+                                              (mesh <animated-mesh>)
+                                              . rest)
   (let-keywords rest #f
         ((parent (make <scene-node>))
          (id -1)
@@ -56,40 +59,79 @@
     (make <animated-mesh-scene-node>
       #:irr-pointer
       ((get-irrlicht-proc "addAnimatedMeshSceneNode" scene-manager parent)
-       (irr-pointer scene-manager)
-       (irr-pointer mesh)
-       (irr-pointer parent)
+       scene-manager
+       mesh
+       parent
        id
        position
        rotation
        scale
        also-add-if-mesh-pointer-zero))))
 
+(define-method (add-camera-scene-node! (scene-manager <scene-manager>) . rest)
+  (let-keywords rest #f
+        ((parent (make <scene-node>))
+         (position '(0 0 0))
+         (lookat '(0 0 100))
+         (id -1)
+         (make-active #t))
+    (make <camera-scene-node>
+      #:irr-pointer
+      ((get-irrlicht-proc "addCameraSceneNode" scene-manager parent)
+       scene-manager
+       parent
+       position
+       lookat
+       id
+       make-active))))
+
+(define-method (draw-all (scene-manager <scene-manager>))
+  ((get-irrlicht-proc "drawAll" scene-manager)
+   scene-manager))
+
 (define-method (get-mesh (scene-manager <scene-manager>) filename)
   (make <animated-mesh>
     #:irr-pointer
     ((get-irrlicht-proc "getMesh" scene-manager)
-     (irr-pointer scene-manager)
+     scene-manager
      filename)))
 
-(export <scene-manager> add-animated-mesh-scene-node! get-mesh)
+(export <scene-manager> add-animated-mesh-scene-node! add-camera-scene-node! draw-all get-mesh)
 
 
 ;; ISceneNode
 (define-class <scene-node> (<attribute-exchanging-object>)
-  (irr-class #:init-value "ISceneNode" #:getter irr-class))
+  (irr-class #:init-value "ISceneNode"))
 
 (define-method (set-material-flag! (node <scene-node>) flag new-value)
   ((get-irrlicht-proc "setMaterialFlag" node)
-   (irr-pointer node)
+   node
    flag
    new-value))
 
-(export <scene-node> set-material-flag!)
+(define-method (set-material-texture! (node <scene-node>) texture-layer (texture <texture>))
+  ((get-irrlicht-proc "setMaterialTexture" node)
+   node
+   texture-layer
+   texture))
 
+(export <scene-node> set-material-flag! set-material-texture!)
 
-;; ISceneNode
+
+;; IAnimatedMeshSceneNode
 (define-class <animated-mesh-scene-node> (<scene-node>)
-  (irr-class #:init-value "IAnimatedMeshSceneNode" #:getter irr-class))
+  (irr-class #:init-value "IAnimatedMeshSceneNode"))
+
+(define-method (set-md2-animation! (node <animated-mesh-scene-node>) anim)
+  ((get-irrlicht-proc "setMD2Animation" node)
+   node
+   anim))
+
+(export <animated-mesh-scene-node> set-md2-animation!)
+
+
+;; ICameraSceneNode
+(define-class <camera-scene-node> (<scene-node>)
+  (irr-class #:init-value "ICameraSceneNode"))
 
-(export <animated-mesh-scene-node>)
+(export <camera-scene-node>)