[Gzz-commits] gzz/gfx demo/papertest.py libpaper/papermill.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/04 06:05:21

Modified files:
        gfx/demo       : papertest.py 
        gfx/libpaper   : papermill.py 

Log message:
        Make it possible to disable the first pass

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.17 gzz/gfx/demo/papertest.py:1.18
*** gzz/gfx/demo/papertest.py:1.17      Tue Sep  3 17:15:32 2002
--- gzz/gfx/demo/papertest.py   Wed Sep  4 06:05:21 2002
***************
*** 20,49 ****
  
  rng = java.util.Random()
  
- def setSolidPass(pas, color):
-     pas.setSetupcode("""
-       PushAttrib ENABLE_BIT TEXTURE_BIT
-       Disable REGISTER_COMBINERS_NV
-       Disable TEXTURE_2D
-       Disable BLEND
-       Disable DEPTH_TEST
-       Color %(color)s
-     """ % {
-           "color" : js(color),
-       })
-     pas.setTeardowncode("""
-       PopAttrib
-     """)
- 
- def setDummyPass(pas):
-     pas.setSetupcode("""
-     PushAttrib ENABLE_BIT TEXTURE_BIT
-     Enable BLEND
-     BlendFunc ZERO ONE
-     """)
-     pas.setTeardowncode("PopAttrib")
- 
- 
  def ignore(s):
      return ""
  
--- 20,25 ----
***************
*** 183,189 ****
        print "Seed: ",self.seed," pq ",self.pq
        vs.map.put(self.pq, cs1, cs2)
  
!         putText(vs, cs1, str(self.seed), x=-1, y=-1, w=.0025, h=.0025)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
--- 159,165 ----
        print "Seed: ",self.seed," pq ",self.pq
        vs.map.put(self.pq, cs1, cs2)
  
!         putText(vs, cs1, str(self.seed), color=(0,0,0), x=-1, y=-1, w=.0025, 
h=.0025)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.23 gzz/gfx/libpaper/papermill.py:1.24
*** gzz/gfx/libpaper/papermill.py:1.23  Wed Sep  4 03:37:10 2002
--- gzz/gfx/libpaper/papermill.py       Wed Sep  4 06:05:21 2002
***************
*** 79,85 ****
--- 79,110 ----
  def selectDet(list, type):
      return ( list[type % len(list)], type / len(list) )
  
+ def setSolidPass(pas, color):
+     pas.setSetupcode("""
+       PushAttrib ENABLE_BIT TEXTURE_BIT
+       Disable REGISTER_COMBINERS_NV
+       Disable TEXTURE_2D
+       Disable BLEND
+       Enable DEPTH_TEST
+         DepthFunc LESS
+       Color %(color)s
+     """ % {
+           "color" : js(color),
+       })
+     pas.setTeardowncode("""
+       PopAttrib
+     """)
+ 
+ def setDummyPass(pas):
+     pas.setSetupcode("""
+     PushAttrib ENABLE_BIT TEXTURE_BIT
+     Enable BLEND
+     BlendFunc ZERO ONE
+     """)
+     pas.setTeardowncode("PopAttrib")
+ 
  class ThePaperMill(PaperMill):
+ 
      def getPaper(self, seed, passmask=[1,1,1,1,1,1,1]):
        pap = Paper()
  
***************
*** 102,108 ****
                self.makePaperPass(seeds[i], pap.getPass(i), passes[i]["trans"],
                                          emboss = passes[i]["emboss"])
            else:
!               setDummyPass(pap.getPass(i))
        return pap
        
      def makePaperPass(self, seed, ppass, trans = 0, type = None, emboss = 0):
--- 127,136 ----
                self.makePaperPass(seeds[i], pap.getPass(i), passes[i]["trans"],
                                          emboss = passes[i]["emboss"])
            else:
!                 if i == 0:
!                     setSolidPass(pap.getPass(i), (1,1,1))
!                 else:
!                     setDummyPass(pap.getPass(i))
        return pap
        
      def makePaperPass(self, seed, ppass, trans = 0, type = None, emboss = 0):