Commit 9da59471 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

Correct Selectors (reference error)

parent 46808bde
This diff is collapsed.
......@@ -113,33 +113,33 @@ void HalfEdgeSelector_QEMml<PFP>::updateBeforeCollapse(Dart d)
{
MAP& m = this->m_map ;
HalfEdgeInfo& edgeE = halfEdgeInfo[d] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
HalfEdgeInfo* edgeE = &(halfEdgeInfo[d]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(d)] ;
if(edgeE.valid) // remove all
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(d)]) ;
if(edgeE->valid) // remove all
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(d)] ; // the halfedges that will disappear
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(d)]) ; // the halfedges that will disappear
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
// from the multimap
Dart dd = m.phi2(d) ;
assert(dd != d) ;
if(dd != d)
{
edgeE = halfEdgeInfo[dd] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[dd]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
}
}
......@@ -389,33 +389,33 @@ void HalfEdgeSelector_QEMextColor<PFP>::updateBeforeCollapse(Dart d)
{
MAP& m = this->m_map ;
HalfEdgeInfo& edgeE = halfEdgeInfo[d] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
HalfEdgeInfo* edgeE = &(halfEdgeInfo[d]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(d)] ;
if(edgeE.valid) // remove all
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(d)]) ;
if(edgeE->valid) // remove all
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(d)] ; // the halfedges that will disappear
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(d)]) ; // the halfedges that will disappear
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
// from the multimap
Dart dd = m.phi2(d) ;
assert(dd != d) ;
if(dd != d)
{
edgeE = halfEdgeInfo[dd] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[dd]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
}
}
......@@ -744,33 +744,33 @@ void HalfEdgeSelector_Lightfield<PFP>::updateBeforeCollapse(Dart d)
{
MAP& m = this->m_map ;
HalfEdgeInfo& edgeE = halfEdgeInfo[d] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
HalfEdgeInfo* edgeE = &(halfEdgeInfo[d]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(d)] ;
if(edgeE.valid) // remove all
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(d)]) ;
if(edgeE->valid) // remove all
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(d)] ; // the halfedges that will disappear
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(d)]) ; // the halfedges that will disappear
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
// from the multimap
Dart dd = m.phi2(d) ;
assert(dd != d) ;
if(dd != d)
{
edgeE = halfEdgeInfo[dd] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[dd]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
}
}
......@@ -1108,33 +1108,33 @@ void HalfEdgeSelector_LightfieldExp<PFP>::updateBeforeCollapse(Dart d)
{
MAP& m = this->m_map ;
HalfEdgeInfo& edgeE = halfEdgeInfo[d] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
HalfEdgeInfo* edgeE = &(halfEdgeInfo[d]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(d)] ;
if(edgeE.valid) // remove all
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(d)]) ;
if(edgeE->valid) // remove all
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(d)] ; // the halfedges that will disappear
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(d)]) ; // the halfedges that will disappear
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
// from the multimap
Dart dd = m.phi2(d) ;
assert(dd != d) ;
if(dd != d)
{
edgeE = halfEdgeInfo[dd] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[dd]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
edgeE = halfEdgeInfo[m.phi_1(dd)] ;
if(edgeE.valid)
halfEdges.erase(edgeE.it) ;
edgeE = &(halfEdgeInfo[m.phi_1(dd)]) ;
if(edgeE->valid)
halfEdges.erase(edgeE->it) ;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment