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

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index d4234e8..cb7f80c 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,42 +37,47 @@ 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!", 2, 0, 1,
                         (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 ("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);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneManager*, "scene-manager",
                        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,
-                                      SCM parent,
-                                      SCM id,
-                                      SCM position,
-                                      SCM rotation,
-                                      SCM scale,
-                                      SCM alsoAddIfMeshPointerZero)
+                                      SCM rest)
   {
+    SCM parent = scm_from_bool (0);
+    SCM id = scm_from_int32 (-1);
+    SCM position = scm_list_3 (scm_from_double (0),
+                               scm_from_double (0),
+                               scm_from_double (0));
+    SCM rotation = scm_list_3 (scm_from_double (0),
+                               scm_from_double (0),
+                               scm_from_double (0));
+    SCM scale = scm_list_3 (scm_from_double (1),
+                            scm_from_double (1),
+                            scm_from_double (1));
+    SCM also_add_if_mesh_pointer_zero = scm_from_bool (0);
+
+    scm_c_bind_keyword_arguments ("add-animated-mesh-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 ("position"), &position,
+                                  scm_from_utf8_keyword ("rotation"), &rotation,
+                                  scm_from_utf8_keyword ("scale"), &scale,
+                                  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::IAnimatedMeshSceneNode* node =
       smgr->addAnimatedMeshSceneNode (unwrap_animated_mesh (mesh),
@@ -80,10 +86,42 @@ extern "C" {
                                       scm_to_vector3df (position),
                                       scm_to_vector3df (rotation),
                                       scm_to_vector3df (scale),
-                                      scm_to_bool (alsoAddIfMeshPointerZero));
+                                      scm_to_bool (also_add_if_mesh_pointer_zero));
     return wrap_animated_mesh_scene_node (node);
   }
 
+  SCM
+  irr_scene_addCameraSceneNode (SCM wrapped_scene_manager,
+                                SCM rest)
+  {
+    SCM parent = scm_from_bool (0);
+    SCM position = scm_list_3 (scm_from_double (0),
+                               scm_from_double (0),
+                               scm_from_double (0));
+    SCM lookat = scm_list_3 (scm_from_double (0),
+                             scm_from_double (0),
+                             scm_from_double (100));
+    SCM id = scm_from_int32 (-1);
+    SCM make_active = scm_from_bool (1);
+
+    scm_c_bind_keyword_arguments ("add-camera-scene-node!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("position"), &position,
+                                  scm_from_utf8_keyword ("lookat"), &lookat,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("make-active"), &make_active,
+                                  SCM_UNDEFINED);
+
+    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 +131,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);
+  }
+
 }