X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fvideo-driver.cpp;h=aa63e5289e45d298007d83ad5337d09e1bb5d543;hb=5e5b0caed972e0b225199551aff09c399edb8d3c;hp=43ada624a593ee5b57ce53ed958f78ced7d7f07e;hpb=f215da151462c3d0fe9bacc535083529ba43e716;p=guile-irrlicht.git

diff --git a/src/video-driver.cpp b/src/video-driver.cpp
index 43ada62..aa63e52 100644
--- a/src/video-driver.cpp
+++ b/src/video-driver.cpp
@@ -25,6 +25,8 @@
 #include "color.h"
 #include "device.h"
 #include "gui-environment.h"
+#include "material.h"
+#include "matrix4.h"
 #include "rect.h"
 #include "scene-manager.h"
 #include "texture.h"
@@ -38,12 +40,13 @@ extern "C" {
   {
     init_video_driver_type ();
     scm_c_define_gsubr ("begin-scene", 1, 0, 1, (scm_t_subr)irr_video_beginScene);
-    scm_c_define_gsubr ("draw-all", 1, 0, 0, (scm_t_subr)irr_drawAll);
     scm_c_define_gsubr ("end-scene", 1, 0, 0, (scm_t_subr)irr_video_endScene);
+    scm_c_define_gsubr ("get-fps", 1, 0, 0, (scm_t_subr)irr_video_getFPS);
     scm_c_define_gsubr ("get-texture", 2, 0, 0, (scm_t_subr)irr_video_getTexture);
     scm_c_define_gsubr ("get-video-driver", 1, 0, 0, (scm_t_subr)irr_getVideoDriver);
-    scm_c_export ("begin-scene", "draw-all", "end-scene", "get-texture",
-                  "get-video-driver", NULL);
+    scm_c_define_gsubr ("set-transform!", 3, 0, 0, (scm_t_subr)irr_video_setTransform);
+    scm_c_export ("begin-scene", "end-scene", "get-fps", "get-texture",
+                  "get-video-driver", "set-transform!", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::video::IVideoDriver*, "video-driver",
@@ -86,29 +89,17 @@ extern "C" {
   }
 
   SCM
-  irr_drawAll (SCM wrapped_obj)
+  irr_video_endScene (SCM wrapped_video_driver)
   {
-    if (gui_environment_p (wrapped_obj))
-      {
-        unwrap_gui_environment (wrapped_obj)->drawAll ();
-      }
-    else if (scene_manager_p (wrapped_obj))
-      {
-        unwrap_scene_manager (wrapped_obj)->drawAll ();
-      }
-    else
-      {
-        scm_error (scm_arg_type_key, NULL, "Cannot draw all elements from object: ~S",
-                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
-      }
-    return SCM_UNSPECIFIED;
+    irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver);
+    return scm_from_bool (driver->endScene ());
   }
 
   SCM
-  irr_video_endScene (SCM wrapped_video_driver)
+  irr_video_getFPS (SCM wrapped_video_driver)
   {
     irr::video::IVideoDriver* driver = unwrap_video_driver (wrapped_video_driver);
-    return scm_from_bool (driver->endScene ());
+    return scm_from_int32 (driver->getFPS ());
   }
 
   SCM
@@ -120,6 +111,26 @@ extern "C" {
     return wrap_texture (texture);
   }
 
+  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
   irr_getVideoDriver (SCM wrapped_obj)
   {
@@ -136,4 +147,43 @@ extern "C" {
     return wrap_video_driver (driver);
   }
 
+  irr::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 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));
+      }
+  }
+
 }