X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=3c080d566439b46e26932de4ee08408783a9bb35;hb=626e88180d4a966f12defc721c4a4411451ea916;hp=d4234e8c10c043f799de78d122c2ab26f1f6e2a9;hpb=fb9011bf9160be890e0a6b98fcff9ed95ae0bd77;p=guile-irrlicht.git

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index d4234e8..3c080d5 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -24,6 +24,7 @@
 
 #include "animated-mesh.h"
 #include "animated-mesh-scene-node.h"
+#include "camera-scene-node.h"
 #include "device.h"
 #include "scene-manager.h"
 #include "scene-node.h"
@@ -36,8 +37,10 @@ extern "C" {
   init_scene_manager (void)
   {
     init_scene_manager_type ();
-    scm_c_define_gsubr ("add-animated-mesh-scene-node", 8, 0, 0,
+    scm_c_define_gsubr ("add-animated-mesh-scene-node!", 8, 0, 0,
                         (scm_t_subr)irr_scene_addAnimatedMeshSceneNode);
+    scm_c_define_gsubr ("add-camera-scene-node!", 6, 0, 0,
+                        (scm_t_subr)irr_scene_addCameraSceneNode);
     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);
   }
@@ -46,22 +49,6 @@ extern "C" {
                        init_scene_manager_type, scene_manager_p,
                        wrap_scene_manager, unwrap_scene_manager);
 
-  SCM
-  irr_getSceneManager (SCM wrapped_obj)
-  {
-    irr::scene::ISceneManager* scene_manager;
-    if (device_p (wrapped_obj))
-      {
-        scene_manager = unwrap_device (wrapped_obj)->getSceneManager ();
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Cannot get scene manager from object: ~S",
-                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
-      }
-    return wrap_scene_manager (scene_manager);
-  }
-
   SCM
   irr_scene_addAnimatedMeshSceneNode (SCM wrapped_scene_manager,
                                       SCM mesh,
@@ -84,6 +71,24 @@ extern "C" {
     return wrap_animated_mesh_scene_node (node);
   }
 
+  SCM
+  irr_scene_addCameraSceneNode (SCM wrapped_scene_manager,
+                                SCM parent,
+                                SCM position,
+                                SCM lookat,
+                                SCM id,
+                                SCM make_active)
+  {
+    irr::scene::ISceneManager* scene_manager = unwrap_scene_manager (wrapped_scene_manager);
+    irr::scene::ICameraSceneNode* camera =
+      scene_manager->addCameraSceneNode (scm_is_false (parent) ? 0 : unwrap_scene_node (parent),
+                                         scm_to_vector3df (position),
+                                         scm_to_vector3df (lookat),
+                                         scm_to_int32 (id),
+                                         scm_to_bool (make_active));
+    return wrap_camera_scene_node (camera);
+  }
+
   SCM
   irr_scene_getMesh (SCM wrapped_scene_manager,
                      SCM filename)
@@ -93,4 +98,20 @@ extern "C" {
     return wrap_animated_mesh (mesh);
   }
 
+  SCM
+  irr_getSceneManager (SCM wrapped_obj)
+  {
+    irr::scene::ISceneManager* scene_manager;
+    if (device_p (wrapped_obj))
+      {
+        scene_manager = unwrap_device (wrapped_obj)->getSceneManager ();
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get scene manager from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+    return wrap_scene_manager (scene_manager);
+  }
+
 }