X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fscene-manager.cpp;h=427faf57c5e7fb0b9031086d2d2412e2fe5b8b65;hp=f96938389ceeb51816574eb28f56924882cf693f;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hpb=bf2cb00e2ef19e2eb33557f900405f836ebe65a3

diff --git a/src/scene-manager.cpp b/src/scene-manager.cpp
index f969383..427faf5 100644
--- a/src/scene-manager.cpp
+++ b/src/scene-manager.cpp
@@ -25,10 +25,8 @@
 #include "scene-manager.h"
 #include "vector3d.h"
 
-
 using namespace irr;
 
-
 template <typename TParent>
 SCM
 ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
@@ -52,7 +50,6 @@ ISceneManager_addAnimatedMeshSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) node, NULL);
 }
 
-
 template <typename TParent>
 SCM
 ISceneManager_addCameraSceneNode (SCM scene_manager,
@@ -72,7 +69,6 @@ ISceneManager_addCameraSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) camera, NULL);
 }
 
-
 template <typename TParent>
 SCM
 ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
@@ -118,7 +114,6 @@ ISceneManager_addCameraSceneNodeFPS (SCM scene_manager,
   return scm_from_pointer ((void*) camera, NULL);
 }
 
-
 template <typename TParent>
 SCM
 ISceneManager_addCubeSceneNode (SCM scene_manager,
@@ -140,7 +135,6 @@ ISceneManager_addCubeSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) node, NULL);
 }
 
-
 template <typename TParent>
 SCM
 ISceneManager_addCustomSceneNode (SCM scene_manager,
@@ -226,7 +220,6 @@ ISceneManager_addCustomSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) node, NULL);
 }
 
-
 template <typename TParent, typename TMesh>
 SCM
 ISceneManager_addOctreeSceneNode (SCM scene_manager,
@@ -246,7 +239,6 @@ ISceneManager_addOctreeSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) node, NULL);
 }
 
-
 template <typename TParent>
 SCM
 ISceneManager_addSphereSceneNode (SCM scene_manager,
@@ -270,7 +262,6 @@ ISceneManager_addSphereSceneNode (SCM scene_manager,
   return scm_from_pointer ((void*) node, NULL);
 }
 
-
 SCM
 ISceneManager_createFlyCircleAnimator (SCM scene_manager,
                                        SCM center,
@@ -291,7 +282,6 @@ ISceneManager_createFlyCircleAnimator (SCM scene_manager,
   return scm_from_pointer ((void*) anim, NULL);
 }
 
-
 SCM
 ISceneManager_createFlyStraightAnimator (SCM scene_manager,
                                          SCM start_point,
@@ -310,7 +300,6 @@ ISceneManager_createFlyStraightAnimator (SCM scene_manager,
   return scm_from_pointer ((void*) anim, NULL);
 }
 
-
 SCM
 ISceneManager_createRotationAnimator (SCM scene_manager,
                                       SCM rotation_speed)
@@ -321,7 +310,6 @@ ISceneManager_createRotationAnimator (SCM scene_manager,
   return scm_from_pointer ((void*) anim, NULL);
 }
 
-
 SCM
 ISceneManager_drawAll (SCM scene_manager)
 {
@@ -329,7 +317,6 @@ ISceneManager_drawAll (SCM scene_manager)
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
 ISceneManager_getMesh (SCM scene_manager,
                        SCM filename)
@@ -339,7 +326,6 @@ ISceneManager_getMesh (SCM scene_manager,
   return scm_from_pointer ((void*) mesh, NULL);
 }
 
-
 SCM
 ISceneManager_getRootSceneNode (SCM scene_manager)
 {
@@ -347,37 +333,32 @@ ISceneManager_getRootSceneNode (SCM scene_manager)
   return scm_from_pointer ((void*) smgr->getRootSceneNode (), NULL);
 }
 
-
-extern "C" {
-
-  void
-  init_scene_manager (void)
-  {
-    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);
-  }
-
+void
+init_scene_manager (void)
+{
+  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);
 }