X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=irrlicht%2Fscene.scm;h=425d01ec026bd8c08fa666beb6d764518deab0f8;hp=c1fac94bea43aa1d63b0f6737d25a77d0af56a3d;hb=0c415f2f23b5351bdd8e3901ccc29073fe98d9f6;hpb=cda8d6e3636e9ad6878b8e6b0c4449f6f9c635f0

diff --git a/irrlicht/scene.scm b/irrlicht/scene.scm
index c1fac94..425d01e 100644
--- a/irrlicht/scene.scm
+++ b/irrlicht/scene.scm
@@ -30,21 +30,28 @@
 
 ;; 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>)
 
 
+;; ISceneNodeAnimator
+(define-class <scene-node-animator> (<attribute-exchanging-object> <event-receiver>)
+  (irr-class #:init-value "ISceneNodeAnimator"))
+
+(export <scene-node-animator>)
+
+
 ;; 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 <animated-mesh>)
@@ -59,9 +66,9 @@
     (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
@@ -78,49 +85,144 @@
     (make <camera-scene-node>
       #:irr-pointer
       ((get-irrlicht-proc "addCameraSceneNode" scene-manager parent)
-       (irr-pointer scene-manager)
-       (irr-pointer parent)
+       scene-manager
+       parent
        position
        lookat
        id
        make-active))))
 
+(define-method (add-camera-scene-node-fps! (scene-manager <scene-manager>) . rest)
+  (let-keywords rest #f
+        ((parent (make <scene-node>))
+         (rotate-speed 100)
+         (move-speed 0.5)
+         (id -1)
+         (key-map-array (make <key-map>))
+         (key-map-size 0)
+         (no-vertical-movement #f)
+         (jump-speed 0)
+         (invert-mouse #f)
+         (make-active #t))
+    (let ((addCameraSceneNodeFPS (get-irrlicht-proc "addCameraSceneNodeFPS"
+                                                    scene-manager parent)))
+      (make <camera-scene-node>
+        #:irr-pointer
+        (addCameraSceneNodeFPS scene-manager #:parent parent #:rotate-speed rotate-speed
+                               #:move-speed move-speed #:id id #:key-map-array key-map-array
+                               #:key-map-size key-map-size
+                               #:no-vertical-movement no-vertical-movement
+                               #:jump-speed jump-speed #:invert-mouse invert-mouse
+                               #:make-active make-active)))))
+
+(define-method (add-custom-scene-node! (scene-manager <scene-manager>) proc-render
+                                       proc-get-bounding-box  proc-get-material-count
+                                       proc-get-material . rest)
+  (let-keywords rest #f
+        ((parent (make <scene-node>))
+         (id -1)
+         (position '(0 0 0))
+         (rotation '(0 0 0))
+         (scale '(1 1 1)))
+    (let ((addCustomSceneNode (get-irrlicht-proc "addCustomSceneNode" scene-manager parent)))
+      (make <scene-node>
+        #:irr-pointer
+        (addCustomSceneNode scene-manager proc-render proc-get-bounding-box proc-get-material-count
+                            proc-get-material parent id position rotation scale)))))
+
+(define-method (add-octree-scene-node! (scene-manager <scene-manager>)
+                                       (mesh <animated-mesh>)
+                                       . rest)
+  (let-keywords rest #f
+        ((parent (make <scene-node>))
+         (id -1)
+         (minimal-polys-per-node 512)
+         (also-add-if-mesh-pointer-zero #f))
+    (let ((addOctreeSceneNode (get-irrlicht-proc "addOctreeSceneNode" scene-manager parent mesh)))
+      (make <mesh-scene-node>
+        #:irr-pointer
+        (addOctreeSceneNode scene-manager mesh parent id minimal-polys-per-node
+                            also-add-if-mesh-pointer-zero)))))
+
+(define-method (add-octree-scene-node! (scene-manager <scene-manager>)
+                                       (mesh <mesh>)
+                                       . rest)
+  (let-keywords rest #f
+        ((parent (make <scene-node>))
+         (id -1)
+         (minimal-polys-per-node 256)
+         (also-add-if-mesh-pointer-zero #f))
+    (let ((addOctreeSceneNode (get-irrlicht-proc "addOctreeSceneNode" scene-manager parent mesh)))
+      (make <mesh-scene-node>
+        #:irr-pointer
+        (addOctreeSceneNode scene-manager mesh parent id minimal-polys-per-node
+                            also-add-if-mesh-pointer-zero)))))
+
+(define-method (create-rotation-animator (scene-manager <scene-manager>) rotation-speed)
+  (let ((createRotationAnimator (get-irrlicht-proc "createRotationAnimator" scene-manager)))
+    (make <scene-node-animator>
+      #:irr-pointer
+      (createRotationAnimator scene-manager rotation-speed))))
+
+(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! add-camera-scene-node! get-mesh)
+(define-method (get-root-scene-node (scene-manager <scene-manager>))
+  (let ((getRootSceneNode (get-irrlicht-proc "getRootSceneNode" scene-manager)))
+    (make <scene-node> #:irr-pointer (getRootSceneNode scene-manager))))
+
+(export <scene-manager> add-animated-mesh-scene-node! add-camera-scene-node!
+        add-camera-scene-node-fps! add-custom-scene-node! add-octree-scene-node!
+        create-rotation-animator draw-all get-root-scene-node 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 (add-animator! (node <scene-node>) (animator <scene-node-animator>))
+  (let ((addAnimator (get-irrlicht-proc "addAnimator" node)))
+    (addAnimator node animator)))
+
+(define-method (get-absolute-transformation (node <scene-node>))
+  (let ((getAbsoluteTransformation (get-irrlicht-proc "getAbsoluteTransformation" node)))
+    (getAbsoluteTransformation node)))
 
 (define-method (set-material-flag! (node <scene-node>) flag new-value)
   ((get-irrlicht-proc "setMaterialFlag" node)
-   (irr-pointer node)
+   node
    flag
    new-value))
 
 (define-method (set-material-texture! (node <scene-node>) texture-layer (texture <texture>))
   ((get-irrlicht-proc "setMaterialTexture" node)
-   (irr-pointer node)
+   node
    texture-layer
-   (irr-pointer texture)))
+   texture))
+
+(define-method (set-position! (node <scene-node>) new-pos)
+  (let ((setPosition (get-irrlicht-proc "setPosition" node)))
+    (setPosition node new-pos)))
 
-(export <scene-node> set-material-flag! set-material-texture!)
+(export <scene-node> add-animator! get-absolute-transformation set-material-flag!
+        set-material-texture! set-position!)
 
 
 ;; 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)
-   (irr-pointer node)
+   node
    anim))
 
 (export <animated-mesh-scene-node> set-md2-animation!)
@@ -128,6 +230,13 @@
 
 ;; ICameraSceneNode
 (define-class <camera-scene-node> (<scene-node>)
-  (irr-class #:init-value "ICameraSceneNode" #:getter irr-class))
+  (irr-class #:init-value "ICameraSceneNode"))
 
 (export <camera-scene-node>)
+
+
+;; IMeshSceneNode
+(define-class <mesh-scene-node> (<scene-node>)
+  (irr-class #:init-value "IMeshSceneNode"))
+
+(export <mesh-scene-node>)