Improve support for animated mesh scene nodes

[guile-irrlicht.git] / src / scene-node.cpp

diff --git a/src/scene-node.cpp b/src/scene-node.cpp
index f587c05ec28f86662a435bd178b096550c53d605..cdad6417e3ba31ff9543d677ae9bcbcc09dd3c50 100644 (file)
--- a/src/scene-node.cpp
+++ b/src/scene-node.cpp
@@ -23,6 +23,7 @@
 #include <libguile.h>
 
 #include "animated-mesh-scene-node.h"
+#include "gsubr.h"
 #include "material-flags.h"
 #include "matrix4.h"
 #include "mesh-scene-node.h"
@@ -38,12 +39,9 @@ extern "C" {
   init_scene_node (void)
   {
     init_scene_node_type ();
-    scm_c_define_gsubr ("add-animator!", 2, 0, 0, (scm_t_subr)irr_scene_addAnimator);
-    scm_c_define_gsubr ("get-absolute-transformation", 1, 0, 0,
-                        (scm_t_subr)irr_scene_getAbsoluteTransformation);
-    scm_c_define_gsubr ("set-material-texture!", 3, 0, 0, (scm_t_subr)irr_scene_setMaterialTexture);
-    scm_c_export ("add-animator!", "get-absolute-transformation",
-                  "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",
@@ -54,7 +52,26 @@ extern "C" {
   irr_scene_addAnimator (SCM wrapped_scene_node,
                          SCM animator)
   {
-    irr::scene::ISceneNode* node = unwrap_scene_node (wrapped_scene_node);
+    irr::scene::ISceneNode* node;
+
+    if (animated_mesh_scene_node_p (wrapped_scene_node))
+      {
+        node = (irr::scene::ISceneNode*)unwrap_animated_mesh_scene_node (wrapped_scene_node);
+      }
+    else if (mesh_scene_node_p (wrapped_scene_node))
+      {
+        node = (irr::scene::ISceneNode*)unwrap_mesh_scene_node (wrapped_scene_node);
+      }
+    else if (scene_node_p (wrapped_scene_node))
+      {
+        node = 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));
+      }
+
     node->addAnimator (unwrap_scene_node_animator (animator));
     return SCM_UNSPECIFIED;
   }