[Gzz-commits] gzz ./TODO gfx/demo/xuconn.py gfx/librenderable...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/19 04:13:55

Modified files:
        .              : TODO 
        gfx/demo       : xuconn.py 
        gfx/librenderables: renderables.py 

Log message:
        twid

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.303&tr2=1.304&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xuconn.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.108&tr2=1.109&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.303 gzz/TODO:1.304
*** gzz/TODO:1.303      Fri Oct 18 08:46:39 2002
--- gzz/TODO    Sat Oct 19 04:13:55 2002
***************
*** 219,224 ****
--- 219,225 ----
          number of passes as much. However, this brings
          caching problems.
      benja:
+       + get rid of non-random urn-5s in Ids!!!
          - finish Storm
        - backward diffing
        - python tests easily runnable one by one
Index: gzz/gfx/demo/xuconn.py
diff -c gzz/gfx/demo/xuconn.py:1.2 gzz/gfx/demo/xuconn.py:1.3
*** gzz/gfx/demo/xuconn.py:1.2  Fri Oct 18 10:09:06 2002
--- gzz/gfx/demo/xuconn.py      Sat Oct 19 04:13:55 2002
***************
*** 1,16 ****
  import math
  
  class CScene:
      def key(self, key):
!       pass
      def scene(self, vs):
        vs.map.put(background((0.6, 0.6, 0.65)))
        vs.map.put(getDListNocoords("Disable TEXTURE_2D"))
        vs.put(coloredQuad((0,0,1)), "1", 0, 100, 100, 200, 400)
        vs.put(coloredQuad((1,0,0)), "2", 0, 500, 100, 200, 400)
  
!       v = [(x, 0.9*(math.sqrt(0.25-(x-.5)*(x-.5))))
!               for x in floats(0,1,50)]
        str = """
            Disable TEXTURE_2D
            Enable BLEND
--- 1,28 ----
  import math
  
  class CScene:
+     def __init__(self):
+       self.curve = 1
      def key(self, key):
!       if key == 'c':
!           self.curve = not self.curve
!           AbstractUpdateManager.setNoAnimation()
      def scene(self, vs):
        vs.map.put(background((0.6, 0.6, 0.65)))
        vs.map.put(getDListNocoords("Disable TEXTURE_2D"))
        vs.put(coloredQuad((0,0,1)), "1", 0, 100, 100, 200, 400)
        vs.put(coloredQuad((1,0,0)), "2", 0, 500, 100, 200, 400)
  
!       if self.curve:
!           v = [((0.5*(1+math.cos(a))), 0.9 * 0.5*math.sin(a)**(.6) )
!                   for a in floats(0,math.pi,150)]
!           # v = [(0.5*(1+cmath.pow(math.cos(a) , (.333333333))), 0.9 * 
0.5*math.sin(a)**(.3) )
!           #       for a in floats(0,math.pi,150)]
!       else:
!           print "CYC"
!           v = [((a-math.sin(a))/(2*math.pi), 0.9 * 0.25*(1-math.cos(a)))
!                   for a in floats(0,2*math.pi,150)]
!           
        str = """
            Disable TEXTURE_2D
            Enable BLEND
***************
*** 78,85 ****
  
        vs.map.put(getDListNocoords("Disable TEXTURE_2D"))
  
!       w = 25
!       h = 50
        cs2 = vs.coords.ortho(0, 0, 200-w, 215-h, 2*w, 2*h)
        vs.map.put(s2, cs2)
            
--- 90,97 ----
  
        vs.map.put(getDListNocoords("Disable TEXTURE_2D"))
  
!       w = 20
!       h = 30
        cs2 = vs.coords.ortho(0, 0, 200-w, 215-h, 2*w, 2*h)
        vs.map.put(s2, cs2)
            
***************
*** 88,93 ****
--- 100,108 ----
  
  
        cs = vs.coords.affineCoordsys(0, 0, 200,300, 400, 0, 100,  30)
+       vs.map.put(shape, cs)
+ 
+       cs = vs.coords.affineCoordsys(0, 0, 200,500, 30, 0, 0,  30)
        vs.map.put(shape, cs)
  
  currentScene = CScene()
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.108 
gzz/gfx/librenderables/renderables.py:1.109
*** gzz/gfx/librenderables/renderables.py:1.108 Fri Oct 18 11:23:44 2002
--- gzz/gfx/librenderables/renderables.py       Sat Oct 19 04:13:55 2002
***************
*** 1231,1243 ****
      "Data" : """
        float r, g, b;
        float alpha_end;
!       float alpha_
      """,
      "Params": """
!       float r, float g, float b,
      """,
      "ParamCode" : """
-       this->ind = ind;
      """,
  },
  ]
--- 1231,1242 ----
      "Data" : """
        float r, g, b;
        float alpha_end;
!       float alpha;
      """,
      "Params": """
!       float r, float g, float b
      """,
      "ParamCode" : """
      """,
  },
  ]