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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/08 11:12:29

Modified files:
        gfx/demo       : gldemo.py papertest.py psyko2.py 
        gfx/demo/opengl: glinfo.py 
        gfx/libpaper   : textures.py 

Log message:
        Fix gldemos to get approximately the same font scaling as before; 
glinfo now even adjusts to the screen size (assuming that nobody has more 
extensions that geforce4...)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.39 gzz/gfx/demo/gldemo.py:1.40
*** gzz/gfx/demo/gldemo.py:1.39 Tue Oct  8 08:34:13 2002
--- gzz/gfx/demo/gldemo.py      Tue Oct  8 11:12:29 2002
***************
*** 106,114 ****
      global textstyle
      if not textstyle:
        textstyle = GLTextStyle.create("sans", 0, 1)
!     return TextVob(textstyle, text, 0)
  
! def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 0, h = 10):
      if color != None:    
          putnoc(vs, getDListNocoords("Color " + js(color)))
      putnoc(vs, getDListNocoords("""
--- 106,114 ----
      global textstyle
      if not textstyle:
        textstyle = GLTextStyle.create("sans", 0, 1)
!     return TextVob(textstyle, text, 1)
  
! def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 0, h = 1, key = 
None):
      if color != None:    
          putnoc(vs, getDListNocoords("Color " + js(color)))
      putnoc(vs, getDListNocoords("""
***************
*** 123,129 ****
      t = getText(text)
  
      cs = vs.coords.coordsys(cs1, z, x, y-h, h, h)
!     vs.matcher.addSub(cs1, cs, str(text))
  
      vs.map.put(t, cs)
      
--- 123,129 ----
      t = getText(text)
  
      cs = vs.coords.coordsys(cs1, z, x, y-h, h, h)
!     vs.matcher.addSub(cs1, cs, key or str(text))
  
      vs.map.put(t, cs)
      
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.8 gzz/gfx/demo/opengl/glinfo.py:1.9
*** gzz/gfx/demo/opengl/glinfo.py:1.8   Tue Oct  8 08:34:13 2002
--- gzz/gfx/demo/opengl/glinfo.py       Tue Oct  8 11:12:29 2002
***************
*** 11,17 ****
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!       cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, 40, 0, 0, 40)
          vs.matcher.add(cs1, "1")
  
          vendor = GL.getGLString("VENDOR")
--- 11,22 ----
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
!         size = vs.getSize()
! 
!         colchars = 60
!         scale = min(size.width*1.0, size.height*4.0/3) / colchars
! 
!       cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, scale, 0, 0, scale)
          vs.matcher.add(cs1, "1")
  
          vendor = GL.getGLString("VENDOR")
***************
*** 114,148 ****
  
              ]]
                     
! 
!         putText(vs, cs1, vendor, color=(0,0,0), h=.8, y = 1)
!         putText(vs, cs1, renderer, color=(0,0,0), h=.8, y = 2)
!         putText(vs, cs1, version, color=(0,0,0), h=.8, y = 3)
  
          foo = params
          i = 0
!         rows = 3
!         lines = (len(foo)+rows-1) / rows
!         for x in range(0, rows):
              for y in range(0, lines):
                  if i >= len(foo): break
                  
!                 putText(vs, cs1, foo[i], color=(0,0,0), h=.32,
!                         x=x*(1200./40/rows), y=y*.5+4)
                  i += 1
  
  
  
          foo = extensions.split();
          i = 0
!         rows = 4
!         lines = (len(foo)+rows-1) / rows
!         for x in range(0, rows):
              for y in range(0, lines):
                  if i >= len(foo): break
                  
!                 putText(vs, cs1, foo[i], color=(0,0,0), h=.32,
!                         x=x*(1200./40/rows), y=y*.5+14)
                  i += 1
  
        return vs
--- 119,153 ----
  
              ]]
                     
!         # double size text
!         putText(vs, cs1, vendor, color=(0,0,0), h=2, y = 2)
!         putText(vs, cs1, renderer, color=(0,0,0), h=2, y = 4)
!         putText(vs, cs1, version, color=(0,0,0), h=2, y = 6)
  
          foo = params
          i = 0
!         cols = 3
!         lines = (len(foo)+cols-1) / cols
!         for x in range(0, cols):
              for y in range(0, lines):
                  if i >= len(foo): break
                  
!                 putText(vs, cs1, foo[i], color=(0,0,0), h=1,
!                         x=x*(colchars/cols), y=y+8)
                  i += 1
  
  
  
          foo = extensions.split();
          i = 0
!         cols = 4
!         lines = (len(foo)+cols-1) / cols
!         for x in range(0, cols):
              for y in range(0, lines):
                  if i >= len(foo): break
                  
!                 putText(vs, cs1, foo[i], color=(0,0,0), h=1,
!                         x=x*(colchars/cols), y=y+28)
                  i += 1
  
        return vs
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.38 gzz/gfx/demo/papertest.py:1.39
*** gzz/gfx/demo/papertest.py:1.38      Tue Oct  8 09:26:19 2002
--- gzz/gfx/demo/papertest.py   Tue Oct  8 11:12:29 2002
***************
*** 89,99 ****
  
  passmask = [1,1,1,1]
  
