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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/04 18:06:00

Modified files:
        gfx/demo       : fillets.py gldemo.py testtimeout.py 
        gfx/demo/color : colors.py 

Log message:
        GL demo fixes, now that I can run 'em ;-)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fillets.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/testtimeout.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/color/colors.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/color/colors.py
diff -c gzz/gfx/demo/color/colors.py:1.1 gzz/gfx/demo/color/colors.py:1.2
*** gzz/gfx/demo/color/colors.py:1.1    Mon Aug 12 07:22:34 2002
--- gzz/gfx/demo/color/colors.py        Wed Sep  4 18:06:00 2002
***************
*** 34,40 ****
        return hsb[2] * (1-hsb[1])
      
      return (func(angle), func(angle + 1/3.0), func(angle + 2/3.0))
!     
  
  class ColorScene:
      def __init__(self):
--- 34,40 ----
        return hsb[2] * (1-hsb[1])
      
      return (func(angle), func(angle + 1/3.0), func(angle + 2/3.0))
! 
  
  class ColorScene:
      def __init__(self):
***************
*** 94,100 ****
        return self.hslhexes[b]
      def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background((0.5,0.5,0.5)))
  
        putnoc(vs, getDList("""
--- 94,99 ----
***************
*** 175,181 ****
              if getL(self.colors[2])-getL(self.colors[0]) < ld: continue
              if getL(self.colors[3])-getL(self.colors[1]) < ld: continue
              break
!         
          self.dlt = """
              PushMatrix
              Translate -2.15 1.1 0
--- 174,180 ----
              if getL(self.colors[2])-getL(self.colors[0]) < ld: continue
              if getL(self.colors[3])-getL(self.colors[1]) < ld: continue
              break
! 
          self.dlt = """
              PushMatrix
              Translate -2.15 1.1 0
***************
*** 211,219 ****
        self.dlt += """
            End
        """
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background((1.0,1.0,1.0)))
  
        putnoc(vs, getDList("""
--- 210,217 ----
        self.dlt += """
            End
        """
!     def scene(self, vs):
        d = w.getSize()
        putnoc(vs, background((1.0,1.0,1.0)))
  
        putnoc(vs, getDList("""
***************
*** 224,230 ****
            Disable TEXTURE_2D
            Color 1 0.1 1
        """))
!         
        vs.put(getDList(self.dlt), "cp", 10, 100, 300, 200, 200);
  
        dsiz = 200
--- 222,228 ----
            Disable TEXTURE_2D
            Color 1 0.1 1
        """))
! 
        vs.put(getDList(self.dlt), "cp", 10, 100, 300, 200, 200);
  
        dsiz = 200
***************
*** 294,300 ****
            self.recolor()
      def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background((0.5,0.5,0.5)))
  
        putnoc(vs, getDList("""
--- 292,297 ----
Index: gzz/gfx/demo/fillets.py
diff -c gzz/gfx/demo/fillets.py:1.2 gzz/gfx/demo/fillets.py:1.3
*** gzz/gfx/demo/fillets.py:1.2 Fri Aug 23 06:35:40 2002
--- gzz/gfx/demo/fillets.py     Wed Sep  4 18:06:00 2002
***************
*** 132,140 ****
            self.movel = 1 - self.movel
        elif k == "m":
            self.polymode = 1 - self.polymode
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
  
        putnoc(vs, getDList("""
            Enable ALPHA_TEST
--- 132,139 ----
            self.movel = 1 - self.movel
        elif k == "m":
            self.polymode = 1 - self.polymode
!     def scene(self, vs):
        d = w.getSize()
  
        putnoc(vs, getDList("""
            Enable ALPHA_TEST
***************
*** 308,316 ****
            self.ind += 1
            self.ind %= len(cellTexs)
            print "IND NOW: ",self.ind
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
  
        putnoc(vs, getDList("""
--- 307,314 ----
            self.ind += 1
            self.ind %= len(cellTexs)
            print "IND NOW: ",self.ind
!     def scene(self, vs):
        d = w.getSize()
        putnoc(vs, background(self.bgcolor))
  
        putnoc(vs, getDList("""
***************
*** 380,388 ****
            print "IND NOW: ",self.ind
        pass
        
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
        self.putcs(vs)
  
--- 378,385 ----
            print "IND NOW: ",self.ind
        pass
        
!     def scene(self, vs):
        d = w.getSize()
        putnoc(vs, background(self.bgcolor))
        self.putcs(vs)
  
***************
*** 530,538 ****
            """), key, 30, ctr1[0], ctr1[1], ctr2[0]-ctr1[0], ctr2[1]-ctr1[1])
        
  
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background(self.bgcolor))
  
        putnoc(vs, getDList("""
--- 527,534 ----
            """), key, 30, ctr1[0], ctr1[1], ctr2[0]-ctr1[0], ctr2[1]-ctr1[1])
        
  
!     def scene(self, vs):
        d = w.getSize()
        putnoc(vs, background(self.bgcolor))
  
        putnoc(vs, getDList("""
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.6 gzz/gfx/demo/gldemo.py:1.7
*** gzz/gfx/demo/gldemo.py:1.6  Wed Sep  4 02:31:11 2002
--- gzz/gfx/demo/gldemo.py      Wed Sep  4 18:06:00 2002
***************
*** 160,173 ****
  #     def __init__(self, w):
  #     b = Bindings()
  #     w.registerBinder(b)
! #     def 
  class Show(AbstractShower):
      def generate(self):
        print "GENERATE"
        vs = w.createVobScene()
        currentScene.scene(vs)
        return vs
!       
  
  b,s = (Bindings(), Show())
  
--- 160,173 ----
  #     def __init__(self, w):
  #     b = Bindings()
  #     w.registerBinder(b)
! #     def
  class Show(AbstractShower):
      def generate(self):
        print "GENERATE"
        vs = w.createVobScene()
        currentScene.scene(vs)
        return vs
! 
  
  b,s = (Bindings(), Show())
  
Index: gzz/gfx/demo/testtimeout.py
diff -c gzz/gfx/demo/testtimeout.py:1.1 gzz/gfx/demo/testtimeout.py:1.2
*** gzz/gfx/demo/testtimeout.py:1.1     Wed Aug  7 09:24:42 2002
--- gzz/gfx/demo/testtimeout.py Wed Sep  4 18:06:00 2002
***************
*** 6,14 ****
      def timeout(self, obj):
        self.x = 300-self.x
        AbstractUpdateManager.chg()
!     def scene(self):
        d = w.getSize()
-       vs = gfxapi.createVobScene(d)
        putnoc(vs, background((0.5,0.5,0.5)))
        vs.put(rectangle((1,0.1,0.1)), "rec", 10, self.x, 200, 150, 150)
        w.addTimeout(1000, None)
--- 6,13 ----
      def timeout(self, obj):
        self.x = 300-self.x
        AbstractUpdateManager.chg()
!     def scene(self, vs):
        d = w.getSize()
        putnoc(vs, background((0.5,0.5,0.5)))
        vs.put(rectangle((1,0.1,0.1)), "rec", 10, self.x, 200, 150, 150)
        w.addTimeout(1000, None)