[Gzz-commits] gzz/gfx demo/irregu4.py libutil/Irregu.hxx

[Janne V. Kujala]

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

Modified files:
        gfx/demo       : irregu4.py 
        gfx/libutil    : Irregu.hxx 

Log message:
        Fix linewidth scaling computations

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/Irregu.hxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.2 gzz/gfx/demo/irregu4.py:1.3
--- gzz/gfx/demo/irregu4.py:1.2 Mon Nov 11 09:13:10 2002
+++ gzz/gfx/demo/irregu4.py     Mon Nov 11 09:51:09 2002
@@ -186,13 +186,11 @@
 
         texscale = 1.0
         linewidth = 1./128
-        scale_pow = .5
+        scale_pow = 0
         border0 = -.5
         border1 = .5
         ripple_scale = .25
 
-        texscale, linewidth, scale_pow, border0, border1, ripple_scale
-
         self.inner = GLRen.createIrregularEdge(
             texscale, linewidth, scale_pow, border0, border1, ripple_scale,
             "1 1 1 1", "0 0 0 0", 0, 0,
@@ -227,8 +225,8 @@
 
         cs1 = vs.coords.affineCoordsys(0, 10, 600, 450,
                                        self.scale * 150,
-                                       self.scale * 32.3,
-                                       self.scale * -14.2,
+                                       self.scale * 0,
+                                       self.scale * 0,
                                        self.scale * 150)
        vs.matcher.add(cs1, "1")
 
Index: gzz/gfx/libutil/Irregu.hxx
diff -u gzz/gfx/libutil/Irregu.hxx:1.4 gzz/gfx/libutil/Irregu.hxx:1.5
--- gzz/gfx/libutil/Irregu.hxx:1.4      Mon Nov 11 09:13:10 2002
+++ gzz/gfx/libutil/Irregu.hxx  Mon Nov 11 09:51:09 2002
@@ -121,32 +121,33 @@
            glBegin(GL_QUADS);
            for (unsigned i = 0, j = 1; j < pt.size(); i++, j++) {
 
+               ZVec dv0 = vert[i][0] - vert[j][0];
+               ZVec dv1 = vert[i][1] - vert[j][1];
+
                ZVec d0, d1;
                float dy0, dy1;
 
                if (multi > 0) {
-                   ZVec dv0 = vert2[j][0] - vert2[i][0];
-                   ZVec dv1 = vert2[j][1] - vert2[i][1];
+                   ZVec dv0t = vert2[j][0] - vert2[i][0];
+                   ZVec dv1t = vert2[j][1] - vert2[i][1];
                    ZVec dt = pt[j] - pt[i];
 
-                   float scale0 = linewidth * dv0.length() / dt.length();
-                   float scale1 = linewidth * dv1.length() / dt.length();
+                   float scale0 = linewidth * dv0t.length() / dv0.length();
+                   float scale1 = linewidth * dv1t.length() / dv1.length();
                    scale0 = pow(scale0, scale_pow);
                    scale1 = pow(scale1, scale_pow);
 
                    // XXX: 1.5 hardcoded
-                   d0 = scale0 * dt * (1.5 / dv0.length());
-                   d1 = scale1 * dt * (1.5 / dv1.length());
+                   d0 = scale0 * dt * (1.5 / dv0t.length());
+                   d1 = scale1 * dt * (1.5 / dv1t.length());
 
                    float dy = 1.0 / 
-                       dv0.cw90().normalize().dot(vert2[i][1] - vert2[i][0]);
+                       dv0t.cw90().normalize().dot(vert2[i][1] - vert2[i][0]);
                    dy0 = scale0 * dy;
                    dy1 = scale1 * dy;
-                   //std::cout << dy << "\n";
+                   //std::cout << dy << " " << dy0 << " " << dy1 << "\n";
                }
 
-               ZVec dv0 = vert[i][0] - vert[j][0];
-               ZVec dv1 = vert[i][1] - vert[j][1];
                float q1 = dv0.dot(dv1) / dv0.dot(dv0);
                ZPt a1q = pt[i] * q1;
                ZPt b1q = pt[j] * q1;