[Gzz-commits] gzz/gfx jni/GzzGL-jni.cxx librenderables/Render...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/12 13:40:30

Modified files:
        gfx/jni        : GzzGL-jni.cxx 
        gfx/librenderables: Renderables.cxx Renderables.hxx 
                            renderables.py 

Log message:
        In addition to frame-by-frame fps, show 5 frames average.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.cxx.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.162&tr2=1.163&r1=text&r2=text

Patches:
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -u gzz/gfx/jni/GzzGL-jni.cxx:1.70 gzz/gfx/jni/GzzGL-jni.cxx:1.71
--- gzz/gfx/jni/GzzGL-jni.cxx:1.70      Tue Dec 10 07:45:52 2002
+++ gzz/gfx/jni/GzzGL-jni.cxx   Thu Dec 12 13:40:30 2002
@@ -1039,9 +1039,14 @@
 
       if(dbg_fps) {
        double new_time = getTime();
-       CurrentFPS::current_fps = 1.0/(new_time - CurrentFPS::last_time);
+       CurrentFPS::current_fps = 1.0/(new_time - 
CurrentFPS::last_time[CurrentFPS::count]);
        DBG(dbg_fps_cout) << "CurrentFPS: " << CurrentFPS::current_fps << "\n";
-        CurrentFPS::last_time = new_time;
+       CurrentFPS::count ++;
+       CurrentFPS::count %= CurrentFPS::NCounts;
+       CurrentFPS::current_fps5 = CurrentFPS::NCounts *
+                                   1.0/(new_time - 
CurrentFPS::last_time[CurrentFPS::count]);
+        CurrentFPS::last_time[CurrentFPS::count] = new_time;
+
       }
        
   }
Index: gzz/gfx/librenderables/Renderables.cxx
diff -u gzz/gfx/librenderables/Renderables.cxx:1.11 
gzz/gfx/librenderables/Renderables.cxx:1.12
--- gzz/gfx/librenderables/Renderables.cxx:1.11 Tue Dec 10 07:45:52 2002
+++ gzz/gfx/librenderables/Renderables.cxx      Thu Dec 12 13:40:30 2002
@@ -6,7 +6,9 @@
 namespace CurrentFPS {
     // bool showFPS;
     double current_fps;
-    double last_time;
+    double current_fps5;
+    double last_time[NCounts];
+    int count = 0;
 }
 
 namespace Renderables {
Index: gzz/gfx/librenderables/Renderables.hxx
diff -u gzz/gfx/librenderables/Renderables.hxx:1.24 
gzz/gfx/librenderables/Renderables.hxx:1.25
--- gzz/gfx/librenderables/Renderables.hxx:1.24 Sat Nov  9 13:32:52 2002
+++ gzz/gfx/librenderables/Renderables.hxx      Thu Dec 12 13:40:30 2002
@@ -59,7 +59,10 @@
 namespace CurrentFPS {
     // bool showFPS;
     extern double current_fps;
-    extern double last_time;
+    extern double current_fps5; // average of last 5 frames
+    extern int count;
+    enum { NCounts = 5 };
+    extern double last_time[NCounts];
 }
 
 /** The core of Gzz graphics: lists of interpolatable, renderable
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.162 
gzz/gfx/librenderables/renderables.py:1.163
--- gzz/gfx/librenderables/renderables.py:1.162 Thu Dec 12 04:42:20 2002
+++ gzz/gfx/librenderables/renderables.py       Thu Dec 12 13:40:30 2002
@@ -1994,8 +1994,9 @@
                break;
            case 1: /* Show fps. */
                double fps = CurrentFPS::current_fps;
+               double fps5 = CurrentFPS::current_fps5;
                static char buffer[100];
-               sprintf(buffer, "FPS %2.2f", fps);
+               sprintf(buffer, "FPS %2.2f / %2.2f", fps5, fps);
                Text::renderIter(*r, buffer, buffer+strlen(buffer), 
                        0, y,
                        v