make-aabbox3df make-aabbox3di

diff --git a/Makefile.am b/Makefile.am
index f447eb8738b3e5f67d4c8e64f2a8ef1f224c1baf..4101951149256eaa051be122cf75d52f35a157cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libguile-irrlicht.la
 libguile_irrlicht_la_SOURCES = \
+  src/aabbox3d.cpp \
   src/animated-mesh.cpp \
   src/animated-mesh-md2.cpp \
   src/animated-mesh-scene-node.cpp \

diff --git a/src/aabbox3d.cpp b/src/aabbox3d.cpp
new file mode 100644 (file)
index 0000000..47a7eb2
--- /dev/null
+++ b/src/aabbox3d.cpp
@@ -0,0 +1,61 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+#include "aabbox3d.h"
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_aabbox3d (void)
+  {
+    init_aabbox3df_type ();
+    init_aabbox3di_type ();
+    scm_c_define_gsubr ("make-aabbox3df", 0, 0, 0, (scm_t_subr)make_aabbox3df);
+    scm_c_define_gsubr ("make-aabbox3di", 0, 0, 0, (scm_t_subr)make_aabbox3di);
+    scm_c_export ("make-aabbox3df", "make-aabbox3di", NULL);
+  }
+
+  DEFINE_WRAPPED_TYPE (irr::core::aabbox3df*, "aabbox3df",
+                       init_aabbox3df_type, aabbox3df_p,
+                       wrap_aabbox3df, unwrap_aabbox3df);
+
+  DEFINE_WRAPPED_TYPE (irr::core::aabbox3di*, "aabbox3di",
+                       init_aabbox3di_type, aabbox3di_p,
+                       wrap_aabbox3di, unwrap_aabbox3di);
+
+  SCM
+  make_aabbox3df ()
+  {
+    irr::core::aabbox3df* box = new irr::core::aabbox3df ();
+    return wrap_aabbox3df (box);
+  }
+
+  SCM
+  make_aabbox3di ()
+  {
+    irr::core::aabbox3di* box = new irr::core::aabbox3di ();
+    return wrap_aabbox3di (box);
+  }
+
+}

diff --git a/src/aabbox3d.h b/src/aabbox3d.h
new file mode 100644 (file)
index 0000000..8dda8d3
--- /dev/null
+++ b/src/aabbox3d.h
@@ -0,0 +1,48 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __GUILE_IRRLICHT_AABBOX_3D_H_INCLUDED__
+#define __GUILE_IRRLICHT_AABBOX_3D_H_INCLUDED__
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_aabbox3d (void);
+
+  DECLARE_WRAPPED_TYPE (irr::core::aabbox3df*, init_aabbox3df_type,
+                        aabbox3df_p, wrap_aabbox3df, unwrap_aabbox3df);
+
+  DECLARE_WRAPPED_TYPE (irr::core::aabbox3di*, init_aabbox3di_type,
+                        aabbox3di_p, wrap_aabbox3di, unwrap_aabbox3di);
+
+  SCM
+  make_aabbox3df ();
+
+  SCM
+  make_aabbox3di ();
+
+}
+
+#endif

diff --git a/src/guile-irrlicht.cpp b/src/guile-irrlicht.cpp
index 69215ac115232b22bb141f37a4015a0c219be348..271ca915587d53e125eb825ebff2a8b853bf69b9 100644 (file)
--- a/src/guile-irrlicht.cpp
+++ b/src/guile-irrlicht.cpp
@@ -21,6 +21,7 @@
 
 #include <libguile.h>
 
+#include "aabbox3d.h"
 #include "animated-mesh.h"
 #include "animated-mesh-scene-node.h"
 #include "camera-scene-node.h"
@@ -47,6 +48,7 @@ extern "C" {
   void
   init_guile_irrlicht (void)
   {
+    init_aabbox3d ();
     init_animated_mesh ();
     init_animated_mesh_scene_node ();
     init_camera_scene_node ();

diff --git a/src/wrapped.h b/src/wrapped.h
index 1f61d9559e13231eb11e01559b2663da1a75bc55..c68b26af49282a261c3fbccdb789d5c245a0f0aa 100644 (file)
--- a/src/wrapped.h
+++ b/src/wrapped.h
@@ -38,9 +38,9 @@
   PRED (SCM wrapped_obj);
 
 
+static SCM wrapped_type;
+
 #define DEFINE_WRAPPED_TYPE(TYPE, PRINT_NAME, INIT, PRED, WRAP, UNWRAP) \
-  static SCM wrapped_type;                                              \
-                                                                        \
   void                                                                  \
   INIT (void)                                                           \
   {                                                                     \