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

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/07/01 10:52:30

Modified files:
        include/vob/vobs: Fillet.hxx 

Log message:
        twid

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Fillet.hxx.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: libvob/include/vob/vobs/Fillet.hxx
diff -u libvob/include/vob/vobs/Fillet.hxx:1.36 
libvob/include/vob/vobs/Fillet.hxx:1.37
--- libvob/include/vob/vobs/Fillet.hxx:1.36     Tue Jul  1 10:32:56 2003
+++ libvob/include/vob/vobs/Fillet.hxx  Tue Jul  1 10:52:30 2003
@@ -678,7 +678,6 @@
 
     struct Conn {
        const CircularNode *node;
-       float dist;
        LinearConnectionHalf c;
        StretchedCircleFillet f;
        ZVec dir;
@@ -700,8 +699,14 @@
        }
 
        float rad(ZVec v, bool &success) const {
-           ZVec pt = f.point(trans(v).normalized(), success);
+           Vec t = trans(v).normalized();
+           ZVec pt = f.point(t, success);
            if (success) return pt.length();
+           if (f.infillet(t)) {
+               success = true;
+               // return distance to the middle of the connection
+               return c.d / v.normalized().dot(dir);
+           }
            return node->r;
        }
     };