vmario/papercraft
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix case where both segments must be infront

Browse Source
This commit is contained in:
Trammell hudson 2017-10-16 19:46:08 -04:00
parent d78914bd17
commit d78175a07a
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hiddenwire.c
View File

@ -453,6 +453,7 @@ recursive++;
// make sure that we're not comparing to our own triangle // make sure that we're not comparing to our own triangle
// or one that shares an edge with us (which might be in // or one that shares an edge with us (which might be in
// a different order) // a different order)
/*
if (v2_eq(s->src[0].p, t->p[0].p, 0.005) if (v2_eq(s->src[0].p, t->p[0].p, 0.005)
&& v2_eq(s->src[1].p, t->p[1].p, 0.005)) && v2_eq(s->src[1].p, t->p[1].p, 0.005))
continue; continue;
@ -471,6 +472,7 @@ recursive++;
if (v2_eq(s->src[0].p, t->p[0].p, 0.005) if (v2_eq(s->src[0].p, t->p[0].p, 0.005)
&& v2_eq(s->src[1].p, t->p[2].p, 0.005)) && v2_eq(s->src[1].p, t->p[2].p, 0.005))
continue; continue;
*/
float z0, z1; float z0, z1;
int inside0 = tri_find_z(t, &s->p[0], &z0); int inside0 = tri_find_z(t, &s->p[0], &z0);
@ -481,9 +483,8 @@ recursive++;
// otherwies we discard the segment // otherwies we discard the segment
if (inside0 && inside1) if (inside0 && inside1)
{ {
if (s->p[0].p[2] <= z0) if (s->p[0].p[2] <= z0
continue; && s->p[1].p[2] <= z1)
if (s->p[1].p[2] <= z1)
continue; continue;
recursive--; recursive--;
return; return;