[Gzz-commits] libvob/include/vob/geom Fillets2.hxx

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/06/24 07:44:02

Modified files:
        include/vob/geom: Fillets2.hxx 

Log message:
        fix z calculation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/geom/Fillets2.hxx.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: libvob/include/vob/geom/Fillets2.hxx
diff -u libvob/include/vob/geom/Fillets2.hxx:1.17 
libvob/include/vob/geom/Fillets2.hxx:1.18
--- libvob/include/vob/geom/Fillets2.hxx:1.17   Tue Jun 24 07:18:34 2003
+++ libvob/include/vob/geom/Fillets2.hxx        Tue Jun 24 07:44:02 2003
@@ -140,7 +140,7 @@
         * XXX Z calculation needs thinking.
         */
        ZVec projectToConnLine(ZVec v) const {
-           float l = (v - node.ctr).xylength();
+           float l = dir.dot(v - node.ctr);
            v = v - norm.dot(v-node.ctr) * norm;
 #if 0
            if(dir.dot(v-node.ctr) <= node.r) {
@@ -148,6 +148,7 @@
            }
 #endif
            v.z = lerp(node.ctr.z, z, (l - node.r) / (d - node.r));
+           if (l < node.r) v.z = node.ctr.z;
            return v;
        }