haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor optimizations.

This commit is contained in:
Maciej Suminski 2014-02-05 14:51:19 +01:00
parent 468e14f003
commit 1d4c6ad40e
1 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
common/geometry/hetriang.cpp
View File

@ -223,8 +223,8 @@ void Triangulation::removeTriangle(EdgePtr& edge) {
removeLeadingEdgeFromList(e1); removeLeadingEdgeFromList(e1);
// cout << "No leading edges = " << leadingEdges_.size() << endl; // cout << "No leading edges = " << leadingEdges_.size() << endl;
// Remove the triangle // Remove the triangle
EdgePtr e2 = e1->getNextEdgeInFace(); EdgePtr e2(e1->getNextEdgeInFace());
EdgePtr e3 = e2->getNextEdgeInFace(); EdgePtr e3(e2->getNextEdgeInFace());
if (e1->getTwinEdge()) if (e1->getTwinEdge())
e1->getTwinEdge()->setTwinEdge(EdgePtr()); e1->getTwinEdge()->setTwinEdge(EdgePtr());
@ -240,15 +240,15 @@ void Triangulation::reverse_splitTriangle(EdgePtr& edge) {
// Reverse operation of splitTriangle // Reverse operation of splitTriangle
EdgePtr e1 = edge->getNextEdgeInFace(); EdgePtr e1(edge->getNextEdgeInFace());
EdgePtr le = getLeadingEdgeInTriangle(e1); EdgePtr le(getLeadingEdgeInTriangle(e1));
#ifdef DEBUG_HE #ifdef DEBUG_HE
if (!le) if (!le)
errorAndExit("Triangulation::removeTriangle: could not find leading edge"); errorAndExit("Triangulation::removeTriangle: could not find leading edge");
#endif #endif
removeLeadingEdgeFromList(le); removeLeadingEdgeFromList(le);
EdgePtr e2 = e1->getNextEdgeInFace()->getTwinEdge()->getNextEdgeInFace(); EdgePtr e2(e1->getNextEdgeInFace()->getTwinEdge()->getNextEdgeInFace());
le = getLeadingEdgeInTriangle(e2); le = getLeadingEdgeInTriangle(e2);
#ifdef DEBUG_HE #ifdef DEBUG_HE
if (!le) if (!le)
@ -256,7 +256,7 @@ void Triangulation::reverse_splitTriangle(EdgePtr& edge) {
#endif #endif
removeLeadingEdgeFromList(le); removeLeadingEdgeFromList(le);
EdgePtr e3 = edge->getTwinEdge()->getNextEdgeInFace()->getNextEdgeInFace(); EdgePtr e3(edge->getTwinEdge()->getNextEdgeInFace()->getNextEdgeInFace());
le = getLeadingEdgeInTriangle(e3); le = getLeadingEdgeInTriangle(e3);
#ifdef DEBUG_HE #ifdef DEBUG_HE
if (!le) if (!le)
@ -322,14 +322,11 @@ bool Triangulation::removeLeadingEdgeFromList(EdgePtr& leadingEdge) {
edge->setAsLeadingEdge(false); edge->setAsLeadingEdge(false);
it = leadingEdges_.erase(it); it = leadingEdges_.erase(it);
break; return true;
} }
} }
if (it == leadingEdges_.end()) return false;
return false;
return true;
} }
@ -451,14 +448,14 @@ EdgePtr Triangulation::splitTriangle(EdgePtr& edge, NodePtr& point) {
// Add the node to the structure // Add the node to the structure
//NodePtr new_node(new Node(x,y,z)); //NodePtr new_node(new Node(x,y,z));
NodePtr n1 = edge->getSourceNode(); NodePtr n1(edge->getSourceNode());
EdgePtr e1 = edge; EdgePtr e1(edge);
EdgePtr e2 = edge->getNextEdgeInFace(); EdgePtr e2(edge->getNextEdgeInFace());
NodePtr n2 = e2->getSourceNode(); NodePtr n2(e2->getSourceNode());
EdgePtr e3 = e2->getNextEdgeInFace(); EdgePtr e3(e2->getNextEdgeInFace());
NodePtr n3 = e3->getSourceNode(); NodePtr n3(e3->getSourceNode());
EdgePtr e1_n(new Edge); EdgePtr e1_n(new Edge);
EdgePtr e11_n(new Edge); EdgePtr e11_n(new Edge);
@ -489,7 +486,6 @@ EdgePtr Triangulation::splitTriangle(EdgePtr& edge, NodePtr& point) {
e22_n->setNextEdgeInFace(e2); e22_n->setNextEdgeInFace(e2);
e33_n->setNextEdgeInFace(e3); e33_n->setNextEdgeInFace(e3);
// and update old's next edge // and update old's next edge
e1->setNextEdgeInFace(e2_n); e1->setNextEdgeInFace(e2_n);
e2->setNextEdgeInFace(e3_n); e2->setNextEdgeInFace(e3_n);
@ -500,19 +496,15 @@ EdgePtr Triangulation::splitTriangle(EdgePtr& edge, NodePtr& point) {
// Use the field telling if an edge is a leading edge // Use the field telling if an edge is a leading edge
// NOTE: Must search in the list!!! // NOTE: Must search in the list!!!
EdgePtr leadingEdge;
if (e1->isLeadingEdge()) if (e1->isLeadingEdge())
leadingEdge = e1; removeLeadingEdgeFromList(e1);
else if (e2->isLeadingEdge()) else if (e2->isLeadingEdge())
leadingEdge = e2; removeLeadingEdgeFromList(e2);
else if(e3->isLeadingEdge()) else if(e3->isLeadingEdge())
leadingEdge = e3; removeLeadingEdgeFromList(e3);
else else
return EdgePtr(); return EdgePtr();
removeLeadingEdgeFromList(leadingEdge);
addLeadingEdge(e1_n); addLeadingEdge(e1_n);
addLeadingEdge(e2_n); addLeadingEdge(e2_n);
addLeadingEdge(e3_n); addLeadingEdge(e3_n);
@ -532,16 +524,16 @@ void Triangulation::swapEdge(EdgePtr& diagonal) {
// Swap by rotating counterclockwise // Swap by rotating counterclockwise
// Use the same objects - no deletion or new objects // Use the same objects - no deletion or new objects
EdgePtr eL = diagonal; EdgePtr eL(diagonal);
EdgePtr eR = eL->getTwinEdge(); EdgePtr eR(eL->getTwinEdge());
EdgePtr eL_1 = eL->getNextEdgeInFace(); EdgePtr eL_1(eL->getNextEdgeInFace());
EdgePtr eL_2 = eL_1->getNextEdgeInFace(); EdgePtr eL_2(eL_1->getNextEdgeInFace());
EdgePtr eR_1 = eR->getNextEdgeInFace(); EdgePtr eR_1(eR->getNextEdgeInFace());
EdgePtr eR_2 = eR_1->getNextEdgeInFace(); EdgePtr eR_2(eR_1->getNextEdgeInFace());
// avoid node to be dereferenced to zero and deleted // avoid node to be dereferenced to zero and deleted
NodePtr nR = eR_2->getSourceNode(); NodePtr nR(eR_2->getSourceNode());
NodePtr nL = eL_2->getSourceNode(); NodePtr nL(eL_2->getSourceNode());
eL->setSourceNode(nR); eL->setSourceNode(nR);
eR->setSourceNode(nL); eR->setSourceNode(nL);
@ -555,24 +547,20 @@ void Triangulation::swapEdge(EdgePtr& diagonal) {
eR_2->setNextEdgeInFace(eL_1); eR_2->setNextEdgeInFace(eL_1);
eL_1->setNextEdgeInFace(eR); eL_1->setNextEdgeInFace(eR);
EdgePtr leL;
if (eL->isLeadingEdge()) if (eL->isLeadingEdge())
leL = eL; removeLeadingEdgeFromList(eL);
else if (eL_1->isLeadingEdge()) else if (eL_1->isLeadingEdge())
leL = eL_1; removeLeadingEdgeFromList(eL_1);
else if (eL_2->isLeadingEdge()) else if (eL_2->isLeadingEdge())
leL = eL_2; removeLeadingEdgeFromList(eL_2);
EdgePtr leR;
if (eR->isLeadingEdge()) if (eR->isLeadingEdge())
leR = eR; removeLeadingEdgeFromList(eR);
else if (eR_1->isLeadingEdge()) else if (eR_1->isLeadingEdge())
leR = eR_1; removeLeadingEdgeFromList(eR_1);
else if (eR_2->isLeadingEdge()) else if (eR_2->isLeadingEdge())
leR = eR_2; removeLeadingEdgeFromList(eR_2);
removeLeadingEdgeFromList(leL);
removeLeadingEdgeFromList(leR);
addLeadingEdge(eL); addLeadingEdge(eL);
addLeadingEdge(eR); addLeadingEdge(eR);
} }