[Gzz-commits] gzz/gfx demo/irregular2.py librenderables/rende...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/18 02:41:35

Modified files:
        gfx/demo       : irregular2.py 
        gfx/librenderables: renderables.py 

Log message:
        Add redundant ripple_period parameter to IrregularQuad

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregular2.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregular2.py
diff -c gzz/gfx/demo/irregular2.py:1.11 gzz/gfx/demo/irregular2.py:1.12
*** gzz/gfx/demo/irregular2.py:1.11     Wed Sep 18 01:58:08 2002
--- gzz/gfx/demo/irregular2.py  Wed Sep 18 02:41:35 2002
***************
*** 16,21 ****
--- 16,22 ----
          self.mode = 255
          self.combiners = "Enable"
  
+         self.period = 1.0
          self.border = 0.2
          self.w, self.h = 2, 1.5
          self.initirregu()
***************
*** 81,88 ****
          """ % (boxtex.getTexId(), tex.getTexId(), self.combiners)
  
  
!       self.iq = GZZGL.createIrregularQuad(self.border, self.w, self.h, 0, 
code)
!       self.iq2 = GZZGL.createIrregularQuad(self.border, self.w, self.h, 1, 
code)
  
      def key(self, k):
          if 0: pass
--- 82,89 ----
          """ % (boxtex.getTexId(), tex.getTexId(), self.combiners)
  
  
!       self.iq = GZZGL.createIrregularQuad(self.border, self.w, self.h, 
self.period, 0, code)
!       self.iq2 = GZZGL.createIrregularQuad(self.border, self.w, self.h, 
self.period, 1, code)
  
      def key(self, k):
          if 0: pass
***************
*** 108,113 ****
--- 109,116 ----
          elif k == "H": self.h -= .1; self.initirregu()
          elif k == "b": self.border += .01; self.initirregu()
          elif k == "B": self.border -= .01; self.initirregu()
+         elif k == "p": self.period += .1; self.initirregu()
+         elif k == "P": self.period -= .1; self.initirregu()
          elif "1" <= k <= "9":
              self.mode ^= 1 << (int(k)-1)
              print "mode=", [ (".","X")[(self.mode >> i) & 1] for i in 
range(0, 9) ]
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.42 
gzz/gfx/librenderables/renderables.py:1.43
*** gzz/gfx/librenderables/renderables.py:1.42  Wed Sep 18 01:58:08 2002
--- gzz/gfx/librenderables/renderables.py       Wed Sep 18 02:41:35 2002
***************
*** 656,669 ****
  {
      "Type" : "2",
      "Name": "IrregularQuad",
!     "Data": "float border; float cs2w, cs2h; int mode; CallGLCode setup;",
      "Params" : """
!           float border, float cs2w, float cs2h, int mode, String setupcode
        """,
      "ParamCode" : """
              this->border = border;
!             this->cs2w = cs2w;
!             this->cs2h = cs2h;
              this->mode = mode;
              setup = CallGLCode(string(setupcode.begin(), 
setupcode.end()).c_str());
        """,
--- 656,672 ----
  {
      "Type" : "2",
      "Name": "IrregularQuad",
!     "Data": "float border; float cs2w, cs2h, cs2p; int mode; CallGLCode 
setup;",
      "Params" : """
!           float border, float cs2w, float cs2h, float cs2ripple_period, int 
mode, String setupcode
        """,
      "ParamCode" : """
+             // Note: the parameters coords2.x, coords2.y, cs2w, cs2h,
+             //       and cs2ripple_period have one redundant variable
+             this->cs2p = cs2ripple_period;
              this->border = border;
!             this->cs2w = cs2w / cs2p;
!             this->cs2h = cs2h / cs2p;
              this->mode = mode;
              setup = CallGLCode(string(setupcode.begin(), 
setupcode.end()).c_str());
        """,
***************
*** 676,681 ****
--- 679,688 ----
      "RenderCode" : """
          DBG(dbg) << "Irregular quad\\n";
  
+         AffineCoords &oldcs2 = coords2;
+         {
+         AffineCoords coords2(oldcs2.center, oldcs2.x * cs2p, oldcs2.y * cs2p);
+ 
          setup();
          GLERR;
  
***************
*** 818,823 ****
--- 825,831 ----
  
  
          glPopAttrib();
+         }
      """,
  }    ,