X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-node.cpp;h=31109eae09e65d6d39dd616d8ac4b8ae5d431a6c;hb=a1fe598c49e7222ec5a01ad62b49026825f595d9;hp=d7b5e3651333f5ecd1e08cec54e4028411b38541;hpb=2cdd08f70b0a58b2f00b341df5b73704d3febd47;p=guile-irrlicht.git

diff --git a/src/scene-node.cpp b/src/scene-node.cpp
index d7b5e36..31109ea 100644
--- a/src/scene-node.cpp
+++ b/src/scene-node.cpp
@@ -23,8 +23,12 @@
 #include <libguile.h>
 
 #include "animated-mesh-scene-node.h"
+#include "gsubr.h"
+#include "material-flags.h"
+#include "matrix4.h"
 #include "mesh-scene-node.h"
 #include "scene-node.h"
+#include "scene-node-animator.h"
 #include "texture.h"
 #include "vector3d.h"
 #include "wrapped.h"
@@ -35,36 +39,104 @@ extern "C" {
   init_scene_node (void)
   {
     init_scene_node_type ();
-    scm_c_define_gsubr ("set-material-texture!", 3, 0, 0, (scm_t_subr)irr_scene_setMaterialTexture);
-    scm_c_export ("set-material-texture!", NULL);
+    DEFINE_GSUBR ("add-animator!", 2, 0, 0, irr_scene_addAnimator);
+    DEFINE_GSUBR ("get-absolute-transformation", 1, 0, 0, irr_scene_getAbsoluteTransformation);
+    DEFINE_GSUBR ("set-material-texture!", 3, 0, 0, irr_scene_setMaterialTexture);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneNode*, "scene-node",
                        init_scene_node_type, scene_node_p,
                        wrap_scene_node, unwrap_scene_node);
 
+  SCM
+  irr_scene_addAnimator (SCM wrapped_scene_node,
+                         SCM animator)
+  {
+#define ADD_ANIMATOR(NODE) NODE->addAnimator (unwrap_scene_node_animator (animator));
+
+    if (animated_mesh_scene_node_p (wrapped_scene_node))
+      {
+        ADD_ANIMATOR (unwrap_animated_mesh_scene_node (wrapped_scene_node));
+      }
+    else if (mesh_scene_node_p (wrapped_scene_node))
+      {
+        ADD_ANIMATOR (unwrap_mesh_scene_node (wrapped_scene_node));
+      }
+    else if (scene_node_p (wrapped_scene_node))
+      {
+        ADD_ANIMATOR (unwrap_scene_node (wrapped_scene_node));
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot add animator flag to object: ~S",
+                   scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
+      }
+
+    return SCM_UNSPECIFIED;
+  }
+
+  SCM
+  irr_scene_getAbsoluteTransformation (SCM wrapped_scene_node)
+  {
+    irr::scene::ISceneNode* node = unwrap_scene_node (wrapped_scene_node);
+    return scm_from_matrix4 (node->getAbsoluteTransformation ());
+  }
+
+  SCM
+  irr_scene_ISceneNode_setMaterialFlag (SCM wrapped_scene_node,
+                                        SCM flag,
+                                        SCM newvalue)
+  {
+#define SET_MATERIAL_FLAG(NODE) NODE->setMaterialFlag (scm_to_material_flag (flag), \
+                                                       scm_to_bool (newvalue));
+
+    if (animated_mesh_scene_node_p (wrapped_scene_node))
+      {
+        SET_MATERIAL_FLAG (unwrap_animated_mesh_scene_node (wrapped_scene_node));
+      }
+    else if (mesh_scene_node_p (wrapped_scene_node))
+      {
+        SET_MATERIAL_FLAG (unwrap_mesh_scene_node (wrapped_scene_node));
+      }
+    else if (scene_node_p (wrapped_scene_node))
+      {
+        SET_MATERIAL_FLAG (unwrap_scene_node (wrapped_scene_node));
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot set material flag to object: ~S",
+                   scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
+      }
+
+    return SCM_UNSPECIFIED;
+  }
+
   SCM
   irr_scene_setMaterialTexture (SCM wrapped_scene_node,
                                 SCM texture_layer,
                                 SCM texture)
   {
+#define SET_MATERIAL_TEXTURE(NODE) NODE->setMaterialTexture (scm_to_uint32 (texture_layer), \
+                                                             unwrap_texture (texture));
+
     if (animated_mesh_scene_node_p (wrapped_scene_node))
       {
-        unwrap_animated_mesh_scene_node (wrapped_scene_node)->
-          setMaterialTexture (scm_to_uint32 (texture_layer),
-                              unwrap_texture (texture));
+        SET_MATERIAL_TEXTURE (unwrap_animated_mesh_scene_node (wrapped_scene_node));
+      }
+    else if (mesh_scene_node_p (wrapped_scene_node))
+      {
+        SET_MATERIAL_TEXTURE (unwrap_mesh_scene_node (wrapped_scene_node));
       }
     else if (scene_node_p (wrapped_scene_node))
       {
-        unwrap_scene_node (wrapped_scene_node)->
-          setMaterialTexture (scm_to_uint32 (texture_layer),
-                              unwrap_texture (texture));
+        SET_MATERIAL_TEXTURE (unwrap_scene_node (wrapped_scene_node));
       }
     else
       {
         scm_error (scm_arg_type_key, NULL, "Cannot set material texture to object: ~S",
                    scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
       }
+
     return SCM_UNSPECIFIED;
   }
 
@@ -72,21 +144,22 @@ extern "C" {
   irr_scene_setPosition (SCM wrapped_scene_node,
                          SCM position)
   {
+#define SET_POSITION(NODE) NODE->setPosition (scm_to_vector3df (position));
+
     if (scene_node_p (wrapped_scene_node))
       {
-        unwrap_scene_node (wrapped_scene_node)->
-          setPosition (scm_to_vector3df (position));
+        SET_POSITION (unwrap_scene_node (wrapped_scene_node));
       }
     else if (mesh_scene_node_p (wrapped_scene_node))
       {
-        unwrap_mesh_scene_node (wrapped_scene_node)->
-          setPosition (scm_to_vector3df (position));
+        SET_POSITION (unwrap_mesh_scene_node (wrapped_scene_node));
       }
     else
       {
         scm_error (scm_arg_type_key, NULL, "Cannot set position to object: ~S",
                    scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
       }
+
     return SCM_UNSPECIFIED;
   }