X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fvideo-driver.cpp;h=6ec018338454b7c408a2ca27e7e15690488db7c7;hb=6bcbb2cefb0e69afae9b1de828b85f506b1bef19;hp=0b015d3bb02bea6464e1437d69b34f1cd0af93a2;hpb=ba89d42068aa7ee7535946ff61d9bbebdb153f28;p=guile-irrlicht.git

diff --git a/src/video-driver.cpp b/src/video-driver.cpp
index 0b015d3..6ec0183 100644
--- a/src/video-driver.cpp
+++ b/src/video-driver.cpp
@@ -26,19 +26,18 @@
 #include "matrix4.h"
 #include "primitive-types.h"
 #include "rect.h"
+#include "vertex3d.h"
 #include "video-driver.h"
 
-
 using namespace irr;
 
-
 SCM
-video_IVideoDriver_beginScene (SCM video_driver,
-                               SCM back_buffer,
-                               SCM z_buffer,
-                               SCM color,
-                               SCM video_data,
-                               SCM source_rect)
+IVideoDriver_beginScene (SCM video_driver,
+                         SCM back_buffer,
+                         SCM z_buffer,
+                         SCM color,
+                         SCM video_data,
+                         SCM source_rect)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
 
@@ -57,13 +56,12 @@ video_IVideoDriver_beginScene (SCM video_driver,
                                             sourceRectAddress));
 }
 
-
 SCM
-video_IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
-                                            SCM vertices,
-                                            SCM indices,
-                                            SCM v_type,
-                                            SCM p_type)
+IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
+                                      SCM vertices,
+                                      SCM indices,
+                                      SCM v_type,
+                                      SCM p_type)
 {
   // Build vertex array
   u32 vertex_count = scm_to_uint32 (scm_length (vertices));
@@ -101,47 +99,42 @@ video_IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-video_IVideoDriver_endScene (SCM video_driver)
+IVideoDriver_endScene (SCM video_driver)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   return scm_from_bool (driver->endScene ());
 }
 
-
 SCM
-video_IVideoDriver_getFPS (SCM video_driver)
+IVideoDriver_getFPS (SCM video_driver)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   return scm_from_int32 (driver->getFPS ());
 }
 
-
 SCM
-video_IVideoDriver_getTexture (SCM video_driver,
-                               SCM filename)
+IVideoDriver_getTexture (SCM video_driver,
+                         SCM filename)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   video::ITexture* texture = driver->getTexture (scm_to_utf8_stringn (filename, NULL));
   return scm_from_pointer ((void*) texture, NULL);
 }
 
-
 SCM
-video_IVideoDriver_setMaterial (SCM video_driver,
-                                SCM material)
+IVideoDriver_setMaterial (SCM video_driver,
+                          SCM material)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   driver->setMaterial (*((video::SMaterial*) scm_to_pointer (material)));
   return SCM_UNSPECIFIED;
 }
 
-
 SCM
-video_IVideoDriver_setTransform (SCM video_driver,
-                                 SCM state,
-                                 SCM mat)
+IVideoDriver_setTransform (SCM video_driver,
+                           SCM state,
+                           SCM mat)
 {
   video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
   driver->setTransform (scm_to_transformation_state (state),
@@ -150,21 +143,17 @@ video_IVideoDriver_setTransform (SCM video_driver,
 }
 
 
-extern "C" {
-
-  void
-  init_video_driver (void)
-  {
-    DEFINE_GSUBR ("video_IVideoDriver_beginScene", 6, 0, 0, video_IVideoDriver_beginScene);
-    DEFINE_GSUBR ("video_IVideoDriver_drawVertexPrimitiveList", 5, 0, 1,
-                  video_IVideoDriver_drawVertexPrimitiveList);
-    DEFINE_GSUBR ("video_IVideoDriver_endScene", 1, 0, 0, video_IVideoDriver_endScene);
-    DEFINE_GSUBR ("video_IVideoDriver_getFPS", 1, 0, 0, video_IVideoDriver_getFPS);
-    DEFINE_GSUBR ("video_IVideoDriver_getTexture", 2, 0, 0, video_IVideoDriver_getTexture);
-    DEFINE_GSUBR ("video_IVideoDriver_setMaterial", 2, 0, 0, video_IVideoDriver_setMaterial);
-    DEFINE_GSUBR ("video_IVideoDriver_setTransform", 3, 0, 0, video_IVideoDriver_setTransform);
-  }
-
+void
+init_video_driver (void)
+{
+  DEFINE_GSUBR ("IVideoDriver_beginScene", 6, 0, 0, IVideoDriver_beginScene);
+  DEFINE_GSUBR ("IVideoDriver_drawVertexPrimitiveList", 5, 0, 1,
+                IVideoDriver_drawVertexPrimitiveList);
+  DEFINE_GSUBR ("IVideoDriver_endScene", 1, 0, 0, IVideoDriver_endScene);
+  DEFINE_GSUBR ("IVideoDriver_getFPS", 1, 0, 0, IVideoDriver_getFPS);
+  DEFINE_GSUBR ("IVideoDriver_getTexture", 2, 0, 0, IVideoDriver_getTexture);
+  DEFINE_GSUBR ("IVideoDriver_setMaterial", 2, 0, 0, IVideoDriver_setMaterial);
+  DEFINE_GSUBR ("IVideoDriver_setTransform", 3, 0, 0, IVideoDriver_setTransform);
 }
 
 video::E_TRANSFORMATION_STATE