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

diff --git a/src/scene-node.cpp b/src/scene-node.cpp
index cdad641..31109ea 100644
--- a/src/scene-node.cpp
+++ b/src/scene-node.cpp
@@ -52,19 +52,19 @@ extern "C" {
   irr_scene_addAnimator (SCM wrapped_scene_node,
                          SCM animator)
   {
-    irr::scene::ISceneNode* node;
+#define ADD_ANIMATOR(NODE) NODE->addAnimator (unwrap_scene_node_animator (animator));
 
     if (animated_mesh_scene_node_p (wrapped_scene_node))
       {
-        node = (irr::scene::ISceneNode*)unwrap_animated_mesh_scene_node (wrapped_scene_node);
+        ADD_ANIMATOR (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);
+        ADD_ANIMATOR (unwrap_mesh_scene_node (wrapped_scene_node));
       }
     else if (scene_node_p (wrapped_scene_node))
       {
-        node = unwrap_scene_node (wrapped_scene_node);
+        ADD_ANIMATOR (unwrap_scene_node (wrapped_scene_node));
       }
     else
       {
@@ -72,7 +72,6 @@ extern "C" {
                    scm_list_1 (wrapped_scene_node), scm_list_1 (wrapped_scene_node));
       }
 
-    node->addAnimator (unwrap_scene_node_animator (animator));
     return SCM_UNSPECIFIED;
   }
 
@@ -88,19 +87,20 @@ extern "C" {
                                         SCM flag,
                                         SCM newvalue)
   {
-    irr::scene::ISceneNode* node;
+#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))
       {
-        node = (irr::scene::ISceneNode*)unwrap_animated_mesh_scene_node (wrapped_scene_node);
+        SET_MATERIAL_FLAG (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);
+        SET_MATERIAL_FLAG (unwrap_mesh_scene_node (wrapped_scene_node));
       }
     else if (scene_node_p (wrapped_scene_node))
       {
-        node = unwrap_scene_node (wrapped_scene_node);
+        SET_MATERIAL_FLAG (unwrap_scene_node (wrapped_scene_node));
       }
     else
       {
@@ -108,8 +108,6 @@ extern "C" {
                    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;
   }
 
@@ -118,19 +116,20 @@ extern "C" {
                                 SCM texture_layer,
                                 SCM texture)
   {
-    irr::scene::ISceneNode* node;
+#define SET_MATERIAL_TEXTURE(NODE) NODE->setMaterialTexture (scm_to_uint32 (texture_layer), \
+                                                             unwrap_texture (texture));
 
     if (animated_mesh_scene_node_p (wrapped_scene_node))
       {
-        node = (irr::scene::ISceneNode*)unwrap_animated_mesh_scene_node (wrapped_scene_node);
+        SET_MATERIAL_TEXTURE (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);
+        SET_MATERIAL_TEXTURE (unwrap_mesh_scene_node (wrapped_scene_node));
       }
     else if (scene_node_p (wrapped_scene_node))
       {
-        node = unwrap_scene_node (wrapped_scene_node);
+        SET_MATERIAL_TEXTURE (unwrap_scene_node (wrapped_scene_node));
       }
     else
       {
@@ -138,8 +137,6 @@ extern "C" {
                    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;
   }
 
@@ -147,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;
   }