[Gzz-commits] gzz/gzz/vob TextVob.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/28 05:25:40

Modified files:
        gzz/vob        : TextVob.java 

Log message:
        use horiztext2

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.27 gzz/gzz/vob/TextVob.java:1.28
*** gzz/gzz/vob/TextVob.java:1.27       Mon Sep 23 04:24:26 2002
--- gzz/gzz/vob/TextVob.java    Sat Sep 28 05:25:40 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.27 2002/09/23 08:24:26 tjl 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.28 2002/09/28 09:25:40 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 105,111 ****
  
      /** The OpenGL renderable for this TextVob.
       */
!     private GLRen.HorizText ht;
      static Vob cl; // Color callList - XXX Should be removed -
                    // color should come from outside.
      public int addToListGL(GraphicsAPI.Window win,
--- 105,111 ----
  
      /** The OpenGL renderable for this TextVob.
       */
!     private GLRen.HorizText2 ht;
      static Vob cl; // Color callList - XXX Should be removed -
                    // color should come from outside.
      public int addToListGL(GraphicsAPI.Window win,
***************
*** 116,126 ****
            float sh = 2.0f/style.getHeight(1);
            float sw = 2.0f/style.getWidth(text, 1);
            GLTextStyle gls = (GLTextStyle)style;
!           ht = GLRen.createHorizText(
                    gls.theFont,
                    text,
!                   -1, 0.7f, -1f,
!                   sw * gls.fontScale, sh * gls.fontScale);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");
--- 116,126 ----
            float sh = 2.0f/style.getHeight(1);
            float sw = 2.0f/style.getWidth(text, 1);
            GLTextStyle gls = (GLTextStyle)style;
!           ht = GLRen.createHorizText2(
                    gls.theFont,
                    text,
!                   -1, -1, 0,
!                   sw * gls.fontScale);
        }
        if(cl == null) {
            cl = GLRen.createCallList("Color 0 0 0 1");