[Gzz-commits] gzz gfx/librenderables/renderables.py gzz/vob/T...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/29 10:49:32

Modified files:
        gfx/librenderables: renderables.py 
        gzz/vob        : TextVob.java 

Log message:
        Start magic fps vob

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.81 
gzz/gfx/librenderables/renderables.py:1.82
*** gzz/gfx/librenderables/renderables.py:1.81  Sat Sep 28 18:55:13 2002
--- gzz/gfx/librenderables/renderables.py       Sun Sep 29 10:49:32 2002
***************
*** 849,864 ****
        unistring txt;
        ZPt origin;
        float h1;
        """,
      "Params" : """
        Font f,
        String text, float x, float y, float z,
!       float h1
        """,
      "ParamCode" : """
        r = f;
        txt = text; origin.x = x; origin.y = y; origin.z = z;
        this->h1 = h1;
        """,
      "ExtraClass" : """
        template<class Coords> struct Vertexer {
--- 849,866 ----
        unistring txt;
        ZPt origin;
        float h1;
+       int magic;
        """,
      "Params" : """
        Font f,
        String text, float x, float y, float z,
!       float h1, int magic
        """,
      "ParamCode" : """
        r = f;
        txt = text; origin.x = x; origin.y = y; origin.z = z;
        this->h1 = h1;
+       this->magic = magic;
        """,
      "ExtraClass" : """
        template<class Coords> struct Vertexer {
***************
*** 890,899 ****
            Vertexer<Coords> v(coords2, *coords2inv, coords1, h1, orig.z);
            glPushAttrib(GL_ENABLE_BIT);
            glEnable(GL_BLEND);
!           Text::renderIter(*r, txt.begin(), txt.end(), 
!                   orig.x,orig.y,
!                   v
!                   );
            glPopAttrib();
      """       
  }, 
--- 892,914 ----
            Vertexer<Coords> v(coords2, *coords2inv, coords1, h1, orig.z);
            glPushAttrib(GL_ENABLE_BIT);
            glEnable(GL_BLEND);
!           switch(magic) {
!           case 0: 
!               Text::renderIter(*r, txt.begin(), txt.end(), 
!                       orig.x,orig.y,
!                       v
!                       );
!               break;
!           case 1: /* Show fps. */
!               double fps = CurrentFPS::current_fps;
!               static char buffer[100];
!               sprintf(buffer, "FPS %2.2f", fps);
!               Text::renderIter(*r, buffer, buffer+strlen(buffer), 
!                       orig.x,orig.y,
!                       v
!                       );
!               break;
!           }
            glPopAttrib();
      """       
  }, 
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.31 gzz/gzz/vob/TextVob.java:1.32
*** gzz/gzz/vob/TextVob.java:1.31       Sat Sep 28 15:52:02 2002
--- gzz/gzz/vob/TextVob.java    Sun Sep 29 10:49:32 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.31 2002/09/28 19:52:02 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 31,37 ----
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.32 2002/09/29 14:49:32 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 120,126 ****
                    gls.theFont,
                    text,
                    -1, -1, 0,
!                   sh);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");
--- 120,126 ----
                    gls.theFont,
                    text,
                    -1, -1, 0,
!                   sh, 0);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");