X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=f96938389ceeb51816574eb28f56924882cf693f;hb=73e48b7e6472724899af8284491802e950156004;hp=c1c8e270611c294a92fe6cc8822cbe0f58e9369b;hpb=19663b6c5766b06c73148fdf803ce3555052a23e;p=guile-irrlicht.git

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index c1c8e27..f969383 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -31,14 +31,14 @@ using namespace irr;
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
-                                              SCM mesh,
-                                              SCM parent,
-                                              SCM id,
-                                              SCM position,
-                                              SCM rotation,
-                                              SCM scale,
-                                              SCM also_add_if_mesh_pointer_zero)
+ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
+                                        SCM mesh,
+                                        SCM parent,
+                                        SCM id,
+                                        SCM position,
+                                        SCM rotation,
+                                        SCM scale,
+                                        SCM also_add_if_mesh_pointer_zero)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IAnimatedMeshSceneNode* node =
@@ -55,12 +55,12 @@ scene_ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCameraSceneNode (SCM scene_manager,
-                                        SCM parent,
-                                        SCM position,
-                                        SCM lookat,
-                                        SCM id,
-                                        SCM make_active)
+ISceneManager_addCameraSceneNode (SCM scene_manager,
+                                  SCM parent,
+                                  SCM position,
+                                  SCM lookat,
+                                  SCM id,
+                                  SCM make_active)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ICameraSceneNode* camera =
@@ -75,18 +75,34 @@ scene_ISceneManager_addCameraSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
-                                           SCM parent,
-                                           SCM rotate_speed,
-                                           SCM move_speed,
-                                           SCM id,
-                                           SCM key_map_array,
-                                           SCM key_map_size,
-                                           SCM no_vertical_movement,
-                                           SCM jump_speed,
-                                           SCM invert_mouse,
-                                           SCM make_active)
+ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
+                                     SCM rest)
 {
+  SCM parent;
+  SCM rotate_speed;
+  SCM move_speed;
+  SCM id;
+  SCM key_map_array;
+  SCM key_map_size;
+  SCM no_vertical_movement;
+  SCM jump_speed;
+  SCM invert_mouse;
+  SCM make_active;
+
+  scm_c_bind_keyword_arguments ("scene_ISceneManager_addCameraSceneNodeFPS",
+                                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);
+
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ICameraSceneNode* camera =
     smgr->addCameraSceneNodeFPS ((TParent) scm_to_pointer (parent),
@@ -105,13 +121,13 @@ scene_ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCubeSceneNode (SCM scene_manager,
-                                      SCM size,
-                                      SCM parent,
-                                      SCM id,
-                                      SCM position,
-                                      SCM rotation,
-                                      SCM scale)
+ISceneManager_addCubeSceneNode (SCM scene_manager,
+                                SCM size,
+                                SCM parent,
+                                SCM id,
+                                SCM position,
+                                SCM rotation,
+                                SCM scale)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -127,16 +143,16 @@ scene_ISceneManager_addCubeSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addCustomSceneNode (SCM scene_manager,
-                                        SCM proc_render,
-                                        SCM proc_get_bounding_box,
-                                        SCM proc_get_material_count,
-                                        SCM proc_get_material,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM position,
-                                        SCM rotation,
-                                        SCM scale)
+ISceneManager_addCustomSceneNode (SCM scene_manager,
+                                  SCM proc_render,
+                                  SCM proc_get_bounding_box,
+                                  SCM proc_get_material_count,
+                                  SCM proc_get_material,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM position,
+                                  SCM rotation,
+                                  SCM scale)
 {
   class CustomSceneNode : public scene::ISceneNode
   {
@@ -213,12 +229,12 @@ scene_ISceneManager_addCustomSceneNode (SCM scene_manager,
 
 template <typename TParent, typename TMesh>
 SCM
-scene_ISceneManager_addOctreeSceneNode (SCM scene_manager,
-                                        SCM mesh,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM minimal_polys_per_node,
-                                        SCM also_add_if_mesh_pointer_zero)
+ISceneManager_addOctreeSceneNode (SCM scene_manager,
+                                  SCM mesh,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM minimal_polys_per_node,
+                                  SCM also_add_if_mesh_pointer_zero)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -233,14 +249,14 @@ scene_ISceneManager_addOctreeSceneNode (SCM scene_manager,
 
 template <typename TParent>
 SCM
-scene_ISceneManager_addSphereSceneNode (SCM scene_manager,
-                                        SCM radius,
-                                        SCM poly_count,
-                                        SCM parent,
-                                        SCM id,
-                                        SCM position,
-                                        SCM rotation,
-                                        SCM scale)
+ISceneManager_addSphereSceneNode (SCM scene_manager,
+                                  SCM radius,
+                                  SCM poly_count,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM position,
+                                  SCM rotation,
+                                  SCM scale)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IMeshSceneNode* node =
@@ -256,13 +272,13 @@ scene_ISceneManager_addSphereSceneNode (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createFlyCircleAnimator (SCM scene_manager,
-                                             SCM center,
-                                             SCM radius,
-                                             SCM speed,
-                                             SCM direction,
-                                             SCM start_position,
-                                             SCM radius_ellipsoid)
+ISceneManager_createFlyCircleAnimator (SCM scene_manager,
+                                       SCM center,
+                                       SCM radius,
+                                       SCM speed,
+                                       SCM direction,
+                                       SCM start_position,
+                                       SCM radius_ellipsoid)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -277,12 +293,12 @@ scene_ISceneManager_createFlyCircleAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createFlyStraightAnimator (SCM scene_manager,
-                                               SCM start_point,
-                                               SCM end_point,
-                                               SCM time_for_way,
-                                               SCM loop,
-                                               SCM pingpong)
+ISceneManager_createFlyStraightAnimator (SCM scene_manager,
+                                         SCM start_point,
+                                         SCM end_point,
+                                         SCM time_for_way,
+                                         SCM loop,
+                                         SCM pingpong)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -296,8 +312,8 @@ scene_ISceneManager_createFlyStraightAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_createRotationAnimator (SCM scene_manager,
-                                            SCM rotation_speed)
+ISceneManager_createRotationAnimator (SCM scene_manager,
+                                      SCM rotation_speed)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::ISceneNodeAnimator* anim =
@@ -307,7 +323,7 @@ scene_ISceneManager_createRotationAnimator (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_drawAll (SCM scene_manager)
+ISceneManager_drawAll (SCM scene_manager)
 {
   ((scene::ISceneManager*) scm_to_pointer (scene_manager))->drawAll ();
   return SCM_UNSPECIFIED;
@@ -315,8 +331,8 @@ scene_ISceneManager_drawAll (SCM scene_manager)
 
 
 SCM
-scene_ISceneManager_getMesh (SCM scene_manager,
-                             SCM filename)
+ISceneManager_getMesh (SCM scene_manager,
+                       SCM filename)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   scene::IAnimatedMesh* mesh = smgr->getMesh(scm_to_utf8_stringn (filename, NULL));
@@ -325,7 +341,7 @@ scene_ISceneManager_getMesh (SCM scene_manager,
 
 
 SCM
-scene_ISceneManager_getRootSceneNode (SCM scene_manager)
+ISceneManager_getRootSceneNode (SCM scene_manager)
 {
   scene::ISceneManager* smgr = (scene::ISceneManager*) scm_to_pointer (scene_manager);
   return scm_from_pointer ((void*) smgr->getRootSceneNode (), NULL);
@@ -337,32 +353,31 @@ extern "C" {
   void
   init_scene_manager (void)
   {
-    DEFINE_GSUBR ("scene_ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0,
-                  scene_ISceneManager_addAnimatedMeshSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0,
-                  scene_ISceneManager_addCameraSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNodeFPS_ISceneNode", 11, 0, 0,
-                  scene_ISceneManager_addCameraSceneNodeFPS<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0,
-                  scene_ISceneManager_addCubeSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0,
-                  scene_ISceneManager_addCustomSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0,
-                  (scene_ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IAnimatedMesh*>));
-    DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0,
-                  (scene_ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IMesh*>));
-    DEFINE_GSUBR ("scene_ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0,
-                  scene_ISceneManager_addSphereSceneNode<scene::ISceneNode*>);
-    DEFINE_GSUBR ("scene_ISceneManager_createFlyCircleAnimator", 7, 0, 0,
-                  scene_ISceneManager_createFlyCircleAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_createFlyStraightAnimator", 6, 0, 0,
-                  scene_ISceneManager_createFlyStraightAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_createRotationAnimator", 2, 0, 0,
-                  scene_ISceneManager_createRotationAnimator);
-    DEFINE_GSUBR ("scene_ISceneManager_drawAll", 1, 0, 0, scene_ISceneManager_drawAll);
-    DEFINE_GSUBR ("scene_ISceneManager_getMesh", 2, 0, 0, scene_ISceneManager_getMesh);
-    DEFINE_GSUBR ("scene_ISceneManager_getRootSceneNode", 1, 0, 0,
-                  scene_ISceneManager_getRootSceneNode);
+    DEFINE_GSUBR ("ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0,
+                  ISceneManager_addAnimatedMeshSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0,
+                  ISceneManager_addCameraSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCameraSceneNodeFPS_ISceneNode", 1, 0, 1,
+                  ISceneManager_addCameraSceneNodeFPS<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0,
+                  ISceneManager_addCubeSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0,
+                  ISceneManager_addCustomSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0,
+                  (ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IAnimatedMesh*>));
+    DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0,
+                  (ISceneManager_addOctreeSceneNode<scene::ISceneNode*, scene::IMesh*>));
+    DEFINE_GSUBR ("ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0,
+                  ISceneManager_addSphereSceneNode<scene::ISceneNode*>);
+    DEFINE_GSUBR ("ISceneManager_createFlyCircleAnimator", 7, 0, 0,
+                  ISceneManager_createFlyCircleAnimator);
+    DEFINE_GSUBR ("ISceneManager_createFlyStraightAnimator", 6, 0, 0,
+                  ISceneManager_createFlyStraightAnimator);
+    DEFINE_GSUBR ("ISceneManager_createRotationAnimator", 2, 0, 0,
+                  ISceneManager_createRotationAnimator);
+    DEFINE_GSUBR ("ISceneManager_drawAll", 1, 0, 0, ISceneManager_drawAll);
+    DEFINE_GSUBR ("ISceneManager_getMesh", 2, 0, 0, ISceneManager_getMesh);
+    DEFINE_GSUBR ("ISceneManager_getRootSceneNode", 1, 0, 0, ISceneManager_getRootSceneNode);
   }
 
 }