AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return

Browse Source
This commit is contained in:
Irlan 2018-05-12 20:12:31 -03:00
parent 096747a49d
commit ddd9913a37
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bounce/quickhull/qh_hull.cpp
View File

@ -745,6 +745,8 @@ qhHalfEdge* qhHull::FixMerge(qhFace* face1, qhHalfEdge* ein)
// Is the face 3 a triangle? // Is the face 3 a triangle?
if (count == 3) if (count == 3)
{ {
qhHalfEdge* nextEdge = eout->next;
// Unlink incoming edge from face 1 // Unlink incoming edge from face 1
B3_ASSERT(ein->prev->next == ein); B3_ASSERT(ein->prev->next == ein);
ein->prev->next = ein->twin->next; ein->prev->next = ein->twin->next;
@ -807,9 +809,14 @@ qhHalfEdge* qhHull::FixMerge(qhFace* face1, qhHalfEdge* ein)
// Remove face 3 // Remove face 3
m_faceList.Remove(face3); m_faceList.Remove(face3);
FreeFace(face3); FreeFace(face3);
// Return the next edge
return nextEdge;
} }
else else
{ {
qhHalfEdge* nextEdge = eout->next;
// Extend the incoming edge to the next vertex // Extend the incoming edge to the next vertex
B3_ASSERT(ein->twin->tail == eout->tail); B3_ASSERT(ein->twin->tail == eout->tail);
ein->twin->tail = eout->twin->tail; ein->twin->tail = eout->twin->tail;
@ -851,9 +858,13 @@ qhHalfEdge* qhHull::FixMerge(qhFace* face1, qhHalfEdge* ein)
// Remove outgoing edge // Remove outgoing edge
FreeEdge(eout->twin); FreeEdge(eout->twin);
FreeEdge(eout); FreeEdge(eout);
}
return face1->edge; // Return the next edge
return nextEdge;
}
// Return the next edge to the given edge
return eout;
} }
qhFace* qhHull::RemoveEdge(qhHalfEdge* edge) qhFace* qhHull::RemoveEdge(qhHalfEdge* edge)