more asserts, comment
This commit is contained in:
parent
72662b1acd
commit
e2c9c5e423
@ -808,6 +808,7 @@ void qhHull::FixMerge(qhFace* face1, qhHalfEdge* ein)
|
|||||||
B3_ASSERT(eout->next->prev == eout);
|
B3_ASSERT(eout->next->prev == eout);
|
||||||
eout->next->prev = eout->prev;
|
eout->next->prev = eout->prev;
|
||||||
|
|
||||||
|
B3_ASSERT(eout->face == face1);
|
||||||
if (face1->edge == eout)
|
if (face1->edge == eout)
|
||||||
{
|
{
|
||||||
face1->edge = eout->next;
|
face1->edge = eout->next;
|
||||||
@ -825,6 +826,7 @@ void qhHull::FixMerge(qhFace* face1, qhHalfEdge* ein)
|
|||||||
B3_ASSERT(eout->twin->next->prev == eout->twin);
|
B3_ASSERT(eout->twin->next->prev == eout->twin);
|
||||||
eout->twin->next->prev = eout->twin->prev;
|
eout->twin->next->prev = eout->twin->prev;
|
||||||
|
|
||||||
|
B3_ASSERT(eout->twin->face == face3);
|
||||||
if (face3->edge == eout->twin)
|
if (face3->edge == eout->twin)
|
||||||
{
|
{
|
||||||
face3->edge = eout->twin->next;
|
face3->edge = eout->twin->next;
|
||||||
@ -861,6 +863,7 @@ qhFace* qhHull::RemoveEdge(qhHalfEdge* edge)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set the face 1 to reference a non-deleted edge
|
// Set the face 1 to reference a non-deleted edge
|
||||||
|
B3_ASSERT(edge->face == face1);
|
||||||
if (face1->edge == edge)
|
if (face1->edge == edge)
|
||||||
{
|
{
|
||||||
face1->edge = edge->next;
|
face1->edge = edge->next;
|
||||||
@ -877,10 +880,10 @@ qhFace* qhHull::RemoveEdge(qhHalfEdge* edge)
|
|||||||
B3_ASSERT(edge->twin->next->prev == edge->twin);
|
B3_ASSERT(edge->twin->next->prev == edge->twin);
|
||||||
edge->twin->next->prev = edge->prev;
|
edge->twin->next->prev = edge->prev;
|
||||||
|
|
||||||
// Reset right face data
|
// Reset face 1 data
|
||||||
b3ResetFaceData(face1);
|
b3ResetFaceData(face1);
|
||||||
|
|
||||||
// Validate topology
|
// Validate face 1
|
||||||
Validate(face1);
|
Validate(face1);
|
||||||
|
|
||||||
// Move face 2 conflict vertices into face 1
|
// Move face 2 conflict vertices into face 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user