get-fps

diff --git a/src/misc.cpp b/src/misc.cpp
index bd3e037bb0ad43be3ee3f1e95d8972177d4111e4..1c01d2cebc3e17d68601a78fc470ce943f6290db 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -24,8 +24,10 @@
 
 #include "cursor-control.h"
 #include "gui-element.h"
+#include "gui-environment.h"
 #include "mesh-scene-node.h"
 #include "misc.h"
+#include "scene-manager.h"
 #include "scene-node.h"
 #include "video-driver.h"
 #include "wchar.h"
@@ -35,10 +37,30 @@ extern "C" {
   void
   init_misc (void)
   {
+    scm_c_define_gsubr ("draw-all", 1, 0, 0, (scm_t_subr)irr_drawAll);
     scm_c_define_gsubr ("get-name", 1, 0, 0, (scm_t_subr)irr_getName);
     scm_c_define_gsubr ("set-position!", 2, 0, 0, (scm_t_subr)irr_setPosition);
     scm_c_define_gsubr ("set-visible!", 2, 0, 0, (scm_t_subr)irr_setVisible);
-    scm_c_export ("get-name", "set-position!", "set-visible!", NULL);
+    scm_c_export ("draw-all", "get-name", "set-position!", "set-visible!", NULL);
+  }
+
+  SCM
+  irr_drawAll (SCM wrapped_obj)
+  {
+    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;
   }
 
   SCM

diff --git a/src/misc.h b/src/misc.h
index d7c7b27f6eb453356d97ceae4230407c286edbb3..047512d220d33e53d79a3c8f8db9ee2d74403882 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -30,6 +30,9 @@ extern "C" {
   void
   init_misc (void);
 
+  SCM
+  irr_drawAll (SCM wrapped_obj);
+
   SCM
   irr_getName (SCM wrapped_obj);
 

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

diff --git a/src/video-driver.h b/src/video-driver.h
index d8cd754adf70112191c07da9644965aa3365b9e6..2560135a4c39186791a57ab60e60423d58d36f4a 100644 (file)
--- a/src/video-driver.h
+++ b/src/video-driver.h
@@ -39,10 +39,10 @@ extern "C" {
                         SCM rest);
 
   SCM
-  irr_drawAll (SCM wrapped_obj);
+  irr_video_endScene (SCM wrapped_video_driver);
 
   SCM
-  irr_video_endScene (SCM wrapped_video_driver);
+  irr_video_getFPS (SCM wrapped_video_driver);
 
   SCM
   irr_video_getTexture (SCM wrapped_video_driver,