! def getpaper(seed):
      pap = ThePaperMill().getPaper(seed, 
        passmask=passmask)
      #print "Pq: ",seed
!     return GLRen.createPaperQuad(pap, -1, -1, 1, 1, 0)
  
  class PaperScene:
      def __init__(self):
--- 89,99 ----
  
  passmask = [1,1,1,1]
  
! def getpaper(seed, w = 1):
      pap = ThePaperMill().getPaper(seed, 
        passmask=passmask)
      #print "Pq: ",seed
!     return GLRen.createPaperQuad(pap, -w, -1, +w, 1, 0)
  
  class PaperScene:
      def __init__(self):
***************
*** 118,124 ****
        self.pq = None
  
      def initpaper(self):
!         self.pq = getpaper(self.seed)
  
      def key(self, k):
          oldseed = self.seed
--- 118,124 ----
        self.pq = None
  
      def initpaper(self):
!         self.pq = getpaper(self.seed, w = 700.0/450)
  
      def key(self, k):
          oldseed = self.seed
***************
*** 163,171 ****
  
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
!       cs1 = vs.coords.affineCoordsys(0, 10, 700, 500, 700, 0, 0, 450)
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale / 700, 0, 0, scale / 
450)
  
        vs.matcher.add(cs1, "1")
        vs.matcher.add(cs2, "2")
--- 163,171 ----
  
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
!       cs1 = vs.coords.affineCoordsys(0, 10, 700, 500, 450, 0, 0, 450)
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale / 450, 0, 0, scale / 
450)
  
        vs.matcher.add(cs1, "1")
        vs.matcher.add(cs2, "2")
***************
*** 173,182 ****
        pscale = zoom[0]
  
  
!       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, h=.08)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
--- 173,182 ----
        pscale = zoom[0]
  
  
!       #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=-700/450.0, y=-1, 
h=.2)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
***************
*** 270,276 ****
              vs.matcher.add(cs1[i], str(i))
              
              vs.map.put(self.pq[i], cs1[i], cs2)
!             putText(vs, cs1[i], str(self.seed + i), color=(0,0,0), 
x=-1,y=1,z=-1, h=.32)
  
          dobenchmark(w, vs)
  
--- 270,276 ----
              vs.matcher.add(cs1[i], str(i))
              
              vs.map.put(self.pq[i], cs1[i], cs2)
!             putText(vs, cs1[i], str(self.seed + i), color=(0,0,0), 
x=-1,y=1,z=-1, h=.5, key=str(i))
  
          dobenchmark(w, vs)
  
***************
*** 321,327 ****
        cs1 = vs.coords.affineCoordsys(0, 10, 600, 500, 450, 0, 0, 450)
        vs.matcher.add(cs1, "1")
  
!         putText(vs, cs1, "F1, F2", color=(0,0,0), h=.16)
  
  
  
--- 321,327 ----
        cs1 = vs.coords.affineCoordsys(0, 10, 600, 500, 450, 0, 0, 450)
        vs.matcher.add(cs1, "1")
  
!         putText(vs, cs1, "F1, F2", color=(0,0,0), h=.25)
  
  
  
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.13 gzz/gfx/demo/psyko2.py:1.14
*** gzz/gfx/demo/psyko2.py:1.13 Tue Oct  8 08:34:13 2002
--- gzz/gfx/demo/psyko2.py      Tue Oct  8 11:12:29 2002
***************
*** 322,329 ****
              
              cs1 = vs.coords.affineCoordsys(0, 5, 350, 350, 1, 0, 0, 1)
              vs.matcher.add(cs1, "msg")
!             putText(vs, cs1, msg, color=(0,0,0),h=100,x=100)
!             putText(vs, cs1, msg2, color=(0,0,0),h=100, y=400)
              #self.prepareNextTrial()
              
        return vs
--- 322,329 ----
              
              cs1 = vs.coords.affineCoordsys(0, 5, 350, 350, 1, 0, 0, 1)
              vs.matcher.add(cs1, "msg")
!             putText(vs, cs1, msg, color=(0,0,0),h=150,x=100)
!             putText(vs, cs1, msg2, color=(0,0,0),h=150, y=400)
              #self.prepareNextTrial()
              
        return vs
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.17 gzz/gfx/libpaper/textures.py:1.18
*** gzz/gfx/libpaper/textures.py:1.17   Tue Oct  8 06:29:52 2002
--- gzz/gfx/libpaper/textures.py        Tue Oct  8 11:12:29 2002
***************
*** 135,141 ****
          print "Warning: null probability event occured"
          return ptextures[type][-1]
          
!         
  
  if 0:
              rgbTextures = [
--- 135,143 ----
          print "Warning: null probability event occured"
          return ptextures[type][-1]
          
! 
!     def getPaperTextures(self, types, gen):
!         return [ self.getPaperTexture(type, gen) for type in types ]
  
  if 0:
              rgbTextures = [