X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=427faf57c5e7fb0b9031086d2d2412e2fe5b8b65;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=c1c8e270611c294a92fe6cc8822cbe0f58e9369b;hpb=19663b6c5766b06c73148fdf803ce3555052a23e;p=guile-irrlicht.git diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp index c1c8e27..427faf5 100644 --- a/src/scene-manager.cpp +++ b/src/scene-manager.cpp @@ -25,20 +25,18 @@ #include "scene-manager.h" #include "vector3d.h" - using namespace irr; - template 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 = @@ -52,15 +50,14 @@ scene_ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager, return scm_from_pointer ((void*) node, NULL); } - template 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 = @@ -72,21 +69,36 @@ scene_ISceneManager_addCameraSceneNode (SCM scene_manager, return scm_from_pointer ((void*) camera, NULL); } - template 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), @@ -102,16 +114,15 @@ scene_ISceneManager_addCameraSceneNodeFPS (SCM scene_manager, return scm_from_pointer ((void*) camera, NULL); } - template 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 = @@ -124,19 +135,18 @@ scene_ISceneManager_addCubeSceneNode (SCM scene_manager, return scm_from_pointer ((void*) node, NULL); } - template 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 { @@ -210,15 +220,14 @@ scene_ISceneManager_addCustomSceneNode (SCM scene_manager, return scm_from_pointer ((void*) node, NULL); } - template 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 = @@ -230,17 +239,16 @@ scene_ISceneManager_addOctreeSceneNode (SCM scene_manager, return scm_from_pointer ((void*) node, NULL); } - template 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 = @@ -254,15 +262,14 @@ scene_ISceneManager_addSphereSceneNode (SCM scene_manager, return scm_from_pointer ((void*) node, NULL); } - 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 = @@ -275,14 +282,13 @@ scene_ISceneManager_createFlyCircleAnimator (SCM scene_manager, return scm_from_pointer ((void*) anim, NULL); } - 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 = @@ -294,10 +300,9 @@ scene_ISceneManager_createFlyStraightAnimator (SCM scene_manager, return scm_from_pointer ((void*) anim, NULL); } - 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 = @@ -305,64 +310,55 @@ scene_ISceneManager_createRotationAnimator (SCM scene_manager, return scm_from_pointer ((void*) anim, NULL); } - SCM -scene_ISceneManager_drawAll (SCM scene_manager) +ISceneManager_drawAll (SCM scene_manager) { ((scene::ISceneManager*) scm_to_pointer (scene_manager))->drawAll (); return SCM_UNSPECIFIED; } - 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)); return scm_from_pointer ((void*) mesh, NULL); } - 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); } - -extern "C" { - - void - init_scene_manager (void) - { - DEFINE_GSUBR ("scene_ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0, - scene_ISceneManager_addAnimatedMeshSceneNode); - DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0, - scene_ISceneManager_addCameraSceneNode); - DEFINE_GSUBR ("scene_ISceneManager_addCameraSceneNodeFPS_ISceneNode", 11, 0, 0, - scene_ISceneManager_addCameraSceneNodeFPS); - DEFINE_GSUBR ("scene_ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0, - scene_ISceneManager_addCubeSceneNode); - DEFINE_GSUBR ("scene_ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0, - scene_ISceneManager_addCustomSceneNode); - DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0, - (scene_ISceneManager_addOctreeSceneNode)); - DEFINE_GSUBR ("scene_ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0, - (scene_ISceneManager_addOctreeSceneNode)); - DEFINE_GSUBR ("scene_ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0, - scene_ISceneManager_addSphereSceneNode); - 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); - } - +void +init_scene_manager (void) +{ + DEFINE_GSUBR ("ISceneManager_addAnimatedMeshSceneNode_ISceneNode", 8, 0, 0, + ISceneManager_addAnimatedMeshSceneNode); + DEFINE_GSUBR ("ISceneManager_addCameraSceneNode_ISceneNode", 6, 0, 0, + ISceneManager_addCameraSceneNode); + DEFINE_GSUBR ("ISceneManager_addCameraSceneNodeFPS_ISceneNode", 1, 0, 1, + ISceneManager_addCameraSceneNodeFPS); + DEFINE_GSUBR ("ISceneManager_addCubeSceneNode_ISceneNode", 7, 0, 0, + ISceneManager_addCubeSceneNode); + DEFINE_GSUBR ("ISceneManager_addCustomSceneNode_ISceneNode", 10, 0, 0, + ISceneManager_addCustomSceneNode); + DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IAnimatedMesh", 6, 0, 0, + (ISceneManager_addOctreeSceneNode)); + DEFINE_GSUBR ("ISceneManager_addOctreeSceneNode_ISceneNode_IMesh", 6, 0, 0, + (ISceneManager_addOctreeSceneNode)); + DEFINE_GSUBR ("ISceneManager_addSphereSceneNode_ISceneNode", 8, 0, 0, + ISceneManager_addSphereSceneNode); + 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); }