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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/10 02:36:53

Modified files:
        gzz/vob/vobs   : TextVob.java 

Log message:
        Changed default OpenGL color for text to red (don't worry - I change it 
back today).

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

Patches:
Index: gzz/gzz/vob/vobs/TextVob.java
diff -u gzz/gzz/vob/vobs/TextVob.java:1.7 gzz/gzz/vob/vobs/TextVob.java:1.8
--- gzz/gzz/vob/vobs/TextVob.java:1.7   Sat Dec 28 21:01:41 2002
+++ gzz/gzz/vob/vobs/TextVob.java       Fri Jan 10 02:36:53 2003
@@ -48,16 +48,26 @@
  * XXX Diagram!
  */
 public class TextVob extends HBox.VobHBox {
-String rcsid = "$Id: TextVob.java,v 1.7 2002/12/29 02:01:41 benja Exp $";
+String rcsid = "$Id: TextVob.java,v 1.8 2003/01/10 07:36:53 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
     protected final TextStyle style;
     protected final String text;
     protected final boolean baselined;
+    protected String textColor = "Color 1 0 0";
 
     protected Object key;
 
+    /** Same as another constructor but in GL side you can give the color 
+     * with string like "Color 1 0.5 0.5"
+     * @param color OpenGL Color used to draw the text.
+     */
+    public TextVob(TextStyle style, String text, boolean baselined, String 
color) {
+       this(style, text, baselined);
+       this.textColor = color;
+    }
+
     /** Create a new TextVob.
      * @param style The textstyle to use.
      * @param text The text that the Vob should show
@@ -134,7 +144,8 @@
        //g.setClip(oldClip);
     }
 
-    static private Vob start, stop;
+    static private Vob start, stop, resetColor;
+    private Vob setColor;
     static public Vob getStartCode() {
        if(start == null) {
            if (GL.hasExtension("GL_NV_register_combiners")) {
@@ -168,6 +179,21 @@
        return stop;
     }
 
+    private Vob setColor() {
+       if(setColor == null) { 
+           setColor = GLCache.getCallList(this.textColor);
+       }
+       return setColor;
+    }
+    static public Vob resetColor() {
+       if(resetColor == null) {
+           resetColor = GLCache.getCallList("Color 0 0 0");
+       }
+       return resetColor;
+    }
+
+    
+
 
     /** The OpenGL renderable for this TextVob.
      */
@@ -187,7 +213,9 @@
                    1, 1);
        }
        curs = getStartCode().addToListGL(win, list, curs, 0, 0);
+       curs = setColor().addToListGL(win, list, curs, 0, 0);
        curs = ht.addToListGL(win, list, curs, coordsys1, coordsys2);
+       curs = resetColor().addToListGL(win, list, curs, 0, 0);
        curs = getStopCode().addToListGL(win, list, curs, 0, 0);
        return curs;
     }