[Gzz-commits] gzz/gfx/librenderables renderables.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/13 15:24:00

Modified files:
        gfx/librenderables: renderables.py 

Log message:
        Multiply IrregularEdge ellipse x and y exponents with x and y scales

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.144&tr2=1.145&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.144 
gzz/gfx/librenderables/renderables.py:1.145
--- gzz/gfx/librenderables/renderables.py:1.144 Wed Nov 13 11:41:37 2002
+++ gzz/gfx/librenderables/renderables.py       Wed Nov 13 15:24:00 2002
@@ -1365,11 +1365,15 @@
         case 9:
         case 10:
         case 11: {
-            float pow = 4 + (shape - 8) * 2;
-            pow = 2 / pow;
+            float xw = (coords2.transform(ZPt(1,0,0)) - 
coords2.transform(ZPt(0,0,0))).length();
+            float yw = (coords2.transform(ZPt(0,1,0)) - 
coords2.transform(ZPt(0,0,0))).length();
+            
+            float pow = 2 + (shape - 8) * 3;
+            float xpow = 2 / (pow * xw);
+            float ypow = 2 / (pow * yw);
             for (int i = 0; i < n; i++) { 
                 float a = i * 2*M_PI / n;
-                vert[i] = coords2.transform(ZPt(power(cos(a),pow), 
power(sin(a),pow), 0));
+                vert[i] = coords2.transform(ZPt(power(cos(a),xpow), 
power(sin(a),ypow), 0));
             }
             }
             break;