wrap Irrlicht objects in C++

[guile-irrlicht.git] / irrlicht / scene.scm

diff --git a/irrlicht/scene.scm b/irrlicht/scene.scm
index 9626f4b33cdabe64723d1463852fd9a016492327..0ac44842f5fff33f744506b1f4864839dc22426d 100644 (file)
--- a/irrlicht/scene.scm
+++ b/irrlicht/scene.scm
@@ -66,12 +66,12 @@
     (let* ((addAnimatedMeshSceneNode (get-irrlicht-proc "addAnimatedMeshSceneNode"
                                                         scene-manager
                                                         parent))
-           (node-pointer (addAnimatedMeshSceneNode scene-manager mesh parent id position
-                                                   rotation scale also-add-if-mesh-pointer-zero)))
-      (cond ((null-pointer? node-pointer)
+           (node (addAnimatedMeshSceneNode scene-manager mesh parent id position
+                                           rotation scale also-add-if-mesh-pointer-zero)))
+      (cond ((null-object? node)
              (error "In procedure add-animated-mesh-scene-node!: Scene node cannot be created"))
             (else
-             (make <animated-mesh-scene-node> #:irr-pointer node-pointer))))))
+             node)))))
 
 (define-method (add-camera-scene-node! (scene-manager <scene-manager>) . rest)
   (let-keywords rest #f
@@ -80,15 +80,8 @@
          (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))))
+    (let ((addCameraSceneNode (get-irrlicht-proc "addCameraSceneNode" scene-manager parent)))
+      (addCameraSceneNode scene-manager parent position lookat id make-active))))
 
 (define-method (add-camera-scene-node-fps! (scene-manager <scene-manager>) . rest)
   (let-keywords rest #f
@@ -104,14 +97,12 @@
          (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)))))
+      (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
@@ -123,10 +114,8 @@
          (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)))))
+      (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>)
@@ -137,10 +126,8 @@
          (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)))))
+      (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>)
@@ -151,16 +138,12 @@
          (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)))))
+      (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))))
+    (createRotationAnimator scene-manager rotation-speed)))
 
 (define-method (draw-all (scene-manager <scene-manager>))
   ((get-irrlicht-proc "drawAll" scene-manager)
@@ -168,15 +151,15 @@
 
 (define-method (get-mesh (scene-manager <scene-manager>) filename)
   (let* ((getMesh (get-irrlicht-proc "getMesh" scene-manager))
-         (mesh-pointer (getMesh scene-manager filename)))
-    (cond ((null-pointer? mesh-pointer)
+         (mesh (getMesh scene-manager filename)))
+    (cond ((null-object? mesh)
            (error "In procedure get-mesh: Mesh cannot be created"))
           (else
-           (make <animated-mesh> #:irr-pointer mesh-pointer)))))
+           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))))
+    (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!