X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-node.cpp;h=f587c05ec28f86662a435bd178b096550c53d605;hb=789237bc01f8b2172725b51dbc7ae72b9a30be7a;hp=c92c2d5dcf45d62ea4d872fc57c80ef78fd2aac3;hpb=d8ff74866c89933d74577d7887e47f013d515c69;p=guile-irrlicht.git

diff --git a/src/scene-node.cpp b/src/scene-node.cpp
index c92c2d5..f587c05 100644
--- a/src/scene-node.cpp
+++ b/src/scene-node.cpp
@@ -23,6 +23,8 @@
 #include <libguile.h>
 
 #include "animated-mesh-scene-node.h"
+#include "material-flags.h"
+#include "matrix4.h"
 #include "mesh-scene-node.h"
 #include "scene-node.h"
 #include "scene-node-animator.h"
@@ -37,8 +39,11 @@ extern "C" {
   {
     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!", "set-material-texture!", NULL);
+    scm_c_export ("add-animator!", "get-absolute-transformation",
+                  "set-material-texture!", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneNode*, "scene-node",
@@ -54,28 +59,70 @@ extern "C" {
     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)
+  {
+    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 set material flag to object: ~S",
+                   scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
+      }
+
+    node->setMaterialFlag (scm_to_material_flag (flag),
+                           scm_to_bool (newvalue));
+    return SCM_UNSPECIFIED;
+  }
+
   SCM
   irr_scene_setMaterialTexture (SCM wrapped_scene_node,
                                 SCM texture_layer,
                                 SCM texture)
   {
+    irr::scene::ISceneNode* node;
+
     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));
+        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))
       {
-        unwrap_scene_node (wrapped_scene_node)->
-          setMaterialTexture (scm_to_uint32 (texture_layer),
-                              unwrap_texture (texture));
+        node = 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));
       }
+
+    node->setMaterialTexture (scm_to_uint32 (texture_layer),
+                              unwrap_texture (texture));
     return SCM_UNSPECIFIED;
   }