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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/12 05:15:24

Modified files:
        .              : TODO 
        gfx/libpaper   : papermill.py 

Log message:
        Add Paper wrapper class in papermill.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.284&tr2=1.285&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.284 gzz/TODO:1.285
*** gzz/TODO:1.284      Sat Oct 12 03:43:39 2002
--- gzz/TODO    Sat Oct 12 05:15:23 2002
***************
*** 15,20 ****
--- 15,21 ----
        + [GI03] a way to hang jython objects on paper objects:
                needed for palettes and color textures.
                Maybe just a wrapper class? Talk to Tjl
+               [jvk: wrapper class added]
        + [GI03] simplify libpaper color space
        + [GI03] think about modeling textures
        + [GI03] libpaper NV2x combined passes
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.43 gzz/gfx/libpaper/papermill.py:1.44
*** gzz/gfx/libpaper/papermill.py:1.43  Fri Oct 11 07:08:42 2002
--- gzz/gfx/libpaper/papermill.py       Sat Oct 12 05:15:24 2002
***************
*** 100,110 ****
      """)
      pas.setTeardowncode("PopAttrib")
  
  class ThePaperMill(PaperMill):
      def getPaper(self, seed, passmask=[1,1,1,1,1,1,1]):
!         reg = Registry()
!         
!         pap = Paper()
  
          passes = [ { "trans" : 0, "emboss" : 0 },
                     { "trans" : .5, "emboss" : 0 },
--- 100,114 ----
      """)
      pas.setTeardowncode("PopAttrib")
  
+ # Wrapper of Java Paper class;
+ # allows arbitrary attributes of paper objects to be set
+ class PaperHanger(Paper):
+     pass
+ 
  class ThePaperMill(PaperMill):
      def getPaper(self, seed, passmask=[1,1,1,1,1,1,1]):
!         pap = PaperHanger()
!         pap.reg = Registry()
  
          passes = [ { "trans" : 0, "emboss" : 0 },
                     { "trans" : .5, "emboss" : 0 },
***************
*** 112,122 ****
                     #{ "trans" : 0, "emboss" : 1 },
                     ]
  
!         rng = java.util.Random(reg.get(regseed, "seed", seed))
          for foo in range(0,20): # eat bad beginning (Java's bad PRNG)
              rng.nextInt()
          seeds = [rng.nextInt(2000000000) for foo in passes]
  
          colors = Colors(rng.nextInt())
          textures = Textures(rng.nextInt())
          rootrep = TexGenXYRepeatUnit(rng)
--- 116,128 ----
                     #{ "trans" : 0, "emboss" : 1 },
                     ]
  
!         rng = java.util.Random(pap.reg.get(regseed, "seed", seed))
          for foo in range(0,20): # eat bad beginning (Java's bad PRNG)
              rng.nextInt()
          seeds = [rng.nextInt(2000000000) for foo in passes]
  
+         # XXX: TODO: these could be passed inside the paper object
+         # (and then the textures, too, would be protected from gc)
          colors = Colors(rng.nextInt())
          textures = Textures(rng.nextInt())
          rootrep = TexGenXYRepeatUnit(rng)
***************
*** 125,131 ****
          
          for i in range(0, len(passes)):
              if passmask[i]:
!                 passreg = reg.sub("pass"+str(i))
                  passreg.get(regseed, "seed", seeds[i])
                  self.makePaperPass(passreg,
                                     pap.getPass(i), colors, textures, rootrep,
--- 131,137 ----
          
          for i in range(0, len(passes)):
              if passmask[i]:
!                 passreg = pap.reg.sub("pass"+str(i))
                  passreg.get(regseed, "seed", seeds[i])
                  self.makePaperPass(passreg,
                                     pap.getPass(i), colors, textures, rootrep,
***************
*** 137,143 ****
                  else:
                      setDummyPass(pap.getPass(i))
  
!         if dbg: reg.dump()
          return pap
          
      def makePaperPass(self, reg, ppass, colors, textures, rootrep, trans = 0, 
type = None, emboss = 0):
--- 143,149 ----
                  else:
                      setDummyPass(pap.getPass(i))
  
!         if dbg: pap.reg.dump()
          return pap
          
      def makePaperPass(self, reg, ppass, colors, textures, rootrep, trans = 0, 
type = None, emboss = 0):