[Gzz-commits] gzz/gzz view/LollipopCellView.java vob/vobs/Ova...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/11/18 10:40:49

Modified files:
        gzz/view       : LollipopCellView.java 
        gzz/vob/vobs   : OvalBgVob.java 

Log message:
        opengl-update

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LollipopCellView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/OvalBgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/view/LollipopCellView.java
diff -u gzz/gzz/view/LollipopCellView.java:1.1 
gzz/gzz/view/LollipopCellView.java:1.2
--- gzz/gzz/view/LollipopCellView.java:1.1      Mon Nov 18 05:28:16 2002
+++ gzz/gzz/view/LollipopCellView.java  Mon Nov 18 10:40:49 2002
@@ -38,7 +38,7 @@
 /** A factory for making ball-and-stick aka lollipop cell vobs. */
 
 public class LollipopCellView extends BoxCellView {
-public static final String rcsid = "$Id: LollipopCellView.java,v 1.1 
2002/11/18 10:28:16 humppake Exp $";
+public static final String rcsid = "$Id: LollipopCellView.java,v 1.2 
2002/11/18 15:40:49 humppake Exp $";
     float[] boxwh = new float[2];
 
     /** Add the vobs that make up an image of a cell 
@@ -117,24 +117,8 @@
                                          0, 0, diameter, diameter,
                                          diameter, diameter);
 
-       if(!(GraphicsAPI.getInstance() instanceof gzz.client.gl.GLAPI)) {
-           ccv.place(c, vs, contentBox, context);
-            vs.map.put(bg, ballBox);
-       } else {
-            vs.map.put(bg, ballBox);
-           gzz.gfx.gl.Stencil.drawStenciled(
-               vs,
-               new Runnable() { public void run() {
-                    vs.map.put(bg, ballBox);
-               }},
-               null,
-               null,
-               new Runnable() { public void run() {
-                   ccv.place(c, vs, contentBox, context);
-               }},
-               false
-           );
-       }
+       ccv.place(c, vs, contentBox, context);
+       vs.map.put(bg, ballBox);
     }
 }
 
Index: gzz/gzz/vob/vobs/OvalBgVob.java
diff -u gzz/gzz/vob/vobs/OvalBgVob.java:1.2 gzz/gzz/vob/vobs/OvalBgVob.java:1.3
--- gzz/gzz/vob/vobs/OvalBgVob.java:1.2 Fri Nov 15 03:52:34 2002
+++ gzz/gzz/vob/vobs/OvalBgVob.java     Mon Nov 18 10:40:49 2002
@@ -41,7 +41,7 @@
  */
 
 public class OvalBgVob extends Vob {
-public static final String rcsid = "$Id: OvalBgVob.java,v 1.2 2002/11/15 
08:52:34 humppake Exp $";
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.3 2002/11/18 
15:40:49 humppake 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); }
@@ -52,7 +52,7 @@
     static protected boolean texLoaded = false;
     static protected void loadTex() {
        if (!texLoaded) {
-           String[] texparam = {"line_width", "2.0"};
+           String[] texparam = {"line_width", "1"};
            tex = GL.createTexture(); 
            tex.shade_all_levels(512, 512, 0, 4, "RGBA", "RGBA", "circle", 
texparam);
            texLoaded = true;
@@ -148,12 +148,13 @@
            }
                    
            glList = GLRen.createCallListCoorded(
-               "PushAttrib ENABLE_BIT\n"+
+               "PushAttrib CURRENT_BIT ENABLE_BIT\n"+
                "BindTexture TEXTURE_2D "+tex.getTexId()+"\n"+
-               "TexParameter TEXTURE_2D TEXTURE_MIN_FILTER 
LINEAR_MIPMAP_NEAREST\n"+
+               "TexParameter TEXTURE_2D TEXTURE_MIN_FILTER 
LINEAR_MIPMAP_LINEAR\n"+
                "TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR\n"+
-               "Enable BLEND\n"+
-               "BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA\n"+
+                "TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 1\n"+
+                       "Enable BLEND\n"+
+                       "BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA\n"+
                "Enable TEXTURE_2D\n"+
                bgcall +
                "PopAttrib\n"