[Gzz-commits] gzz gfx/demo/irregularframe.py gzz/gfx/gl/Stenc...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/11 02:35:14

Modified files:
        gfx/demo       : irregularframe.py 
        gzz/gfx/gl     : Stencil.java 

Log message:
        Add papers to the background

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregularframe.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregularframe.py
diff -c gzz/gfx/demo/irregularframe.py:1.2 gzz/gfx/demo/irregularframe.py:1.3
*** gzz/gfx/demo/irregularframe.py:1.2  Wed Sep 11 02:18:01 2002
--- gzz/gfx/demo/irregularframe.py      Wed Sep 11 02:35:14 2002
***************
*** 38,56 ****
        StencilMask 0
      """)
  
  class IrreguScene:
      def key(self, key):
        pass
      def scene(self, vs):
        putnoc(vs, background((0.1,0.4,0.5)))
  
!       for i in range(0,2):
  
            rs = 10
            ro = 50
            sz = 10 + 200 * du()
            pl = 1000 
!           stencs = vs.coords.affineCoordsys(0, "STM",
                10, pl*du(), pl*du(), sz+rs*ds(), rs*ds(), rs*ds(), sz+rs*ds())
            
            class simplemask(Runnable):
--- 38,69 ----
        StencilMask 0
      """)
  
+ execfile("gfx/libpaper/papermill.py")
+ papermill = ThePaperMill()
+ 
  class IrreguScene:
+     def __init__(self):
+       self.range = range(0,5)
+       self.pq = [
+           GZZGL.createPaperQuad(papermill.getPaper(seed), -1, -1.3, 1, 1.3)
+               for seed in self.range
+       ]
+ 
      def key(self, key):
        pass
      def scene(self, vs):
        putnoc(vs, background((0.1,0.4,0.5)))
  
!       pcs = vs.coords.affineCoordsys(0, "P",
!           20, 0, 0, 200, 0,0, 200)
! 
!       for i in self.range:
  
            rs = 10
            ro = 50
            sz = 10 + 200 * du()
            pl = 1000 
!           stencs = vs.coords.affineCoordsys(0, "STM%s"%i,
                10, pl*du(), pl*du(), sz+rs*ds(), rs*ds(), rs*ds(), sz+rs*ds())
            
            class simplemask(Runnable):
***************
*** 128,135 ****
                    simplemask().run()
                    putnoc(vs, getDListNocoords("Translate 0 2 0\nColor 1 1 
1\n"))
  
!           Stencil.drawStenciled(vs, simplemask(), None, outside(), None, 0)
  
-           vs.dump()
  
  currentScene = IrreguScene()
--- 141,156 ----
                    simplemask().run()
                    putnoc(vs, getDListNocoords("Translate 0 2 0\nColor 1 1 
1\n"))
  
!           pq = self.pq[i]
!           class contents(Runnable):
!               def run(self):
!                   vs.map.put(getDListNocoords("""
!                       Enable TEXTURE_2D
!                   """))
!                   vs.map.put(pq, stencs, pcs)
! 
!           Stencil.drawStenciled(vs, simplemask(), None, outside(), 
!               contents(), 0)
  
  
  currentScene = IrreguScene()
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.8 gzz/gzz/gfx/gl/Stencil.java:1.9
*** gzz/gzz/gfx/gl/Stencil.java:1.8     Wed Sep 11 02:18:01 2002
--- gzz/gzz/gfx/gl/Stencil.java Wed Sep 11 02:35:14 2002
***************
*** 87,92 ****
--- 87,96 ----
       * @param drawStencil The routine which causes exactly those
       *                        fragments to be drawn that need to be in the
       *                        stencil.
+      *                        The colormask is set to zero so the fragments
+      *                        won't be drawn into the framebuffer; XXX do we
+      *                        need more API for this? Is it possible to want
+      *                        them to be drawn?
       * @param drawOverStencil (may be null): the routine to draw 
       *                  at least those fragments in the stencil and
       *                  possibly more: e.g. if drawStencil uses
***************
*** 96,101 ****
--- 100,106 ----
       *                  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.
       */
      static public void drawStenciled(VobScene vs, 
                Runnable drawStencil,