[Gzz-commits] gzz ./TODO gfx/libutil/effects.py gzz/gfx/gl/St...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/02 13:30:18

Modified files:
        .              : TODO 
        gfx/libutil    : effects.py 
        gzz/gfx/gl     : Stencil.java 
        gzz/vob/vobs   : RectBgVob.java 
Added files:
        gzz/gfx/gl     : IrregularFrame.java 
        gzz/modules/pp : PPView2.java 
        gzz/util       : Pair.java 
        test/gzz/gfx/gl: irregu.test 

Log message:
        Irregu to java API

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.350&tr2=1.351&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/effects.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/IrregularFrame.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/Pair.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/RectBgVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/irregu.test?rev=1.1

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.350 gzz/TODO:1.351
--- gzz/TODO:1.350      Sat Nov  2 08:17:06 2002
+++ gzz/TODO    Sat Nov  2 13:30:18 2002
@@ -86,8 +86,8 @@
          Note the colors in the table: they're very useful (depends
          only on status).
        + convert older pegs into current format
-       - more about PEG1018 - generalizing VobVanishingClient
-        - rethink interfaces between PlainVanishing and VobScene
+       + more about PEG1018 - generalizing VobVanishingClient
+        + rethink interfaces between PlainVanishing and VobScene
            - learn Box
            - new PEG, UML (learn to generate UML)
            - correct implementation of LollipopCellVobFactor needs
@@ -109,6 +109,7 @@
            - make it work again
                - bindings
                - mouse click coordinates
+           - images
            - CullingCellInBox
            - nadir
            - fix directory geometry
@@ -119,7 +120,7 @@
                - dicing only when needed
                - fill with fading color
            - soft shadows
-       - polygon puzzle view
+       + polygon puzzle view
        - shader for fBm for irregu
        - PP [deadline 5.11]
            - proper enter
Index: gzz/gfx/libutil/effects.py
diff -u gzz/gfx/libutil/effects.py:1.20 gzz/gfx/libutil/effects.py:1.21
--- gzz/gfx/libutil/effects.py:1.20     Sat Nov  2 08:17:06 2002
+++ gzz/gfx/libutil/effects.py  Sat Nov  2 13:30:18 2002
@@ -1,9 +1,9 @@
-from gzz.gfx.gl import GL, GLRen, GLSpans, Paper, GLCache
+from gzz.gfx.gl import GL, GLRen, GLSpans, Paper, GLCache,IrregularFrame
 from gzz.vob.buoy import Buoy3Floater, Buoy4Floater
 import math
 
 
-class IrreguFrame:
+class IrreguFrame(IrregularFrame):
     dicefactor = 0.8
 
     tex = GL.createTexture()
@@ -65,6 +65,9 @@
                self.combiners)
 
 
-       self.content = GLRen.createIrregularQuad(x0, y0, x1, y1, border, 
ripple, 0, code, self.dicefactor)
-       self.frame = GLRen.createIrregularQuad(x0, y0, x1, y1, border, ripple, 
1, code, self.dicefactor)
+       self._content = GLRen.createIrregularQuad(x0, y0, x1, y1, border, 
ripple, 0, code, self.dicefactor)
+       self._frame = GLRen.createIrregularQuad(x0, y0, x1, y1, border, ripple, 
1, code, self.dicefactor)
 
+    def getContent(self): return self._content
+    def getFrame(self): return self._frame
+    def getBlank(self): return self._frame
Index: gzz/gzz/gfx/gl/Stencil.java
diff -u gzz/gzz/gfx/gl/Stencil.java:1.16 gzz/gzz/gfx/gl/Stencil.java:1.17
--- gzz/gzz/gfx/gl/Stencil.java:1.16    Mon Sep 30 04:15:42 2002
+++ gzz/gzz/gfx/gl/Stencil.java Sat Nov  2 13:30:18 2002
@@ -115,7 +115,6 @@
     /** Draw something stenciled 
      * Assumes that stencil buffer is all zeroes when called; leaves
      * it zeroed if contract of drawOverStencil is met.
-     * <b>Warning: due to a bug in NVidia driver, depth test is disabled.
      * </b>
      * @param vs The VobScene to draw into
      * @param drawStencil The routine which causes exactly those
@@ -134,7 +133,7 @@
      *                  will be rendered only in the area OUTSIDE the
      *                  stencil
      * @param drawContents (may be null): the contents of the stencil.
-     * @param needDepth Not used currently, must be false.
+     * @param needDepth Whether depth tests will be used inside the stencil.
      */
     static public void drawStenciled(VobScene vs, 
                Runnable drawStencil,
Index: gzz/gzz/vob/vobs/RectBgVob.java
diff -u gzz/gzz/vob/vobs/RectBgVob.java:1.1 gzz/gzz/vob/vobs/RectBgVob.java:1.2
--- gzz/gzz/vob/vobs/RectBgVob.java:1.1 Fri Nov  1 20:23:46 2002
+++ gzz/gzz/vob/vobs/RectBgVob.java     Sat Nov  2 13:30:18 2002
@@ -40,9 +40,8 @@
  */
 
 public class RectBgVob extends Vob {
-public static final String rcsid = "$Id: RectBgVob.java,v 1.1 2002/11/02 
01:23:46 benja Exp $";
+public static final String rcsid = "$Id: RectBgVob.java,v 1.2 2002/11/02 
18:30:18 tjl 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); }
 
     static Rectangle rect = new Rectangle();