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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/09 11:06:11

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

Log message:
        Use Janne's patch for making cell bgs appear

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/RectBgVob.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/RectBgVob.java
diff -c gzz/gzz/vob/RectBgVob.java:1.10 gzz/gzz/vob/RectBgVob.java:1.11
*** gzz/gzz/vob/RectBgVob.java:1.10     Mon Sep  9 09:49:06 2002
--- gzz/gzz/vob/RectBgVob.java  Mon Sep  9 11:06:11 2002
***************
*** 39,45 ****
   */
  
  public class RectBgVob extends Vob {
! public static final String rcsid = "$Id: RectBgVob.java,v 1.10 2002/09/09 
13:49:06 benja Exp $";
      public static boolean dbg = false;
      static final void p(String s) { if(dbg) System.out.println(s); }
      static final void pa(String s) { System.out.println(s); }
--- 39,45 ----
   */
  
  public class RectBgVob extends Vob {
! public static final String rcsid = "$Id: RectBgVob.java,v 1.11 2002/09/09 
15:06:11 benja Exp $";
      public static boolean dbg = false;
      static final void p(String s) { if(dbg) System.out.println(s); }
      static final void pa(String s) { System.out.println(s); }
***************
*** 100,110 ****
          if(dbg) pa("Addtolistgl rectbg "+coordsys1);
        if(glList == null) {
            glList = GZZGL.createCallListCoorded(
                "Color "+ColorUtil.colorGLString(Color.green)+" 1\n" +
                "Begin QUAD_STRIP\n"+
                "Vertex 1 1\nVertex 1 -1\n"+
                "Vertex -1 1\nVertex -1 -1\n"+
!               "End\n"
                    );
        }
        curs = glList.addToListGL(win, list, curs, coordsys1, coordsys2);
--- 100,113 ----
          if(dbg) pa("Addtolistgl rectbg "+coordsys1);
        if(glList == null) {
            glList = GZZGL.createCallListCoorded(
+                 "PushAttrib ENABLE_BIT\n"+
+                 "Disable TEXTURE_2D\n"+
                "Color "+ColorUtil.colorGLString(Color.green)+" 1\n" +
                "Begin QUAD_STRIP\n"+
                "Vertex 1 1\nVertex 1 -1\n"+
                "Vertex -1 1\nVertex -1 -1\n"+
!               "End\n"+
!                 "PopAttrib\n"
                    );
        }
        curs = glList.addToListGL(win, list, curs, coordsys1, coordsys2);
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.23 gzz/gzz/vob/TextVob.java:1.24
*** gzz/gzz/vob/TextVob.java:1.23       Mon Sep  9 10:46:58 2002
--- gzz/gzz/vob/TextVob.java    Mon Sep  9 11:06:11 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends Vob implements HBox {
! String rcsid = "$Id: TextVob.java,v 1.23 2002/09/09 14:46:58 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 Vob implements HBox {
! String rcsid = "$Id: TextVob.java,v 1.24 2002/09/09 15:06:11 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 101,107 ****
      private GZZGL.HorizText ht;
      static Vob cl; // Color callList - XXX Should be removed -
                    // color should come from outside.
-     static private Vob xlist;
      public int addToListGL(GraphicsAPI.Window win,
                        int[] list, int curs, int coordsys1,
                                int coordsys2) {
--- 101,106 ----
***************
*** 121,137 ****
        }
        curs = cl.addToListGL(win, list, curs, coordsys1, 0);
        curs = ht.addToListGL(win, list, curs, coordsys1, 0);
-         if(dbg) {
-             if(xlist == null)
-                 xlist = GZZGL.createCallListCoorded(
-               "Color 
"+gzz.util.ColorUtil.colorGLString(java.awt.Color.blue)+" 1\n" +
-               "Begin QUAD_STRIP\n"+
-               "Vertex 1 1\nVertex 1 -1\n"+
-               "Vertex -1 1\nVertex -1 -1\n"+
-               "End\n"
-                   );
-             curs = xlist.addToListGL(win, list, curs, coordsys1, 0);
-         }
        return curs;
      }
  
--- 120,125 ----