griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

had to increase size of a numerical error compensation value, kindof odd but works

Browse Source
This commit is contained in:
Joseph Eagar
2009-03-15 06:14:03 +00:00
parent 302e796270
commit dbad24e0f6
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/bmesh/intern/bmesh_polygon.c
View File

@@ -732,7 +732,7 @@ void BM_LegalSplits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
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 @@ void BM_LegalSplits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
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 @@ void BM_LegalSplits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
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 @@ void BM_LegalSplits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
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;
}

2
source/blender/bmesh/operators/connectops.c
View File

@@ -52,8 +52,8 @@ void connectverts_exec(BMesh *bm, BMOperator *op)
V_GROW(loops);
loops[V_COUNT(loops)-1] = l;
lastl = l;
}
lastl = l;
}
}