X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=0f3e54cdae86130a56d8675dbc4364ca971ec9a9;hp=cb7f80c94d0249106ff105ae3d39b0a91e5fa681;hb=9eb3d3607d4468b525df34096657fd04f77724e7;hpb=bdd3bebca0131db5ecaf7219b6019ee267468538

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index cb7f80c..0f3e54c 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -26,6 +26,8 @@
 #include "animated-mesh-scene-node.h"
 #include "camera-scene-node.h"
 #include "device.h"
+#include "mesh.h"
+#include "mesh-scene-node.h"
 #include "scene-manager.h"
 #include "scene-node.h"
 #include "vector3d.h"
@@ -41,10 +43,12 @@ extern "C" {
                         (scm_t_subr)irr_scene_addAnimatedMeshSceneNode);
     scm_c_define_gsubr ("add-camera-scene-node!", 1, 0, 1,
                         (scm_t_subr)irr_scene_addCameraSceneNode);
+    scm_c_define_gsubr ("add-octree-scene-node!", 2, 0, 1,
+                        (scm_t_subr)irr_scene_addOctreeSceneNode);
     scm_c_define_gsubr ("get-mesh", 2, 0, 0, (scm_t_subr)irr_scene_getMesh);
     scm_c_define_gsubr ("get-scene-manager", 1, 0, 0, (scm_t_subr)irr_getSceneManager);
     scm_c_export ("add-animated-mesh-scene-node!", "add-camera-scene-node!",
-                  "get-mesh", "get-scene-manager", NULL);
+                  "add-octree-scene-node!", "get-mesh", "get-scene-manager", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneManager*, "scene-manager",
@@ -122,6 +126,44 @@ extern "C" {
     return wrap_camera_scene_node (camera);
   }
 
+  SCM
+  irr_scene_addOctreeSceneNode (SCM wrapped_scene_manager,
+                                SCM wrapped_mesh,
+                                SCM rest)
+  {
+    SCM parent = scm_from_bool (0);
+    SCM id = scm_from_int32 (-1);
+    SCM minimal_polys_per_node = scm_from_int32 (256);
+    SCM also_add_if_mesh_pointer_zero = scm_from_bool (0);
+
+    scm_c_bind_keyword_arguments ("add-octree-scene-node!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("minimal-polys-per-node"), &minimal_polys_per_node,
+                                  scm_from_utf8_keyword ("also-add-if-mesh-pointer-zero"), &also_add_if_mesh_pointer_zero,
+                                  SCM_UNDEFINED);
+
+    irr::scene::ISceneManager* smgr = unwrap_scene_manager (wrapped_scene_manager);
+    irr::scene::IMeshSceneNode* node;
+    if (animated_mesh_p (wrapped_mesh))
+      {
+        node = smgr->addOctreeSceneNode (unwrap_animated_mesh (wrapped_mesh),
+                                         scm_is_false (parent) ? 0 : unwrap_scene_node (parent),
+                                         scm_to_int32 (id),
+                                         scm_to_int32 (minimal_polys_per_node),
+                                         scm_to_bool (also_add_if_mesh_pointer_zero));
+      }
+    else
+      {
+        node = smgr->addOctreeSceneNode (unwrap_mesh (wrapped_mesh),
+                                         scm_is_false (parent) ? 0 : unwrap_scene_node (parent),
+                                         scm_to_int32 (id),
+                                         scm_to_int32 (minimal_polys_per_node),
+                                         scm_to_bool (also_add_if_mesh_pointer_zero));
+      }
+    return wrap_mesh_scene_node (node);
+  }
+
   SCM
   irr_scene_getMesh (SCM wrapped_scene_manager,
                      SCM filename)