[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19297] branches/bmesh/blender/source/ blender/bmesh: had to increase size of a numerical error compensation value , kindof odd but works

[Joseph Eagar]

Revision: 19297
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19297
Author:   joeedh
Date:     2009-03-15 07:14:03 +0100 (Sun, 15 Mar 2009)

Log Message:
-----------
had to increase size of a numerical error compensation value, kindof odd but 
works

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/operators/connectops.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c  
2009-03-15 03:11:05 UTC (rev 19296)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c  
2009-03-15 06:14:03 UTC (rev 19297)
@@ -732,7 +732,7 @@
                VECCOPY(v1, loops[i][0]->v->co);
                VECCOPY(v2, loops[i][1]->v->co);
 
-               shrink_edgef(v1, v2, 0.9999f);
+               shrink_edgef(v1, v2, 0.999f);
                
                VECCOPY(edgeverts[a], v1);
                a++;
@@ -751,6 +751,11 @@
                out[2] = 0.0f;
                p1[2] = 0.0f;
        }
+       
+       for (i=0; i<len; i++) {
+               edgeverts[i*2][2] = 0.0f;
+               edgeverts[i*2+1][2] = 0.0f;
+       }
 
        /*do convexity test*/
        for (i=0; i<len; i++) {
@@ -771,11 +776,11 @@
                        VECCOPY(v1, p1);
                        VECCOPY(v2, p2);
 
-                       shrink_edgef(v1, v2, 1.001f);
+                       shrink_edgef(v1, v2, 1.0001f);
 
                        if (linecrossesf(p1, p2, mid, out)) clen++;
-                       else if (linecrossesf(p2, p1, out, mid)) clen++;
-                       else if (linecrossesf(p1, p2, out, mid)) clen++;
+                       //else if (linecrossesf(p2, p1, out, mid)) clen++;
+                       //else if (linecrossesf(p1, p2, out, mid)) clen++;
 
                }
                
@@ -791,13 +796,11 @@
                for (j=0; j<len; j++) {
                        if (!loops[j][0]) continue;
 
-                       l = loops[j][0];
-                       VECCOPY(v1, edgeverts[j*2]);
-                       l = loops[j][1];
-                       VECCOPY(v2, edgeverts[j*2+1]);
+                       p3 = edgeverts[j*2];
+                       p4 = edgeverts[j*2+1];
 
-                       if (linecrossesf(p1, p2, v1, v2) || 
-                           linecrossesf(p2, p1, v2, v1))
+                       if (linecrossesf(p1, p2, p3, p4) || 
+                           linecrossesf(p2, p1, p4, p3))
                        {
                                loops[j][0] = NULL;
                        }

Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c  
2009-03-15 03:11:05 UTC (rev 19296)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c  
2009-03-15 06:14:03 UTC (rev 19297)
@@ -52,8 +52,8 @@
                                        V_GROW(loops);
                                        loops[V_COUNT(loops)-1] = l;
 
-                                       lastl = l;
                                }
+                               lastl = l;
                        }
                }
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs