[Gzz-commits] libvob include/vob/vobs/Fillet.hxx vob/demo/mul...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/06/25 10:26:46

Modified files:
        include/vob/vobs: Fillet.hxx 
        vob/demo/multifil: multifil.py randgraph.py 
Added files:
        vob/demo/multifil: stretching.py 

Log message:
        experiment with meet angle scaling

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Fillet.hxx.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/stretching.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/multifil.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/randgraph.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: libvob/include/vob/vobs/Fillet.hxx
diff -u libvob/include/vob/vobs/Fillet.hxx:1.25 
libvob/include/vob/vobs/Fillet.hxx:1.26
--- libvob/include/vob/vobs/Fillet.hxx:1.25     Wed Jun 25 09:15:21 2003
+++ libvob/include/vob/vobs/Fillet.hxx  Wed Jun 25 10:26:46 2003
@@ -151,7 +151,7 @@
            float r = lerp(r0, r1, .5);
            th = r * thick_t.transform(ZVec(d / r, 0, 0)).x;
 
-           a = angle_t.transform(ZVec(d / r, 0, 0)).x;
+           a = atan(angle_t.transform(ZVec(d / r, 0, 0)).x);
 
            // XXX: prevent the connection from being thicker than the node
            //if (th > 2 * r0) th = 2 * r0;
@@ -170,7 +170,7 @@
            float at = asin((t + r2) / (r0 + r2));
            if (a > at) a = at;
 
-           // XXX: interpolate angle to zero from the point of
+           // XXX: interpolate the "tangent" angle to zero from the point of
            // "overlap" (i.e., where the beginning and end of the side
            // of a fillet meet) to where the nodes coincide.
            float f = d / (cos(aw) * r0);
Index: libvob/vob/demo/multifil/multifil.py
diff -u libvob/vob/demo/multifil/multifil.py:1.16 
libvob/vob/demo/multifil/multifil.py:1.17
--- libvob/vob/demo/multifil/multifil.py:1.16   Tue Jun 24 10:30:04 2003
+++ libvob/vob/demo/multifil/multifil.py        Wed Jun 25 10:26:46 2003
@@ -38,7 +38,7 @@
             self, 
            SlideLin("x", 200, 20, "x", "Left", "Right"),
            SlideLin("y", 300, 20, "y", "Up", "Down"),
-           SlideLin("angle", math.pi/4, .05, "meet angle", "+", "-"),
+           SlideLin("angle", 1, .05, "tan(meet angle)", "+", "-"),
            SlideLin("thick", 1, .1, "thickness", "T", "t"),
            Toggle("drawEdge", 1, "Draw edge", "e"),
            Toggle("drawInside", 1, "Draw inside", "i"),
Index: libvob/vob/demo/multifil/randgraph.py
diff -u libvob/vob/demo/multifil/randgraph.py:1.15 
libvob/vob/demo/multifil/randgraph.py:1.16
--- libvob/vob/demo/multifil/randgraph.py:1.15  Tue Jun 24 10:30:04 2003
+++ libvob/vob/demo/multifil/randgraph.py       Wed Jun 25 10:26:46 2003
@@ -38,7 +38,7 @@
             self, 
            SlideLin("x", 200, 20, "x", "Left", "Right"),
            SlideLin("y", 300, 20, "y", "Up", "Down"),
-           SlideLin("angle", math.pi/4, .05, "meet angle", "+", "-"),
+           SlideLin("angle", 1, .05, "tan(meet angle)", "+", "-"),
            SlideLin("thick", 1, .1, "thickness", "T", "t"),
            Toggle("drawEdge", 1, "Draw edge", "e"),
            Toggle("drawInside", 1, "Draw inside", "i"),
@@ -106,6 +106,8 @@
 
         thick = vs.coords.rational1D22(0, self.thick, 0, 0,  1, 1, 0);
         angle = vs.coords.rational1D22(0, self.angle, 0, 0,  1, 0, 0);
+        #XXX: angle scaling test
+        #angle = vs.coords.rational1D22(0, 1, 0, .15, 0, 1, 0);
         vs.matcher.add(thick, "Thi")
         vs.matcher.add(angle, "Ang")