X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fanimated-mesh-scene-node.cpp;h=3496b3a7b32ae53c4df3c35926d0321e787acd40;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=27f3872103a41d237ed358dae2d55ffb69f3b0d7;hpb=7cd338637409559bea457ea43bbeab462121ba83;p=guile-irrlicht.git

diff --git a/src/animated-mesh-scene-node.cpp b/src/animated-mesh-scene-node.cpp
index 27f3872..3496b3a 100644
--- a/src/animated-mesh-scene-node.cpp
+++ b/src/animated-mesh-scene-node.cpp
@@ -21,44 +21,37 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "animated-mesh-md2.h"
 #include "animated-mesh-scene-node.h"
 #include "gsubr.h"
-#include "wrapped.h"
-
-extern "C" {
-
-  void
-  init_animated_mesh_scene_node (void)
-  {
-    init_animated_mesh_scene_node_type ();
-    DEFINE_GSUBR ("set-frame-loop!", 3, 0, 0, irr_scene_setFrameLoop);
-    DEFINE_GSUBR ("set-md2-animation!", 2, 0, 0, irr_scene_setMD2Animation);
-  }
 
-  DEFINE_WRAPPED_TYPE (irr::scene::IAnimatedMeshSceneNode*, "animated-mesh-scene-node",
-                       init_animated_mesh_scene_node_type, animated_mesh_scene_node_p,
-                       wrap_animated_mesh_scene_node, unwrap_animated_mesh_scene_node);
-
-  SCM
-  irr_scene_setFrameLoop (SCM wrapped_animated_mesh_scene_node,
-                          SCM begin,
-                          SCM end)
-  {
-    return scm_from_bool
-      (unwrap_animated_mesh_scene_node (wrapped_animated_mesh_scene_node)->
-       setFrameLoop (scm_to_int32 (begin),
-                     scm_to_int32 (end)));
-  }
+using namespace irr;
+
+SCM
+IAnimatedMeshSceneNode_setFrameLoop (SCM animated_mesh_scene_node,
+                                     SCM begin,
+                                     SCM end)
+{
+  return scm_from_bool
+    (((scene::IAnimatedMeshSceneNode*)scm_to_pointer (animated_mesh_scene_node))->
+     setFrameLoop (scm_to_int32 (begin),
+                   scm_to_int32 (end)));
+}
 
-  SCM
-  irr_scene_setMD2Animation (SCM wrapped_animated_mesh_scene_node,
-                             SCM anim)
-  {
-    return scm_from_bool
-      (unwrap_animated_mesh_scene_node (wrapped_animated_mesh_scene_node)->
-       setMD2Animation (scm_to_md2_animation_type (anim)));
-  }
+SCM
+IAnimatedMeshSceneNode_setMD2Animation (SCM animated_mesh_scene_node,
+                                        SCM anim)
+{
+  return scm_from_bool
+    (((scene::IAnimatedMeshSceneNode*)scm_to_pointer (animated_mesh_scene_node))->
+     setMD2Animation (scm_to_md2_animation_type (anim)));
+}
 
+void
+init_animated_mesh_scene_node (void)
+{
+  DEFINE_GSUBR ("IAnimatedMeshSceneNode_setFrameLoop", 3, 0, 0,
+                IAnimatedMeshSceneNode_setFrameLoop);
+  DEFINE_GSUBR ("IAnimatedMeshSceneNode_setMD2Animation", 2, 0, 0,
+                IAnimatedMeshSceneNode_setMD2Animation);
 }