3rd-party
/
poly2tri
mirror of https://github.com/jhasse/poly2tri.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compiler warning and remove trailing whitespace

This commit is contained in:
Jan Niklas Hasse 2012-08-18 17:41:03 +02:00
parent f4f6ab5ab1
commit 163e504e21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
poly2tri/sweep/sweep.cc
View File

@ -49,7 +49,7 @@ void Sweep::Triangulate(SweepContext& tcx)
void Sweep::SweepPoints(SweepContext& tcx) void Sweep::SweepPoints(SweepContext& tcx)
{ {
for (int i = 1; i < tcx.point_count(); i++) { for (size_t i = 1; i < tcx.point_count(); i++) {
Point& point = *tcx.GetPoint(i); Point& point = *tcx.GetPoint(i);
Node* node = &PointEvent(tcx, point); Node* node = &PointEvent(tcx, point);
for (unsigned int i = 0; i < point.edge_list.size(); i++) { for (unsigned int i = 0; i < point.edge_list.size(); i++) {
@ -115,7 +115,7 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
if (o1 == COLLINEAR) { if (o1 == COLLINEAR) {
if( triangle->Contains(&eq, p1)) { if( triangle->Contains(&eq, p1)) {
triangle->MarkConstrainedEdge(&eq, p1 ); triangle->MarkConstrainedEdge(&eq, p1 );
// We are modifying the constraint maybe it would be better to // We are modifying the constraint maybe it would be better to
// not change the given constraint and just keep a variable for the new constraint // not change the given constraint and just keep a variable for the new constraint
tcx.edge_event.constrained_edge->q = p1; tcx.edge_event.constrained_edge->q = p1;
triangle = &triangle->NeighborAcross(point); triangle = &triangle->NeighborAcross(point);
@ -132,7 +132,7 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
if (o2 == COLLINEAR) { if (o2 == COLLINEAR) {
if( triangle->Contains(&eq, p2)) { if( triangle->Contains(&eq, p2)) {
triangle->MarkConstrainedEdge(&eq, p2 ); triangle->MarkConstrainedEdge(&eq, p2 );
// We are modifying the constraint maybe it would be better to // We are modifying the constraint maybe it would be better to
// not change the given constraint and just keep a variable for the new constraint // not change the given constraint and just keep a variable for the new constraint
tcx.edge_event.constrained_edge->q = p2; tcx.edge_event.constrained_edge->q = p2;
triangle = &triangle->NeighborAcross(point); triangle = &triangle->NeighborAcross(point);
@ -252,7 +252,7 @@ void Sweep::FillAdvancingFront(SweepContext& tcx, Node& n)
// True if HoleAngle exceeds 90 degrees. // True if HoleAngle exceeds 90 degrees.
bool Sweep::LargeHole_DontFill(Node* node) { bool Sweep::LargeHole_DontFill(Node* node) {
Node* nextNode = node->next; Node* nextNode = node->next;
Node* prevNode = node->prev; Node* prevNode = node->prev;
if (!AngleExceeds90Degrees(node->point, nextNode->point, prevNode->point)) if (!AngleExceeds90Degrees(node->point, nextNode->point, prevNode->point))