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

diff --git a/src/box3d.cpp b/src/box3d.cpp
index 9b78836..e254bc2 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -26,44 +26,35 @@
 #include "vector3d.h"
 #include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_box3d (void)
-  {
-    init_box3d_type ();
-    DEFINE_GSUBR ("box3d-add-internal-point!", 2, 0, 0, box3d_add_internal_point);
-    DEFINE_GSUBR ("box3d-reset!", 2, 0, 0, box3d_reset);
-    DEFINE_GSUBR ("make-box3d", 0, 0, 0, make_box3d);
-  }
-
-  DEFINE_WRAPPED_TYPE (irr::core::aabbox3df*, "box3d",
-                       init_box3d_type, box3d_p,
-                       wrap_box3d, unwrap_box3d);
-
-  SCM
-  box3d_add_internal_point (SCM box3d,
-                            SCM point)
-  {
-    irr::core::aabbox3df* aabbox = unwrap_box3d (box3d);
-    aabbox->addInternalPoint (scm_to_vector3df (point));
-    return SCM_UNSPECIFIED;
-  }
+using namespace irr;
+
+SCM
+aabbox3d_addInternalPoint (SCM box3d,
+                           SCM point)
+{
+  ((core::aabbox3df*)scm_to_irr_pointer (box3d))->addInternalPoint (scm_to_vector3df (point));
+  return SCM_UNSPECIFIED;
+}
 
-  SCM
-  box3d_reset (SCM box3d,
-               SCM init_value)
-  {
-    irr::core::aabbox3df* aabbox = unwrap_box3d (box3d);
-    aabbox->reset (scm_to_vector3df (init_value));
-    return SCM_UNSPECIFIED;
-  }
+SCM
+aabbox3d_make ()
+{
+  core::aabbox3df* aabbox = new core::aabbox3df ();
+  return scm_from_irr_pointer ("<box3d>", (void*) aabbox);
+}
 
-  SCM
-  make_box3d ()
-  {
-    irr::core::aabbox3df* aabbox = new irr::core::aabbox3df ();
-    return wrap_box3d (aabbox);
-  }
+SCM
+aabbox3d_reset (SCM box3d,
+                SCM init_value)
+{
+  ((core::aabbox3df*)scm_to_irr_pointer (box3d))->reset (scm_to_vector3df (init_value));
+  return SCM_UNSPECIFIED;
+}
 
+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);
 }