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

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index 3c080d5..cb7f80c 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -37,12 +37,14 @@ 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!", 6, 0, 0,
+    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",
@@ -52,13 +54,30 @@ extern "C" {
   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),
@@ -67,18 +86,32 @@ 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 parent,
-                                SCM position,
-                                SCM lookat,
-                                SCM id,
-                                SCM make_active)
+                                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),