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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/20 10:29:22

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

Log message:
        Start using paper params registry

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/params.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.25 gzz/gfx/libpaper/papermill.py:1.26
*** gzz/gfx/libpaper/papermill.py:1.25  Fri Sep 20 09:04:36 2002
--- gzz/gfx/libpaper/papermill.py       Fri Sep 20 10:29:22 2002
***************
*** 105,112 ****
--- 105,115 ----
      pas.setTeardowncode("PopAttrib")
  
  class ThePaperMill(PaperMill):
+     initialize()
  
      def getPaper(self, seed, passmask=[1,1,1,1,1,1,1]):
+         reg = Registry()
+         
        pap = Paper()
  
        passes = [ { "trans" : 0, "emboss" : 0 },
***************
*** 114,121 ****
                   { "trans" : .9375, "emboss" : 0 },
                   #{ "trans" : 0, "emboss" : 1 },
                   ]
!       
!       rng = java.util.Random(seed)
        for foo in range(0,20): # eat bad beginning (Java's bad PRNG)
            rng.nextInt()
        seeds = [rng.nextInt(2000000000) for foo in passes]
--- 117,124 ----
                   { "trans" : .9375, "emboss" : 0 },
                   #{ "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]
***************
*** 125,141 ****
        
        for i in range(0, len(passes)):
            if passmask[i]:
!               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):
!       initialize()
        rnd = java.util.Random(seed)
        colors = Colors(rnd.nextInt())
        #sh = ShaderPass(selectRandom(shaderTypes,rnd))
--- 128,149 ----
        
        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), passes[i]["trans"],
!                                    emboss = passes[i]["emboss"])
            else:
                  if i == 0:
                      setSolidPass(pap.getPass(i), (1,1,1))
                  else:
                      setDummyPass(pap.getPass(i))
+ 
+         if dbg: reg.dump()
        return pap
        
!     def makePaperPass(self, reg, ppass, trans = 0, type = None, emboss = 0):
!         seed = reg.get(regseed, "seed")
        rnd = java.util.Random(seed)
        colors = Colors(rnd.nextInt())
        #sh = ShaderPass(selectRandom(shaderTypes,rnd))
Index: gzz/gfx/libpaper/params.py
diff -c gzz/gfx/libpaper/params.py:1.1 gzz/gfx/libpaper/params.py:1.2
*** gzz/gfx/libpaper/params.py:1.1      Fri Sep 20 09:04:36 2002
--- gzz/gfx/libpaper/params.py  Fri Sep 20 10:29:22 2002
***************
*** 12,21 ****
  
  regcolor = RegTuple(3)
  
! class RegSeed:
      pass
  
! regseed = RegSeed()
  
  class Registry:
      def __init__(self):
--- 12,21 ----
  
  regcolor = RegTuple(3)
  
! class RegInt:
      pass
  
! regseed = RegInt()
  
  class Registry:
      def __init__(self):
***************
*** 24,30 ****
      def sub(self, name):
          return self.get("sub", name, Registry())
  
!     def get(self, type, name, default):
          key = (name, type)
          if not self.vars.has_key(key):
              self.vars[key] = default
--- 24,35 ----
      def sub(self, name):
          return self.get("sub", name, Registry())
  
!     def set(self, type, name, val):
!         key = (name, type)
!         self.vars[key] = val
!         return val
! 
!     def get(self, type, name, default = None):
          key = (name, type)
          if not self.vars.has_key(key):
              self.vars[key] = default
***************
*** 45,61 ****
  from java.util import Random
  
  def getcolor(seed, foo, name):
-     rng = Random(foo.get(regseed, name, seed))
- 
      bar = foo.sub(name)
      r = bar.get(regfloat, "R", rng.nextFloat())
      g = bar.get(regfloat, "G", rng.nextFloat())
      b = bar.get(regfloat, "B", rng.nextFloat())
  
      return foo.get(regcolor, name, (r,g,b))
  
- foo = Registry()
  
  
  rng = Random()
  
--- 50,66 ----
  from java.util import Random
  
  def getcolor(seed, foo, name):
      bar = foo.sub(name)
+ 
+     rng = Random(bar.get(regseed, "seed", seed))
      r = bar.get(regfloat, "R", rng.nextFloat())
      g = bar.get(regfloat, "G", rng.nextFloat())
      b = bar.get(regfloat, "B", rng.nextFloat())
  
      return foo.get(regcolor, name, (r,g,b))
  
  
+ foo = Registry()
  
  rng = Random()