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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/08/30 04:53:27

Modified files:
        gfx/demo       : papertest.py texturelab.py 

Log message:
        API change consequences

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texturelab.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.12 gzz/gfx/demo/papertest.py:1.13
*** gzz/gfx/demo/papertest.py:1.12      Fri Aug 23 11:11:09 2002
--- gzz/gfx/demo/papertest.py   Fri Aug 30 04:53:27 2002
***************
*** 194,202 ****
              AbstractUpdateManager.chg()
  
            
!     def scene(self):
!       d = w.getSize()
!       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
  
        #putnoc(vs, getDList("""
--- 194,200 ----
              AbstractUpdateManager.chg()
  
            
!     def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
        #putnoc(vs, getDList("""
***************
*** 246,252 ****
        #"""))
  
          dobenchmark(w, vs)
-         return vs
          
  class MultiPaperScene:
      def __init__(self):
--- 244,249 ----
***************
*** 361,369 ****
            rotatelist(self.paperzoom)
            AbstractUpdateManager.setNoAnimation()
  
!     def scene(self):
!       d = w.getSize()
!       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
  
        scale = self.zoom[0] / self.paperzoom[0]
--- 358,364 ----
            rotatelist(self.paperzoom)
            AbstractUpdateManager.setNoAnimation()
  
!     def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
        scale = self.zoom[0] / self.paperzoom[0]
***************
*** 382,388 ****
              putText(vs, cs1[i], str(self.seed + i), color=(0,0,0), 
x=-1,y=1,z=-1,w=.01, h=.01)
  
          dobenchmark(w, vs)
-       return vs
  
  
  font = None
--- 377,382 ----
***************
*** 420,435 ****
          getpaper(0)
      def key(self, k):
          pass
!     def scene(self):
!         d = w.getSize()
!       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 600, 500, 450, 0, 0, 450)
  
          putText(vs, cs1, "F1, F2", color=(0,0,0), w=.005, h=.005)
- 
-       return vs
  
  
  
--- 414,425 ----
          getpaper(0)
      def key(self, k):
          pass
!     def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 600, 500, 450, 0, 0, 450)
  
          putText(vs, cs1, "F1, F2", color=(0,0,0), w=.005, h=.005)
  
  
  
Index: gzz/gfx/demo/texturelab.py
diff -c gzz/gfx/demo/texturelab.py:1.1 gzz/gfx/demo/texturelab.py:1.2
*** gzz/gfx/demo/texturelab.py:1.1      Fri Aug 30 04:34:07 2002
--- gzz/gfx/demo/texturelab.py  Fri Aug 30 04:53:27 2002
***************
*** 11,20 ****
  def rotate(list):
      list.append(list.pop(0))
  
- if not locals().has_key("textures"):
-     textures = []
-     textures.append(GZZGL.createTexture())
-     textures.append(GZZGL.createTexture())
  
  class ShaderScene:
      def __init__(self):
--- 11,16 ----
***************
*** 25,35 ****
--- 21,33 ----
            "bulgemagx": 0,
            "lfreq": 2,
            "hfreq": 10,
+           "bias": 0.5,
        }
        self.colors = [ (1, 1, 1), (1, 0, 0), (0, 1, 0), (0, 0, 1)]
        self.shadercomps = 3
        self.shaderformat = "RGB"
        self.internalformat = "RGB"
+       self.shade()
      def key(self, k):
        if k == "s":
            self.shade()
***************
*** 41,55 ****
        for item in self.shaderparams.items():
            params.append(item[0])
            params.append(str(item[1]))
!       res = textures[0].shade(
!           self.resolution[0], self.resolution[0], 0,
            self.shadercomps, self.shaderformat, self.internalformat, 
            self.shadername,
            params)
!       print "SHADER: ",res
!     def scene(self):
!       d = w.getSize()
!       vs = gfxapi.createVobScene(d)
  
        putnoc(vs, background((0.5,0.5,0.5)))
  
--- 39,50 ----
        for item in self.shaderparams.items():
            params.append(item[0])
            params.append(str(item[1]))
!       self.texture = getTexture( self.resolution[0], self.resolution[0], 0,
            self.shadercomps, self.shaderformat, self.internalformat, 
            self.shadername,
            params)
!       print "SHADER: ",self.texture
!     def scene(self, vs):
  
        putnoc(vs, background((0.5,0.5,0.5)))
  
***************
*** 77,83 ****
                    Vertex -1 -1
                End
            """ % {
!               "tex" : textures[0].getTexId(),
                "color" : js(self.colors[0]),
                }),
            "v", 10, 0, 0, 900, 900)
--- 72,78 ----
                    Vertex -1 -1
                End
            """ % {
!               "tex" : self.texture.getTexId(),
                "color" : js(self.colors[0]),
                }),
            "v", 10, 0, 0, 900, 900)