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

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index 0f3e54c..eb7a378 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -26,6 +26,7 @@
 #include "animated-mesh-scene-node.h"
 #include "camera-scene-node.h"
 #include "device.h"
+#include "keymap.h"
 #include "mesh.h"
 #include "mesh-scene-node.h"
 #include "scene-manager.h"
@@ -43,12 +44,15 @@ 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-camera-scene-node-fps!", 1, 0, 1,
+                        (scm_t_subr)irr_scene_addCameraSceneNodeFPS);
     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!",
-                  "add-octree-scene-node!", "get-mesh", "get-scene-manager", NULL);
+                  "add-camera-scene-node-fps!", "add-octree-scene-node!",
+                  "get-mesh", "get-scene-manager", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneManager*, "scene-manager",
@@ -126,6 +130,49 @@ extern "C" {
     return wrap_camera_scene_node (camera);
   }
 
+  SCM
+  irr_scene_addCameraSceneNodeFPS (SCM wrapped_scene_manager,
+                                   SCM rest)
+  {
+    SCM parent = scm_from_bool (0);
+    SCM rotate_speed = scm_from_double (100);
+    SCM move_speed = scm_from_double (0.5);
+    SCM id = scm_from_int32 (-1);
+    SCM key_map_array = scm_from_bool (0);
+    SCM key_map_size = scm_from_int32 (0);
+    SCM no_vertical_movement = scm_from_bool (0);
+    SCM jump_speed = scm_from_double (0);
+    SCM invert_mouse = scm_from_bool (0);
+    SCM make_active = scm_from_bool (1);
+    
+    scm_c_bind_keyword_arguments ("add-camera-scene-node-fps!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("rotate-speed"), &rotate_speed,
+                                  scm_from_utf8_keyword ("move-speed"), &move_speed,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("key-map-array"), &key_map_array,
+                                  scm_from_utf8_keyword ("key-map-size"), &key_map_size,
+                                  scm_from_utf8_keyword ("no-vertical-movement"), &no_vertical_movement,
+                                  scm_from_utf8_keyword ("jump-speed"), &jump_speed,
+                                  scm_from_utf8_keyword ("invert-mouse"), &invert_mouse,
+                                  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->addCameraSceneNodeFPS (scm_is_false (parent) ? 0 : unwrap_scene_node (parent),
+                                            scm_to_double (rotate_speed),
+                                            scm_to_double (move_speed),
+                                            scm_to_int32 (id),
+                                            scm_is_false (key_map_array) ? 0 : unwrap_keymap (key_map_array),
+                                            scm_to_int32 (key_map_size),
+                                            scm_to_bool (no_vertical_movement),
+                                            scm_to_double (jump_speed),
+                                            scm_to_bool (invert_mouse),
+                                            scm_to_bool (make_active));
+    return wrap_camera_scene_node (camera);
+  }
+
   SCM
   irr_scene_addOctreeSceneNode (SCM wrapped_scene_manager,
                                 SCM wrapped_mesh,