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

diff --git a/src/box3d.cpp b/src/box3d.cpp
index f9a688b..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
-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
-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
-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 ("core_aabbox3d_addInternalPoint", 2, 0, 0,
-                  core_aabbox3d_addInternalPoint);
-    DEFINE_GSUBR ("core_aabbox3d_make", 0, 0, 0,
-                  core_aabbox3d_make);
-    DEFINE_GSUBR ("core_aabbox3d_reset", 2, 0, 0,
-                  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);
 }