From: Javier Sancho Date: Sun, 10 May 2020 11:37:21 +0000 (+0200) Subject: video-driver X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=ba89d42068aa7ee7535946ff61d9bbebdb153f28;p=guile-irrlicht.git video-driver --- diff --git a/src/video-driver.cpp b/src/video-driver.cpp index 61683f2..0b015d3 100644 --- a/src/video-driver.cpp +++ b/src/video-driver.cpp @@ -21,202 +21,187 @@ #include #include - #include "color.h" #include "gsubr.h" -#include "gui-environment.h" -#include "material.h" #include "matrix4.h" #include "primitive-types.h" #include "rect.h" -#include "scene-manager.h" -#include "texture.h" -#include "vertex3d.h" #include "video-driver.h" -#include "wrapped.h" -extern "C" { - void - init_video_driver (void) - { - init_video_driver_type (); - DEFINE_GSUBR ("begin-scene", 1, 0, 1, irr_video_beginScene); - DEFINE_GSUBR ("draw-vertex-primitive-list", 3, 0, 1, irr_video_drawVertexPrimitiveList); - DEFINE_GSUBR ("end-scene", 1, 0, 0, irr_video_endScene); - DEFINE_GSUBR ("get-fps", 1, 0, 0, irr_video_getFPS); - DEFINE_GSUBR ("get-texture", 2, 0, 0, irr_video_getTexture); - DEFINE_GSUBR ("set-transform!", 3, 0, 0, irr_video_setTransform); - } +using namespace irr; + + +SCM +video_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); + + // Source rect + core::rect* sourceRectAddress = 0; + if (!scm_is_false (source_rect)) + { + core::rect sourceRect = scm_to_rect_s32 (source_rect); + sourceRectAddress = &sourceRect; + } + + return scm_from_bool (driver->beginScene (scm_to_bool (back_buffer), + scm_to_bool (z_buffer), + scm_to_color (color), + video::SExposedVideoData (), + sourceRectAddress)); +} - DEFINE_WRAPPED_TYPE (irr::video::IVideoDriver*, "video-driver", - init_video_driver_type, video_driver_p, - wrap_video_driver, unwrap_video_driver); - SCM - irr_video_beginScene (SCM wrapped_video_driver, - SCM rest) - { - SCM back_buffer = SCM_BOOL_T; - SCM z_buffer = SCM_BOOL_T; - SCM color = scm_list_4 (scm_from_uint32 (255), - scm_from_uint32 (0), - scm_from_uint32 (0), - scm_from_uint32 (0)); - SCM video_data = SCM_BOOL_F; - SCM source_rect = SCM_UNDEFINED; - - scm_c_bind_keyword_arguments ("begin-scene", rest, (scm_t_keyword_arguments_flags)0, - scm_from_utf8_keyword ("back-buffer"), &back_buffer, - scm_from_utf8_keyword ("z-buffer"), &z_buffer, - scm_from_utf8_keyword ("color"), &color, - scm_from_utf8_keyword ("video-data"), &video_data, - scm_from_utf8_keyword ("source-rect"), &source_rect, - SCM_UNDEFINED); - - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - irr::core::rect* sourceRectAddress = 0; - if (source_rect != SCM_UNDEFINED) - { - irr::core::rect sourceRect = scm_to_rect_s32 (source_rect); - sourceRectAddress = &sourceRect; - } - return scm_from_bool (driver->beginScene (scm_to_bool (back_buffer), - scm_to_bool (z_buffer), - scm_to_color (color), - irr::video::SExposedVideoData (), - sourceRectAddress)); - } +SCM +video_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)); + video::S3DVertex s3d_vertices [vertex_count]; + for (int i = 0; i < vertex_count; i++) + { + video::S3DVertex* vertex = + (video::S3DVertex*) scm_to_pointer (scm_list_ref (vertices, scm_from_int (i))); + s3d_vertices[i] = video::S3DVertex (vertex->Pos, + vertex->Normal, + vertex->Color, + vertex->TCoords); + } + + // Build index array + u32 index_count = scm_to_uint32 (scm_length (indices)); + SCM flat_indices = scm_apply_0 (scm_eval_string (scm_from_utf8_string ("append")), + indices); + int flat_length = scm_to_int (scm_length (flat_indices)); + u32 c_indices [flat_length]; + for (int i = 0; i < flat_length; i++) + { + c_indices[i] = scm_to_uint32 (scm_list_ref (flat_indices, scm_from_int (i))); + } + + // Draw vertices + video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver); + driver->drawVertexPrimitiveList (&s3d_vertices[0], + vertex_count, + &c_indices[0], + index_count, + scm_to_vertex_type (v_type), + scm_to_primitive_type (p_type), + video::EIT_32BIT); + return SCM_UNSPECIFIED; +} - SCM - irr_video_drawVertexPrimitiveList (SCM wrapped_video_driver, - SCM vertices, - SCM indices, - SCM rest) - { - SCM v_type = scm_from_utf8_symbol ("standard"); - SCM p_type = scm_from_utf8_symbol ("triangles"); - - scm_c_bind_keyword_arguments ("draw-vertex-primitive-list", rest, (scm_t_keyword_arguments_flags)0, - scm_from_utf8_keyword ("vertex-type"), &v_type, - scm_from_utf8_keyword ("primitive-type"), &p_type, - SCM_UNDEFINED); - - // Build vertex array - irr::u32 vertex_count = scm_to_uint32 (scm_length (vertices)); - irr::video::S3DVertex s3d_vertices [vertex_count]; - for (int i = 0; i < vertex_count; i++) - { - irr::video::S3DVertex* vertex = unwrap_vertex3d (scm_list_ref (vertices, scm_from_int (i))); - s3d_vertices[i] = irr::video::S3DVertex (vertex->Pos, - vertex->Normal, - vertex->Color, - vertex->TCoords); - } - - // Build index array - irr::u32 index_count = scm_to_uint32 (scm_length (indices)); - SCM flat_indices = scm_apply_0 (scm_eval_string (scm_from_utf8_string ("append")), - indices); - int flat_length = scm_to_int (scm_length (flat_indices)); - irr::u32 c_indices [flat_length]; - for (int i = 0; i < flat_length; i++) - { - c_indices[i] = scm_to_uint32 (scm_list_ref (flat_indices, scm_from_int (i))); - } - - // Draw vertices - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - driver->drawVertexPrimitiveList (&s3d_vertices[0], - vertex_count, - &c_indices[0], - index_count, - scm_to_vertex_type (v_type), - scm_to_primitive_type (p_type), - irr::video::EIT_32BIT); - return SCM_UNSPECIFIED; - } - SCM - irr_video_endScene (SCM wrapped_video_driver) - { - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - return scm_from_bool (driver->endScene ()); - } +SCM +video_IVideoDriver_endScene (SCM video_driver) +{ + video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver); + return scm_from_bool (driver->endScene ()); +} - SCM - irr_video_getFPS (SCM wrapped_video_driver) - { - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - return scm_from_int32 (driver->getFPS ()); - } - SCM - irr_video_getTexture (SCM wrapped_video_driver, - SCM filename) - { - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - irr::video::ITexture* texture = driver->getTexture (scm_to_utf8_stringn (filename, NULL)); - return wrap_texture (texture); - } +SCM +video_IVideoDriver_getFPS (SCM video_driver) +{ + video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver); + return scm_from_int32 (driver->getFPS ()); +} - SCM - irr_video_setMaterial (SCM wrapped_video_driver, - SCM material) - { - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - driver->setMaterial (*(unwrap_material (material))); - return SCM_UNSPECIFIED; - } - SCM - irr_video_setTransform (SCM wrapped_video_driver, - SCM state, - SCM mat) - { - irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver); - driver->setTransform (scm_to_transformation_state (state), - scm_to_matrix4 (mat)); - return SCM_UNSPECIFIED; - } +SCM +video_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) +{ + video::IVideoDriver* driver = (video::IVideoDriver*) scm_to_pointer (video_driver); + driver->setMaterial (*((video::SMaterial*) scm_to_pointer (material))); + return SCM_UNSPECIFIED; +} + - irr::video::E_TRANSFORMATION_STATE - scm_to_transformation_state (SCM transformation_state) +SCM +video_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), + scm_to_matrix4 (mat)); + return SCM_UNSPECIFIED; +} + + +extern "C" { + + void + init_video_driver (void) { - char* state = scm_to_utf8_stringn (scm_symbol_to_string (transformation_state), NULL); - if (!strcmp (state, "view")) - { - return irr::video::ETS_VIEW; - } - else if (!strcmp (state, "world")) - { - return irr::video::ETS_WORLD; - } - else if (!strcmp (state, "projection")) - { - return irr::video::ETS_PROJECTION; - } - else if (!strcmp (state, "texture0")) - { - return irr::video::ETS_TEXTURE_0; - } - else if (!strcmp (state, "texture1")) - { - return irr::video::ETS_TEXTURE_1; - } - else if (!strcmp (state, "texture2")) - { - return irr::video::ETS_TEXTURE_2; - } - else if (!strcmp (state, "texture3")) - { - return irr::video::ETS_TEXTURE_3; - } - else - { - scm_error (scm_arg_type_key, NULL, "Wrong transformation state: ~S", - scm_list_1 (transformation_state), scm_list_1 (transformation_state)); - } + 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); } } + +video::E_TRANSFORMATION_STATE +scm_to_transformation_state (SCM transformation_state) +{ + char* state = scm_to_utf8_stringn (scm_symbol_to_string (transformation_state), NULL); + if (!strcmp (state, "view")) + { + return video::ETS_VIEW; + } + else if (!strcmp (state, "world")) + { + return video::ETS_WORLD; + } + else if (!strcmp (state, "projection")) + { + return video::ETS_PROJECTION; + } + else if (!strcmp (state, "texture0")) + { + return video::ETS_TEXTURE_0; + } + else if (!strcmp (state, "texture1")) + { + return video::ETS_TEXTURE_1; + } + else if (!strcmp (state, "texture2")) + { + return video::ETS_TEXTURE_2; + } + else if (!strcmp (state, "texture3")) + { + return video::ETS_TEXTURE_3; + } + else + { + scm_error (scm_arg_type_key, NULL, "Wrong transformation state: ~S", + scm_list_1 (transformation_state), scm_list_1 (transformation_state)); + } +} diff --git a/src/video-driver.h b/src/video-driver.h index 0dc32c7..d1b4bab 100644 --- a/src/video-driver.h +++ b/src/video-driver.h @@ -24,48 +24,13 @@ #include #include -#include "wrapped.h" extern "C" { - void init_video_driver (void); - - DECLARE_WRAPPED_TYPE (irr::video::IVideoDriver*, init_video_driver_type, - video_driver_p, wrap_video_driver, unwrap_video_driver); - - SCM - irr_video_beginScene (SCM wrapped_video_driver, - SCM rest); - - SCM - irr_video_drawVertexPrimitiveList (SCM wrapped_video_driver, - SCM vertices, - SCM indices, - SCM rest); - - SCM - irr_video_endScene (SCM wrapped_video_driver); - - SCM - irr_video_getFPS (SCM wrapped_video_driver); - - SCM - irr_video_getTexture (SCM wrapped_video_driver, - SCM filename); - - SCM - irr_video_setMaterial (SCM wrapped_video_driver, - SCM material); - - SCM - irr_video_setTransform (SCM wrapped_video_driver, - SCM state, - SCM mat); - - irr::video::E_TRANSFORMATION_STATE - scm_to_transformation_state (SCM transformation_state); - } +irr::video::E_TRANSFORMATION_STATE +scm_to_transformation_state (SCM transformation_state); + #endif