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

[Janne V. Kujala]

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

Modified files:
        gfx/demo       : papertest.py 

Log message:
        Make zooms global

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.19 gzz/gfx/demo/papertest.py:1.20
*** gzz/gfx/demo/papertest.py:1.19      Wed Sep  4 06:46:41 2002
--- gzz/gfx/demo/papertest.py   Fri Sep  6 05:21:33 2002
***************
*** 53,58 ****
--- 53,63 ----
      if k == "d":
          global dbg
          dbg = not dbg
+     if k == "z":
+         rotatelist(zoom)
+     if k == "x":
+         rotatelist(paperzoom)
+ 
  
  def dobenchmark(w, vs):
      global benchmark
***************
*** 62,67 ****
--- 67,76 ----
          t = w.timeRender(vs, iters)
          print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Time of", iters, "renders:", 
t, "s"
  
+ 
+ zoom = [100, 500, 650, 800, 2000]
+ paperzoom = [0.2, 1, 3, 0.05]
+ 
  passmask = [1,1,1,1]
  
  def getpaper(seed):
***************
*** 92,100 ****
        self.aniso = 0
        self.reinit = 0
  
-       self.zoom = [100, 500, 650, 800, 2000]
-       self.paperzoom = [0.05, 0.2, 1, 3]
- 
          self.seed = 0
        self.pq = None
  
--- 101,106 ----
***************
*** 121,131 ****
            self.vec = (x, y, 1-x-y)
            self.t += 0.15
            self.initpaper()
-       if k == "z":
-           rotatelist(self.zoom)
-       if k == "x":
-           rotatelist(self.paperzoom)
-           AbstractUpdateManager.setNoAnimation()
  
          if oldseed != self.seed:
            self.pq = None
--- 127,132 ----
***************
*** 150,159 ****
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 700, 500, 700, 0, 0, 450)
!       scale = self.zoom[0] / self.paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, "2", 1, 400, 400, scale, 0, 0, scale)
  
!       pscale = self.zoom[0]
  
  
        print "Seed: ",self.seed," pq ",self.pq
--- 151,160 ----
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 700, 500, 700, 0, 0, 450)
!       scale = zoom[0] / paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, "2", 1, 400, 400, scale, 0, 0, scale)
  
!       pscale = zoom[0]
  
  
        print "Seed: ",self.seed," pq ",self.pq
***************
*** 188,195 ****
  class MultiPaperScene:
      def __init__(self):
        self.bgcolor = (0.7, 0.8, 0.6)
-       self.zoom = [100, 500, 650, 800, 2000]
-       self.paperzoom = [0.05, 0.2, 1, 3]
          self.w = 4
          self.h = 3
          self.seed = 0
--- 189,194 ----
***************
*** 206,221 ****
            self.initpaper()
            AbstractUpdateManager.setNoAnimation()
            AbstractUpdateManager.chg()
-       if k == "z":
-           rotatelist(self.zoom)
-       if k == "x":
-           rotatelist(self.paperzoom)
-           AbstractUpdateManager.setNoAnimation()
  
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!       scale = self.zoom[0] / self.paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, "tex", 1, 400, 400, scale, 0, 0, 
scale)
  
          cs1 = range(0,self.w*self.h)
--- 205,215 ----
            self.initpaper()
            AbstractUpdateManager.setNoAnimation()
            AbstractUpdateManager.chg()
  
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!       scale = zoom[0] / paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, "tex", 1, 400, 400, scale, 0, 0, 
scale)
  
          cs1 = range(0,self.w*self.h)