X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fvideo-driver.cpp;h=6ec018338454b7c408a2ca27e7e15690488db7c7;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hp=e2cb9cf332809d62f82a4adb01966ae40a8e0bda;hpb=98052b04792129db97286fdd77ef3b0de8912286;p=guile-irrlicht.git diff --git a/src/video-driver.cpp b/src/video-driver.cpp index e2cb9cf..6ec0183 100644 --- a/src/video-driver.cpp +++ b/src/video-driver.cpp @@ -29,10 +29,8 @@ #include "vertex3d.h" #include "video-driver.h" - using namespace irr; - SCM IVideoDriver_beginScene (SCM video_driver, SCM back_buffer, @@ -58,7 +56,6 @@ IVideoDriver_beginScene (SCM video_driver, sourceRectAddress)); } - SCM IVideoDriver_drawVertexPrimitiveList (SCM video_driver, SCM vertices, @@ -102,7 +99,6 @@ IVideoDriver_drawVertexPrimitiveList (SCM video_driver, return SCM_UNSPECIFIED; } - SCM IVideoDriver_endScene (SCM video_driver) { @@ -110,7 +106,6 @@ IVideoDriver_endScene (SCM video_driver) return scm_from_bool (driver->endScene ()); } - SCM IVideoDriver_getFPS (SCM video_driver) { @@ -118,7 +113,6 @@ IVideoDriver_getFPS (SCM video_driver) return scm_from_int32 (driver->getFPS ()); } - SCM IVideoDriver_getTexture (SCM video_driver, SCM filename) @@ -128,7 +122,6 @@ IVideoDriver_getTexture (SCM video_driver, return scm_from_pointer ((void*) texture, NULL); } - SCM IVideoDriver_setMaterial (SCM video_driver, SCM material) @@ -138,7 +131,6 @@ IVideoDriver_setMaterial (SCM video_driver, return SCM_UNSPECIFIED; } - SCM IVideoDriver_setTransform (SCM video_driver, SCM state, @@ -151,21 +143,17 @@ IVideoDriver_setTransform (SCM video_driver, } -extern "C" { - - 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); - } - +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