get-fps

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

diff --git a/src/video-driver.cpp b/src/video-driver.cpp
index 43ada624a593ee5b57ce53ed958f78ced7d7f07e..ee80c369e767641caccb23b41e44b48c23e4e1d6 100644 (file)
--- a/src/video-driver.cpp
+++ b/src/video-driver.cpp
@@ -38,11 +38,11 @@ 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",
+    scm_c_export ("begin-scene", "end-scene", "get-fps", "get-texture",
                   "get-video-driver", NULL);
   }
 
@@ -86,29 +86,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