From 5ceb16a66d2d082b5000322570ad87ef7afa5907 Mon Sep 17 00:00:00 2001
From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 7 May 2020 12:10:26 +0200
Subject: [PATCH] animated-mesh-scene-node

---
 src/animated-mesh-scene-node.cpp | 55 ++++++++++++++++----------------
 src/animated-mesh-scene-node.h   | 23 ++++++-------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/src/animated-mesh-scene-node.cpp b/src/animated-mesh-scene-node.cpp
index 27f3872..480c665 100644
--- a/src/animated-mesh-scene-node.cpp
+++ b/src/animated-mesh-scene-node.cpp
@@ -25,40 +25,39 @@
 #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);
-  }
+SCM
+irr_scene_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)));
+}
 
-  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)));
-  }
+SCM
+irr_scene_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)));
+}
 
-  SCM
-  irr_scene_setMD2Animation (SCM wrapped_animated_mesh_scene_node,
-                             SCM anim)
+
+extern "C" {
+
+  void
+  init_animated_mesh_scene_node (void)
   {
-    return scm_from_bool
-      (unwrap_animated_mesh_scene_node (wrapped_animated_mesh_scene_node)->
-       setMD2Animation (scm_to_md2_animation_type (anim)));
+    DEFINE_GSUBR ("irr_scene_IAnimatedMeshSceneNode_setFrameLoop", 3, 0, 0,
+                  irr_scene_IAnimatedMeshSceneNode_setFrameLoop);
+    DEFINE_GSUBR ("irr_scene_IAnimatedMeshSceneNode_setMD2Animation", 2, 0, 0,
+                  irr_scene_IAnimatedMeshSceneNode_setMD2Animation);
   }
 
 }
diff --git a/src/animated-mesh-scene-node.h b/src/animated-mesh-scene-node.h
index 91fb4fc..fb90936 100644
--- a/src/animated-mesh-scene-node.h
+++ b/src/animated-mesh-scene-node.h
@@ -24,26 +24,21 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-#include "wrapped.h"
+
+SCM
+irr_scene_IAnimatedMeshSceneNode_setFrameLoop (SCM animated_mesh_scene_node,
+                                               SCM begin,
+                                               SCM end);
+
+SCM
+irr_scene_IAnimatedMeshSceneNode_setMD2Animation (SCM animated_mesh_scene_node,
+                                                  SCM anim);
 
 extern "C" {
 
   void
   init_animated_mesh_scene_node (void);
 
-  DECLARE_WRAPPED_TYPE (irr::scene::IAnimatedMeshSceneNode*, 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);
-
-  SCM
-  irr_scene_setMD2Animation (SCM wrapped_animated_mesh_scene_node,
-                             SCM anim);
-
 }
 
 #endif
-- 
2.39.2