manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored selection face from vertices algorithms and added requiremnts for triangular mesh for the algorithm selecting vertices starting from face border flag

This commit is contained in:
Paolo Cignoni 2014-02-19 14:38:54 +00:00
parent 85c5274965
commit 18c0ac1681
1 changed files with 91 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
vcg/complex/algorithms/update/selection.h
View File

@ -145,48 +145,48 @@ typedef typename vcg::Box3<ScalarType> Box3Type;
static size_t VertexAll(MeshType &m) static size_t VertexAll(MeshType &m)
{ {
VertexIterator vi; VertexIterator vi;
for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) for(vi = m.vert.begin(); vi != m.vert.end(); ++vi)
if( !(*vi).IsD() ) (*vi).SetS(); if( !(*vi).IsD() ) (*vi).SetS();
return m.vn; return m.vn;
} }
static size_t EdgeAll(MeshType &m) static size_t EdgeAll(MeshType &m)
{ {
EdgeIterator ei; EdgeIterator ei;
for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) for(ei = m.edge.begin(); ei != m.edge.end(); ++ei)
if( !(*ei).IsD() ) (*ei).SetS(); if( !(*ei).IsD() ) (*ei).SetS();
return m.fn; return m.fn;
} }
static size_t FaceAll(MeshType &m) static size_t FaceAll(MeshType &m)
{ {
FaceIterator fi; FaceIterator fi;
for(fi = m.face.begin(); fi != m.face.end(); ++fi) for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD() ) (*fi).SetS(); if( !(*fi).IsD() ) (*fi).SetS();
return m.fn; return m.fn;
} }
static size_t VertexClear(MeshType &m) static size_t VertexClear(MeshType &m)
{ {
VertexIterator vi; VertexIterator vi;
for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) for(vi = m.vert.begin(); vi != m.vert.end(); ++vi)
if( !(*vi).IsD() ) (*vi).ClearS(); if( !(*vi).IsD() ) (*vi).ClearS();
return 0; return 0;
} }
static size_t EdgeClear(MeshType &m) static size_t EdgeClear(MeshType &m)
{ {
EdgeIterator ei; EdgeIterator ei;
for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) for(ei = m.edge.begin(); ei != m.edge.end(); ++ei)
if( !(*ei).IsD() ) (*ei).ClearS(); if( !(*ei).IsD() ) (*ei).ClearS();
return 0; return 0;
} }
static size_t FaceClear(MeshType &m) static size_t FaceClear(MeshType &m)
{ {
FaceIterator fi; FaceIterator fi;
for(fi = m.face.begin(); fi != m.face.end(); ++fi) for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD() ) (*fi).ClearS(); if( !(*fi).IsD() ) (*fi).ClearS();
return 0; return 0;
} }
@ -200,7 +200,7 @@ static void Clear(MeshType &m)
static size_t FaceCount(MeshType &m) static size_t FaceCount(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
FaceIterator fi; FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
if(!(*fi).IsD() && (*fi).IsS()) ++selCnt; if(!(*fi).IsD() && (*fi).IsS()) ++selCnt;
return selCnt; return selCnt;
@ -218,7 +218,7 @@ static size_t EdgeCount(MeshType &m)
static size_t VertexCount(MeshType &m) static size_t VertexCount(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
VertexIterator vi; VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi) for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if(!(*vi).IsD() && (*vi).IsS()) ++selCnt; if(!(*vi).IsD() && (*vi).IsS()) ++selCnt;
return selCnt; return selCnt;
@ -227,7 +227,7 @@ static size_t VertexCount(MeshType &m)
static size_t FaceInvert(MeshType &m) static size_t FaceInvert(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
FaceIterator fi; FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
if(!(*fi).IsD()) if(!(*fi).IsD())
{ {
@ -243,7 +243,7 @@ static size_t FaceInvert(MeshType &m)
static size_t VertexInvert(MeshType &m) static size_t VertexInvert(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
VertexIterator vi; VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi) for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if(!(*vi).IsD()) if(!(*vi).IsD())
{ {
@ -303,16 +303,15 @@ static size_t VertexFromFaceStrict(MeshType &m)
static size_t FaceFromVertexStrict(MeshType &m) static size_t FaceFromVertexStrict(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
int i=0; FaceClear(m);
FaceClear(m); for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
FaceIterator fi;
for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD()) if( !(*fi).IsD())
{ {
for(i = 0; i < (*fi).VN(); ++i) bool selFlag=true;
for(int i = 0; i < (*fi).VN(); ++i)
if(!(*fi).V(i)->IsS()) if(!(*fi).V(i)->IsS())
break; selFlag =false;
if(i == (*fi).VN()) if(selFlag)
{ {
(*fi).SetS(); (*fi).SetS();
++selCnt; ++selCnt;
@ -325,17 +324,15 @@ static size_t FaceFromVertexStrict(MeshType &m)
static size_t FaceFromVertexLoose(MeshType &m) static size_t FaceFromVertexLoose(MeshType &m)
{ {
size_t selCnt=0; size_t selCnt=0;
int i=0; FaceClear(m);
FaceClear(m); for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
FaceIterator fi; if( !(*fi).IsD())
for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD() && !(*fi).IsS())
{ {
bool selVert=false;
for(int i = 0; i < (*fi).VN(); ++i) for(int i = 0; i < (*fi).VN(); ++i)
if((*fi).V(i)->IsS()) if((*fi).V(i)->IsS()) selVert=true;
break;
if(i < (*fi).VN()) if(selVert) {
{
(*fi).SetS(); (*fi).SetS();
++selCnt; ++selCnt;
} }
@ -363,17 +360,16 @@ static size_t VertexFromBorderFlag(MeshType &m)
static size_t FaceFromBorderFlag(MeshType &m) static size_t FaceFromBorderFlag(MeshType &m)
{ {
tri::RequireTriangularMesh(m);
size_t selCnt=0; size_t selCnt=0;
int i=0; FaceClear(m);
FaceClear(m); for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
FaceIterator fi; if( !(*fi).IsD() )
for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD() )
{ {
for(int i = 0; i < (*fi).VN(); ++i) bool bordFlag=false;
if((*fi).IsB(i)) for(int i = 0; i < 3; ++i)
break; if((*fi).IsB(i)) bordFlag=true;
if(i < (*fi).VN()) if(bordFlag)
{ {
(*fi).SetS(); (*fi).SetS();
++selCnt; ++selCnt;
@ -409,32 +405,32 @@ static size_t FaceOutOfRangeEdge(MeshType &m, ScalarType MinEdgeThr=0, ScalarTyp
/// \brief This function expand current selection to cover the whole connected component. /// \brief This function expand current selection to cover the whole connected component.
static size_t FaceConnectedFF(MeshType &m) static size_t FaceConnectedFF(MeshType &m)
{ {
// it also assumes that the FF adjacency is well computed. // it also assumes that the FF adjacency is well computed.
assert (HasFFAdjacency(m)); assert (HasFFAdjacency(m));
UpdateFlags<MeshType>::FaceClearV(m); UpdateFlags<MeshType>::FaceClearV(m);
std::deque<FacePointer> visitStack; std::deque<FacePointer> visitStack;
size_t selCnt=0; size_t selCnt=0;
FaceIterator fi; FaceIterator fi;
for(fi = m.face.begin(); fi != m.face.end(); ++fi) for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if( !(*fi).IsD() && (*fi).IsS() && !(*fi).IsV() ) if( !(*fi).IsD() && (*fi).IsS() && !(*fi).IsV() )
visitStack.push_back(&*fi); visitStack.push_back(&*fi);
while(!visitStack.empty()) while(!visitStack.empty())
{ {
FacePointer fp = visitStack.front(); FacePointer fp = visitStack.front();
visitStack.pop_front(); visitStack.pop_front();
assert(!fp->IsV()); assert(!fp->IsV());
fp->SetV(); fp->SetV();
for(int i=0;i<fp->VN();++i) { for(int i=0;i<fp->VN();++i) {
FacePointer ff = fp->FFp(i); FacePointer ff = fp->FFp(i);
if(! ff->IsS()) if(! ff->IsS())
{ {
ff->SetS(); ff->SetS();
++selCnt; ++selCnt;
visitStack.push_back(ff); visitStack.push_back(ff);
assert(!ff->IsV()); assert(!ff->IsV());
} }
} }
} }
return selCnt; return selCnt;
@ -463,16 +459,16 @@ static size_t VertexFromQualityRange(MeshType &m,float minq, float maxq)
{ {
size_t selCnt=0; size_t selCnt=0;
VertexClear(m); VertexClear(m);
VertexIterator vi; VertexIterator vi;
assert(HasPerVertexQuality(m)); assert(HasPerVertexQuality(m));
for(vi=m.vert.begin();vi!=m.vert.end();++vi) for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if(!(*vi).IsD()) if(!(*vi).IsD())
{ {
if( (*vi).Q()>=minq && (*vi).Q()<=maxq ) if( (*vi).Q()>=minq && (*vi).Q()<=maxq )
{ {
(*vi).SetS(); (*vi).SetS();
++selCnt; ++selCnt;
} }
} }
return selCnt; return selCnt;
} }