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

diff --git a/src/vertex3d.cpp b/src/vertex3d.cpp
index 6ffc86d..e0ca2d2 100644
--- a/src/vertex3d.cpp
+++ b/src/vertex3d.cpp
@@ -21,7 +21,6 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
 #include "color.h"
 #include "gsubr.h"
 #include "vector2d.h"
@@ -29,61 +28,59 @@
 #include "vertex3d.h"
 #include "wrapped.h"
 
-extern "C" {
+using namespace irr;
 
-  void
-  init_vertex3d (void)
-  {
-    init_vertex3d_type ();
-    DEFINE_GSUBR ("make-vertex3d", 4, 0, 0, make_vertex3d);
-    DEFINE_GSUBR ("vertex3d-position", 1, 0, 0, vertex3d_position);
-  }
+SCM
+S3DVertex_make (SCM position,
+                SCM normal,
+                SCM color,
+                SCM tcoords)
+{
+  video::S3DVertex* vertex =
+    new video::S3DVertex (scm_to_vector3df (position),
+                          scm_to_vector3df (normal),
+                          scm_to_color (color),
+                          scm_to_vector2df (tcoords));
+  return scm_from_irr_pointer ("<vertex3d>", (void*) vertex);
+}
 
-  DEFINE_WRAPPED_TYPE (irr::video::S3DVertex*, "vertex3d",
-                       init_vertex3d_type, vertex3d_p,
-                       wrap_vertex3d, unwrap_vertex3d);
+SCM
+S3DVertex_Pos (SCM vertex) {
+  video::S3DVertex* s3dvertex = (video::S3DVertex*) scm_to_irr_pointer (vertex);
+  return scm_from_vector3df (s3dvertex->Pos);
+}
 
-  SCM
-  make_vertex3d (SCM position,
-                 SCM normal,
-                 SCM color,
-                 SCM tcoords)
-  {
-    irr::video::S3DVertex* vertex =
-      new irr::video::S3DVertex (scm_to_vector3df (position),
-                                 scm_to_vector3df (normal),
-                                 scm_to_color (color),
-                                 scm_to_vector2df (tcoords));
-    return wrap_vertex3d (vertex);
-  }
+void
+init_vertex3d (void)
+{
+  DEFINE_GSUBR ("S3DVertex_make", 4, 0, 0, S3DVertex_make);
+  DEFINE_GSUBR ("S3DVertex_Pos", 1, 0, 0, S3DVertex_Pos);
+}
 
-  SCM
-  vertex3d_position (SCM vertex) {
-    irr::video::S3DVertex* s3dvertex = unwrap_vertex3d (vertex);
-    return scm_from_vector3df (s3dvertex->Pos);
-  }
+video::E_VERTEX_TYPE
+scm_to_vertex_type (SCM vertex_type)
+{
+  char* type_name = scm_to_utf8_string (scm_symbol_to_string (vertex_type));
+  video::E_VERTEX_TYPE type;
 
-  irr::video::E_VERTEX_TYPE
-  scm_to_vertex_type (SCM vertex_type)
-  {
-    char* type = scm_to_utf8_stringn (scm_symbol_to_string (vertex_type), NULL);
-    if (!strcmp (type, "standard"))
-      {
-        return irr::video::EVT_STANDARD;
-      }
-    else if (!strcmp (type, "2tcoords"))
-      {
-        return irr::video::EVT_2TCOORDS;
-      }
-    else if (!strcmp (type, "tangents"))
-      {
-        return irr::video::EVT_TANGENTS;
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Wrong vertex_type: ~S",
-                   scm_list_1 (vertex_type), scm_list_1 (vertex_type));
-      }
-  }
+  if (!strcmp (type_name, "standard"))
+    {
+      type = video::EVT_STANDARD;
+    }
+  else if (!strcmp (type_name, "2tcoords"))
+    {
+      type = video::EVT_2TCOORDS;
+    }
+  else if (!strcmp (type_name, "tangents"))
+    {
+      type = video::EVT_TANGENTS;
+    }
+  else
+    {
+      scm_error (scm_arg_type_key, NULL, "Wrong vertex_type: ~S",
+                 scm_list_1 (vertex_type), scm_list_1 (vertex_type));
+    }
 
+  free (type_name);
+  return type;
 }