Unwrap Irrlicht objects in C++ instead of Guile

[guile-irrlicht.git] / src / video-driver.cpp

diff --git a/src/video-driver.cpp b/src/video-driver.cpp
index 6ec018338454b7c408a2ca27e7e15690488db7c7..b52b24f6e2b9593a916d1c94f35f6fc0a0ce6af3 100644 (file)
--- a/src/video-driver.cpp
+++ b/src/video-driver.cpp
@@ -28,6 +28,7 @@
 #include "rect.h"
 #include "vertex3d.h"
 #include "video-driver.h"
+#include "wrapped.h"
 
 using namespace irr;
 
@@ -39,7 +40,7 @@ IVideoDriver_beginScene (SCM video_driver,
                          SCM video_data,
                          SCM source_rect)
 {
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
 
   // Source rect
   core::rect<s32>* sourceRectAddress = 0;
@@ -69,7 +70,7 @@ IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
   for (int i = 0; i < vertex_count; i++)
     {
       video::S3DVertex* vertex =
-        (video::S3DVertex*) scm_to_pointer (scm_list_ref (vertices, scm_from_int (i)));
+        (video::S3DVertex*) scm_to_irr_pointer (scm_list_ref (vertices, scm_from_int (i)));
       s3d_vertices[i] = video::S3DVertex (vertex->Pos,
                                           vertex->Normal,
                                           vertex->Color,
@@ -88,7 +89,7 @@ IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
     }
 
   // Draw vertices
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
   driver->drawVertexPrimitiveList (&s3d_vertices[0],
                                    vertex_count,
                                    &c_indices[0],
@@ -102,14 +103,14 @@ IVideoDriver_drawVertexPrimitiveList (SCM video_driver,
 SCM
 IVideoDriver_endScene (SCM video_driver)
 {
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
   return scm_from_bool (driver->endScene ());
 }
 
 SCM
 IVideoDriver_getFPS (SCM video_driver)
 {
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
   return scm_from_int32 (driver->getFPS ());
 }
 
@@ -117,7 +118,7 @@ SCM
 IVideoDriver_getTexture (SCM video_driver,
                          SCM filename)
 {
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
   video::ITexture* texture = driver->getTexture (scm_to_utf8_stringn (filename, NULL));
   return scm_from_pointer ((void*) texture, NULL);
 }
@@ -126,8 +127,8 @@ SCM
 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)));
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
+  driver->setMaterial (*((video::SMaterial*) scm_to_irr_pointer (material)));
   return SCM_UNSPECIFIED;
 }
 
@@ -136,7 +137,7 @@ IVideoDriver_setTransform (SCM video_driver,
                            SCM state,
                            SCM mat)
 {
-  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver);
+  video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_irr_pointer (video_driver);
   driver->setTransform (scm_to_transformation_state (state),
                         scm_to_matrix4 (mat));
   return SCM_UNSPECIFIED;