X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=03ae21dd2de8a89a27f5544ebe0a6a079dd166aa;hb=437db80e9b374e32d0bb5f7beeb4516fc1dd65c3;hp=9ef592fcbfaa10972e78b68010cda494265d9632;hpb=346c775ed6bc5b17d7360329d03583b0a443c6b8;p=guile-irrlicht.git

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index 9ef592f..03ae21d 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -27,6 +27,7 @@
 #include "box3d.h"
 #include "camera-scene-node.h"
 #include "device.h"
+#include "gsubr.h"
 #include "keymap.h"
 #include "material.h"
 #include "mesh.h"
@@ -43,34 +44,19 @@ extern "C" {
   init_scene_manager (void)
   {
     init_scene_manager_type ();
-    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 ("add-camera-scene-node-fps!", 1, 0, 1,
-                        (scm_t_subr)irr_scene_addCameraSceneNodeFPS);
-    scm_c_define_gsubr ("add-cube-scene-node!", 1, 0, 1,
-                        (scm_t_subr)irr_scene_addCubeSceneNode);
-    scm_c_define_gsubr ("add-custom-scene-node!", 5, 0, 1,
-                        (scm_t_subr)irr_scene_addCustomSceneNode);
-    scm_c_define_gsubr ("add-octree-scene-node!", 2, 0, 1,
-                        (scm_t_subr)irr_scene_addOctreeSceneNode);
-    scm_c_define_gsubr ("add-sphere-scene-node!", 1, 0, 1,
-                        (scm_t_subr)irr_scene_addSphereSceneNode);
-    scm_c_define_gsubr ("create-fly-circle-animator", 1, 0, 1,
-                        (scm_t_subr)irr_scene_createFlyCircleAnimator);
-    scm_c_define_gsubr ("create-fly-straight-animator", 4, 0, 1,
-                        (scm_t_subr)irr_scene_createFlyStraightAnimator);
-    scm_c_define_gsubr ("create-rotation-animator", 2, 0, 0,
-                        (scm_t_subr)irr_scene_createRotationAnimator);
-    scm_c_define_gsubr ("get-mesh", 2, 0, 0, (scm_t_subr)irr_scene_getMesh);
-    scm_c_define_gsubr ("get-root-scene-node", 1, 0, 0, (scm_t_subr)irr_scene_getRootSceneNode);
-    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-camera-scene-node-fps!", "add-custom-scene-node!", "add-cube-scene-node!",
-                  "add-octree-scene-node!", "add-sphere-scene-node!", "create-fly-circle-animator",
-                  "create-fly-straight-animator", "create-rotation-animator", "get-mesh",
-                  "get-root-scene-node", "get-scene-manager", NULL);
+    DEFINE_GSUBR ("add-animated-mesh-scene-node!", 2, 0, 1, irr_scene_addAnimatedMeshSceneNode);
+    DEFINE_GSUBR ("add-camera-scene-node!", 1, 0, 1, irr_scene_addCameraSceneNode);
+    DEFINE_GSUBR ("add-camera-scene-node-fps!", 1, 0, 1, irr_scene_addCameraSceneNodeFPS);
+    DEFINE_GSUBR ("add-cube-scene-node!", 1, 0, 1, irr_scene_addCubeSceneNode);
+    DEFINE_GSUBR ("add-custom-scene-node!", 5, 0, 1, irr_scene_addCustomSceneNode);
+    DEFINE_GSUBR ("add-octree-scene-node!", 2, 0, 1, irr_scene_addOctreeSceneNode);
+    DEFINE_GSUBR ("add-sphere-scene-node!", 1, 0, 1, irr_scene_addSphereSceneNode);
+    DEFINE_GSUBR ("create-fly-circle-animator", 1, 0, 1, irr_scene_createFlyCircleAnimator);
+    DEFINE_GSUBR ("create-fly-straight-animator", 4, 0, 1, irr_scene_createFlyStraightAnimator);
+    DEFINE_GSUBR ("create-rotation-animator", 2, 0, 0, irr_scene_createRotationAnimator);
+    DEFINE_GSUBR ("get-mesh", 2, 0, 0, irr_scene_getMesh);
+    DEFINE_GSUBR ("get-root-scene-node", 1, 0, 0, irr_scene_getRootSceneNode);
+    DEFINE_GSUBR ("get-scene-manager", 1, 0, 0, irr_getSceneManager);
   }
 
   DEFINE_WRAPPED_TYPE (irr::scene::ISceneManager*, "scene-manager",
@@ -82,7 +68,7 @@ extern "C" {
                                       SCM mesh,
                                       SCM rest)
   {
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     SCM id = scm_from_int32 (-1);
     SCM position = scm_list_3 (scm_from_double (0),
                                scm_from_double (0),
@@ -93,7 +79,7 @@ extern "C" {
     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 also_add_if_mesh_pointer_zero = SCM_BOOL_F;
 
     scm_c_bind_keyword_arguments ("add-animated-mesh-scene-node!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -120,7 +106,7 @@ extern "C" {
   irr_scene_addCameraSceneNode (SCM wrapped_scene_manager,
                                 SCM rest)
   {
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     SCM position = scm_list_3 (scm_from_double (0),
                                scm_from_double (0),
                                scm_from_double (0));
@@ -128,7 +114,7 @@ extern "C" {
                              scm_from_double (0),
                              scm_from_double (100));
     SCM id = scm_from_int32 (-1);
-    SCM make_active = scm_from_bool (1);
+    SCM make_active = SCM_BOOL_T;
 
     scm_c_bind_keyword_arguments ("add-camera-scene-node!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -152,16 +138,16 @@ extern "C" {
   irr_scene_addCameraSceneNodeFPS (SCM wrapped_scene_manager,
                                    SCM rest)
   {
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     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_array = SCM_BOOL_F;
     SCM key_map_size = scm_from_int32 (0);
-    SCM no_vertical_movement = scm_from_bool (0);
+    SCM no_vertical_movement = SCM_BOOL_F;
     SCM jump_speed = scm_from_double (0);
-    SCM invert_mouse = scm_from_bool (0);
-    SCM make_active = scm_from_bool (1);
+    SCM invert_mouse = SCM_BOOL_F;
+    SCM make_active = SCM_BOOL_T;
     
     scm_c_bind_keyword_arguments ("add-camera-scene-node-fps!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -196,7 +182,7 @@ extern "C" {
                               SCM rest)
   {
     SCM size = scm_from_double (10);
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     SCM id = scm_from_int32 (-1);
     SCM position = scm_list_3 (scm_from_double (0),
                                scm_from_double (0),
@@ -335,10 +321,10 @@ extern "C" {
                                 SCM wrapped_mesh,
                                 SCM rest)
   {
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     SCM id = scm_from_int32 (-1);
     SCM minimal_polys_per_node = scm_from_int32 (256);
-    SCM also_add_if_mesh_pointer_zero = scm_from_bool (0);
+    SCM also_add_if_mesh_pointer_zero = SCM_BOOL_F;
 
     scm_c_bind_keyword_arguments ("add-octree-scene-node!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -374,7 +360,7 @@ extern "C" {
   {
     SCM radius = scm_from_double (5.0);
     SCM poly_count = scm_from_int32 (16);
-    SCM parent = scm_from_bool (0);
+    SCM parent = SCM_BOOL_F;
     SCM id = scm_from_int32 (-1);
     SCM position = scm_list_3 (scm_from_double (0),
                                scm_from_double (0),
@@ -450,8 +436,8 @@ extern "C" {
                                        SCM time_for_way,
                                        SCM rest)
   {
-    SCM loop = scm_from_bool (0);
-    SCM pingpong = scm_from_bool (0);
+    SCM loop = SCM_BOOL_F;
+    SCM pingpong = SCM_BOOL_F;
 
     scm_c_bind_keyword_arguments ("create-fly-straight-animator", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("loop"), &loop,