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

[Janne V. Kujala]

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

Modified files:
        gfx/demo       : psyko2.py 

Log message:
        Fix coordinate systems

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

Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.9 gzz/gfx/demo/psyko2.py:1.10
*** gzz/gfx/demo/psyko2.py:1.9  Wed Oct  2 08:23:48 2002
--- gzz/gfx/demo/psyko2.py      Wed Oct  2 09:19:01 2002
***************
*** 4,9 ****
--- 4,13 ----
  
  from random import shuffle
  
+ from gfx.libpaper.papermill import ThePaperMill
+ 
+ 
+ 
  # A jython test program for papers
  # Load using gldemo.py
  
***************
*** 112,120 ****
      pap = ThePaperMill().getPaper(seed)
      return GLRen.createPaperQuad(pap, -1, -1, 1, 1, 0)
  
- execfile("gfx/libpaper/papermill.py")
- 
- 
  next_toid = 1
  
  # Request scene.timeout to be called after 'delay' ms
--- 116,121 ----
***************
*** 186,192 ****
        cs1 = vs.coords.affineCoordsys(0, 10, 800, 600, 800, 0, 0, 600)
          vs.matcher.add(cs1, "1")
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, 800/scale, 0, 0, 600/scale)
          vs.matcher.add(cs2, "tex")
  
        pscale = zoom[0]
--- 187,193 ----
        cs1 = vs.coords.affineCoordsys(0, 10, 800, 600, 800, 0, 0, 600)
          vs.matcher.add(cs1, "1")
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/800, 0, 0, scale/600)
          vs.matcher.add(cs2, "tex")
  
        pscale = zoom[0]
***************
*** 378,387 ****
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!       cs1 = vs.coords.affineCoordsys(0, 10, 100, 450, 1, 0, 0, 1)
          vs.matcher.add(cs1, "txt")
!         putText(vs, cs1, "Press 'F1' to start", color=(0,1,0))
!         putText(vs, cs1, "seed = " + str(self.seed), color=(0,1,0), y = 100)
  
          if self.pq != None:
              cs1 = vs.coords.affineCoordsys(0, 10, 800, 450, 390, 0, 0, 390)
--- 379,388 ----
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!       cs1 = vs.coords.affineCoordsys(0, 5, 100, 450, 1, 0, 0, 1)
          vs.matcher.add(cs1, "txt")
!         putText(vs, cs1, "Press 'F1' to start", color=(0,.75,0))
!         putText(vs, cs1, "seed = " + str(self.seed), color=(0,.75,0), y = 100)
  
          if self.pq != None:
              cs1 = vs.coords.affineCoordsys(0, 10, 800, 450, 390, 0, 0, 390)
***************
*** 401,407 ****
          if k >= "0" and k <= "9":
              if self.seed == None: self.seed = 0
              self.seed = self.seed * 10 + int(k)
!         if k == "BackSpace":
              if self.seed == 0: self.seed = None
              if self.seed != None:
                  self.seed = self.seed / 10
--- 402,408 ----
          if k >= "0" and k <= "9":
              if self.seed == None: self.seed = 0
              self.seed = self.seed * 10 + int(k)
!         if k == "BackSpace" or k == "Backspace":
              if self.seed == 0: self.seed = None
              if self.seed != None:
                  self.seed = self.seed / 10