X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscene-node.cpp;h=0caea376d6837f06d7a8d70c32bd92ca35cac3f8;hb=cda8d6e3636e9ad6878b8e6b0c4449f6f9c635f0;hp=d8fcd0d3b9a05b3c503b600ee1d02840df245b59;hpb=2cca3297e02be62c3a5c7aacb5e90d35fe1b1588;p=guile-irrlicht.git

diff --git a/src/scene-node.cpp b/src/scene-node.cpp
index d8fcd0d..0caea37 100644
--- a/src/scene-node.cpp
+++ b/src/scene-node.cpp
@@ -33,18 +33,18 @@ using namespace irr;
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_addAnimator (SCM scene_node,
-                              SCM animator)
+ISceneNode_addAnimator (SCM scene_node,
+                        SCM animator)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
-  node->addAnimator (unwrap_scene_node_animator (animator));
+  node->addAnimator ((scene::ISceneNodeAnimator*) scm_to_pointer (animator));
   return SCM_UNSPECIFIED;
 }
 
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_getAbsoluteTransformation (SCM scene_node)
+ISceneNode_getAbsoluteTransformation (SCM scene_node)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   return scm_from_matrix4 (node->getAbsoluteTransformation ());
@@ -53,7 +53,7 @@ scene_ISceneNode_getAbsoluteTransformation (SCM scene_node)
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_getPosition (SCM scene_node)
+ISceneNode_getPosition (SCM scene_node)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   return scm_from_vector3df (node->getPosition ());
@@ -62,9 +62,9 @@ scene_ISceneNode_getPosition (SCM scene_node)
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setMaterialFlag (SCM scene_node,
-                                  SCM flag,
-                                  SCM newvalue)
+ISceneNode_setMaterialFlag (SCM scene_node,
+                            SCM flag,
+                            SCM newvalue)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setMaterialFlag (scm_to_material_flag (flag), scm_to_bool (newvalue));
@@ -74,9 +74,9 @@ scene_ISceneNode_setMaterialFlag (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setMaterialTexture (SCM scene_node,
-                                     SCM texture_layer,
-                                     SCM texture)
+ISceneNode_setMaterialTexture (SCM scene_node,
+                               SCM texture_layer,
+                               SCM texture)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setMaterialTexture (scm_to_uint32 (texture_layer),
@@ -87,8 +87,8 @@ scene_ISceneNode_setMaterialTexture (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setPosition (SCM scene_node,
-                              SCM position)
+ISceneNode_setPosition (SCM scene_node,
+                        SCM position)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setPosition (scm_to_vector3df (position));
@@ -98,8 +98,8 @@ scene_ISceneNode_setPosition (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setRotation (SCM scene_node,
-                              SCM rotation)
+ISceneNode_setRotation (SCM scene_node,
+                        SCM rotation)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setRotation (scm_to_vector3df (rotation));
@@ -109,8 +109,8 @@ scene_ISceneNode_setRotation (SCM scene_node,
 
 template <typename TSceneNode>
 SCM
-scene_ISceneNode_setScale (SCM scene_node,
-                           SCM scale)
+ISceneNode_setScale (SCM scene_node,
+                     SCM scale)
 {
   TSceneNode node = (TSceneNode) scm_to_pointer (scene_node);
   node->setScale (scm_to_vector3df (scale));
@@ -123,51 +123,51 @@ extern "C" {
   void
   init_scene_node (void)
   {
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_addAnimator", 2, 0, 0,
-                  scene_ISceneNode_addAnimator<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_ISceneNode_getAbsoluteTransformation", 1, 0, 0,
-                  scene_ISceneNode_getAbsoluteTransformation<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IMeshSceneNode_getPosition", 1, 0, 0,
-                  scene_ISceneNode_getPosition<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_getPosition", 1, 0, 0,
-                  scene_ISceneNode_getPosition<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setMaterialFlag", 3, 0, 0,
-                  scene_ISceneNode_setMaterialFlag<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setMaterialTexture", 3, 0, 0,
-                  scene_ISceneNode_setMaterialTexture<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IMeshSceneNode_setPosition", 2, 0, 0,
-                  scene_ISceneNode_setPosition<scene::IMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setPosition", 2, 0, 0,
-                  scene_ISceneNode_setPosition<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ICameraSceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::ICameraSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setRotation", 2, 0, 0,
-                  scene_ISceneNode_setRotation<scene::ISceneNode*>);
-
-    DEFINE_GSUBR ("scene_IAnimatedMeshSceneNode_setScale", 2, 0, 0,
-                  scene_ISceneNode_setScale<scene::IAnimatedMeshSceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneNode_setScale", 2, 0, 0,
-                  scene_ISceneNode_setScale<scene::ISceneNode*>);
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_addAnimator", 2, 0, 0,
+                  ISceneNode_addAnimator<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("ISceneNode_getAbsoluteTransformation", 1, 0, 0,
+                  ISceneNode_getAbsoluteTransformation<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IMeshSceneNode_getPosition", 1, 0, 0,
+                  ISceneNode_getPosition<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_getPosition", 1, 0, 0,
+                  ISceneNode_getPosition<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setMaterialFlag", 3, 0, 0,
+                  ISceneNode_setMaterialFlag<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("IMeshSceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setMaterialTexture", 3, 0, 0,
+                  ISceneNode_setMaterialTexture<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IMeshSceneNode_setPosition", 2, 0, 0,
+                  ISceneNode_setPosition<scene::IMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setPosition", 2, 0, 0,
+                  ISceneNode_setPosition<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("ICameraSceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::ICameraSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setRotation", 2, 0, 0,
+                  ISceneNode_setRotation<scene::ISceneNode*>);
+
+    DEFINE_GSUBR ("IAnimatedMeshSceneNode_setScale", 2, 0, 0,
+                  ISceneNode_setScale<scene::IAnimatedMeshSceneNode*>);
+    DEFINE_GSUBR ("ISceneNode_setScale", 2, 0, 0,
+                  ISceneNode_setScale<scene::ISceneNode*>);
   }
 
 }