[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/09/29 11:00:37

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

Log message:
        Move FPS, we need to access it at renderables

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.cxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.37 gzz/gfx/jni/GzzGL-jni.cxx:1.38
*** gzz/gfx/jni/GzzGL-jni.cxx:1.37      Fri Sep 27 07:30:45 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Sun Sep 29 11:00:37 2002
***************
*** 30,41 ****
  using Renderables::Renderable2;
  using Renderables::TextRenderer;
  
- namespace CurrentFPS {
-     // bool showFPS;
-     double current_fps;
-     double last_time;
- }
- 
  
  // XXX MEMLEAK
  struct RealFont {
--- 30,35 ----
Index: gzz/gfx/librenderables/Renderables.cxx
diff -c gzz/gfx/librenderables/Renderables.cxx:1.4 
gzz/gfx/librenderables/Renderables.cxx:1.5
*** gzz/gfx/librenderables/Renderables.cxx:1.4  Sat Sep 28 05:50:06 2002
--- gzz/gfx/librenderables/Renderables.cxx      Sun Sep 29 11:00:37 2002
***************
*** 3,8 ****
--- 3,14 ----
  #include <algorithm>
  
  
+ namespace CurrentFPS {
+     // bool showFPS;
+     double current_fps;
+     double last_time;
+ }
+ 
  namespace Renderables {
  
  
Index: gzz/gfx/librenderables/Renderables.hxx
diff -c gzz/gfx/librenderables/Renderables.hxx:1.15 
gzz/gfx/librenderables/Renderables.hxx:1.16
*** gzz/gfx/librenderables/Renderables.hxx:1.15 Sat Sep 28 05:50:06 2002
--- gzz/gfx/librenderables/Renderables.hxx      Sun Sep 29 11:00:37 2002
***************
*** 53,58 ****
--- 53,64 ----
  
  #endif
  
+ namespace CurrentFPS {
+     // bool showFPS;
+     extern double current_fps;
+     extern double last_time;
+ }
+ 
  /** The core of Gzz graphics: lists of interpolatable, renderable
   * OpenGL objects in affine coordinate systems.
   */