X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fbox3d.cpp;h=e254bc23cf2372a08efc8f18773e8302787e53b7;hb=3bb58c2b45af12c0f9c9eac648e67ac6fa90e104;hp=1c0152a186739f6dec133fa47e118f88bb957be9;hpb=6537f348407a540c027d92d0b766a8684f0fdf95;p=guile-irrlicht.git

diff --git a/src/box3d.cpp b/src/box3d.cpp
index 1c0152a..e254bc2 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -24,48 +24,37 @@
 #include "box3d.h"
 #include "gsubr.h"
 #include "vector3d.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
-irr_core_aabbox3d_addInternalPoint (SCM box3d,
-                                    SCM point)
+aabbox3d_addInternalPoint (SCM box3d,
+                           SCM point)
 {
-  ((core::aabbox3df*)scm_to_pointer (box3d))->addInternalPoint (scm_to_vector3df (point));
+  ((core::aabbox3df*)scm_to_irr_pointer (box3d))->addInternalPoint (scm_to_vector3df (point));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-irr_core_aabbox3d_make ()
+aabbox3d_make ()
 {
   core::aabbox3df* aabbox = new core::aabbox3df ();
-  return scm_from_pointer ((void*)aabbox, NULL);
+  return scm_from_irr_pointer ("<box3d>", (void*) aabbox);
 }
 
-
 SCM
-irr_core_aabbox3d_reset (SCM box3d,
-                         SCM init_value)
+aabbox3d_reset (SCM box3d,
+                SCM init_value)
 {
-  ((core::aabbox3df*)scm_to_pointer (box3d))->reset (scm_to_vector3df (init_value));
+  ((core::aabbox3df*)scm_to_irr_pointer (box3d))->reset (scm_to_vector3df (init_value));
   return SCM_UNSPECIFIED;
 }
 
-
-extern "C" {
-
-  void
-  init_box3d (void)
-  {
-    DEFINE_GSUBR ("irr_core_aabbox3d_addInternalPoint", 2, 0, 0,
-                  irr_core_aabbox3d_addInternalPoint);
-    DEFINE_GSUBR ("irr_core_aabbox3d_make", 0, 0, 0,
-                  irr_core_aabbox3d_make);
-    DEFINE_GSUBR ("irr_core_aabbox3d_reset", 2, 0, 0,
-                  irr_core_aabbox3d_reset);
-  }
-
+void
+init_box3d (void)
+{
+  DEFINE_GSUBR ("aabbox3d_addInternalPoint", 2, 0, 0, aabbox3d_addInternalPoint);
+  DEFINE_GSUBR ("aabbox3d_make", 0, 0, 0, aabbox3d_make);
+  DEFINE_GSUBR ("aabbox3d_reset", 2, 0, 0, aabbox3d_reset);
 }