From 18c0ac1681df34b26f64f8548d0363c9106658e7 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 19 Feb 2014 14:38:54 +0000 Subject: [PATCH] Refactored selection face from vertices algorithms and added requiremnts for triangular mesh for the algorithm selecting vertices starting from face border flag --- vcg/complex/algorithms/update/selection.h | 186 +++++++++++----------- 1 file changed, 91 insertions(+), 95 deletions(-) diff --git a/vcg/complex/algorithms/update/selection.h b/vcg/complex/algorithms/update/selection.h index 684f85af..66aef890 100644 --- a/vcg/complex/algorithms/update/selection.h +++ b/vcg/complex/algorithms/update/selection.h @@ -8,7 +8,7 @@ * \ * * All rights reserved. * * * -* This program is free software; you can redistribute it and/or modify * +* This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * @@ -118,12 +118,12 @@ private: }; -/// \ingroup trimesh +/// \ingroup trimesh /// \headerfile selection.h vcg/complex/algorithms/update/selection.h /// \brief Management, updating and computation of per-vertex and per-face normals. -/** +/** This class is used to compute or update the normals that can be stored in the vertex or face component of a mesh. */ @@ -132,7 +132,7 @@ class UpdateSelection { public: -typedef ComputeMeshType MeshType; +typedef ComputeMeshType MeshType; typedef typename MeshType::ScalarType ScalarType; typedef typename MeshType::VertexType VertexType; typedef typename MeshType::VertexPointer VertexPointer; @@ -145,48 +145,48 @@ typedef typename vcg::Box3 Box3Type; static size_t VertexAll(MeshType &m) { - VertexIterator vi; - for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) - if( !(*vi).IsD() ) (*vi).SetS(); + VertexIterator vi; + for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) + if( !(*vi).IsD() ) (*vi).SetS(); return m.vn; } - + static size_t EdgeAll(MeshType &m) { - EdgeIterator ei; - for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) - if( !(*ei).IsD() ) (*ei).SetS(); + EdgeIterator ei; + for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) + if( !(*ei).IsD() ) (*ei).SetS(); return m.fn; } static size_t FaceAll(MeshType &m) { - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) - if( !(*fi).IsD() ) (*fi).SetS(); + FaceIterator fi; + for(fi = m.face.begin(); fi != m.face.end(); ++fi) + if( !(*fi).IsD() ) (*fi).SetS(); return m.fn; } static size_t VertexClear(MeshType &m) { - VertexIterator vi; - for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) - if( !(*vi).IsD() ) (*vi).ClearS(); + VertexIterator vi; + for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) + if( !(*vi).IsD() ) (*vi).ClearS(); return 0; } static size_t EdgeClear(MeshType &m) { - EdgeIterator ei; - for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) - if( !(*ei).IsD() ) (*ei).ClearS(); + EdgeIterator ei; + for(ei = m.edge.begin(); ei != m.edge.end(); ++ei) + if( !(*ei).IsD() ) (*ei).ClearS(); return 0; } static size_t FaceClear(MeshType &m) { - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) - if( !(*fi).IsD() ) (*fi).ClearS(); + FaceIterator fi; + for(fi = m.face.begin(); fi != m.face.end(); ++fi) + if( !(*fi).IsD() ) (*fi).ClearS(); return 0; } @@ -200,7 +200,7 @@ static void Clear(MeshType &m) static size_t FaceCount(MeshType &m) { size_t selCnt=0; - FaceIterator fi; + FaceIterator fi; for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD() && (*fi).IsS()) ++selCnt; return selCnt; @@ -218,7 +218,7 @@ static size_t EdgeCount(MeshType &m) static size_t VertexCount(MeshType &m) { size_t selCnt=0; - VertexIterator vi; + VertexIterator vi; for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD() && (*vi).IsS()) ++selCnt; return selCnt; @@ -227,34 +227,34 @@ static size_t VertexCount(MeshType &m) static size_t FaceInvert(MeshType &m) { size_t selCnt=0; - FaceIterator fi; + FaceIterator fi; for(fi=m.face.begin();fi!=m.face.end();++fi) - if(!(*fi).IsD()) + if(!(*fi).IsD()) { - if((*fi).IsS()) (*fi).ClearS(); + if((*fi).IsS()) (*fi).ClearS(); else { - (*fi).SetS(); + (*fi).SetS(); ++selCnt; } } return selCnt; -} +} static size_t VertexInvert(MeshType &m) { size_t selCnt=0; - VertexIterator vi; + VertexIterator vi; for(vi=m.vert.begin();vi!=m.vert.end();++vi) - if(!(*vi).IsD()) + if(!(*vi).IsD()) { - if((*vi).IsS()) (*vi).ClearS(); + if((*vi).IsS()) (*vi).ClearS(); else { - (*vi).SetS(); + (*vi).SetS(); ++selCnt; } } return selCnt; -} +} /// \brief Select all the vertices that are touched by at least a single selected faces static size_t VertexFromFaceLoose(MeshType &m, bool preserveSelection=false) @@ -299,20 +299,19 @@ static size_t VertexFromFaceStrict(MeshType &m) return VertexCount(m); } -/// \brief Select ONLY the faces with ALL the vertices selected +/// \brief Select ONLY the faces with ALL the vertices selected static size_t FaceFromVertexStrict(MeshType &m) { size_t selCnt=0; - int i=0; - FaceClear(m); - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) + FaceClear(m); + for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) 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()) - break; - if(i == (*fi).VN()) + selFlag =false; + if(selFlag) { (*fi).SetS(); ++selCnt; @@ -325,17 +324,15 @@ static size_t FaceFromVertexStrict(MeshType &m) static size_t FaceFromVertexLoose(MeshType &m) { size_t selCnt=0; - int i=0; - FaceClear(m); - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) - if( !(*fi).IsD() && !(*fi).IsS()) + FaceClear(m); + for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) + if( !(*fi).IsD()) { + bool selVert=false; for(int i = 0; i < (*fi).VN(); ++i) - if((*fi).V(i)->IsS()) - break; - if(i < (*fi).VN()) - { + if((*fi).V(i)->IsS()) selVert=true; + + if(selVert) { (*fi).SetS(); ++selCnt; } @@ -363,24 +360,23 @@ static size_t VertexFromBorderFlag(MeshType &m) static size_t FaceFromBorderFlag(MeshType &m) { + tri::RequireTriangularMesh(m); size_t selCnt=0; - int i=0; - FaceClear(m); - FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) - if( !(*fi).IsD() ) + FaceClear(m); + for(FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) + if( !(*fi).IsD() ) { - for(int i = 0; i < (*fi).VN(); ++i) - if((*fi).IsB(i)) - break; - if(i < (*fi).VN()) - { + bool bordFlag=false; + for(int i = 0; i < 3; ++i) + if((*fi).IsB(i)) bordFlag=true; + if(bordFlag) + { (*fi).SetS(); ++selCnt; } } return selCnt; -} +} /// \brief This function select the faces that have an edge outside the given range. static size_t FaceOutOfRangeEdge(MeshType &m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits::max)()) @@ -406,39 +402,39 @@ static size_t FaceOutOfRangeEdge(MeshType &m, ScalarType MinEdgeThr=0, ScalarTyp return count_fd; } -/// \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) { - // it also assumes that the FF adjacency is well computed. - assert (HasFFAdjacency(m)); - UpdateFlags::FaceClearV(m); - - std::deque visitStack; + // it also assumes that the FF adjacency is well computed. + assert (HasFFAdjacency(m)); + UpdateFlags::FaceClearV(m); + + std::deque visitStack; size_t selCnt=0; FaceIterator fi; - for(fi = m.face.begin(); fi != m.face.end(); ++fi) - if( !(*fi).IsD() && (*fi).IsS() && !(*fi).IsV() ) - visitStack.push_back(&*fi); - - while(!visitStack.empty()) + for(fi = m.face.begin(); fi != m.face.end(); ++fi) + if( !(*fi).IsD() && (*fi).IsS() && !(*fi).IsV() ) + visitStack.push_back(&*fi); + + while(!visitStack.empty()) { - FacePointer fp = visitStack.front(); - visitStack.pop_front(); - assert(!fp->IsV()); - fp->SetV(); + FacePointer fp = visitStack.front(); + visitStack.pop_front(); + assert(!fp->IsV()); + fp->SetV(); for(int i=0;iVN();++i) { - FacePointer ff = fp->FFp(i); - if(! ff->IsS()) - { - ff->SetS(); - ++selCnt; - visitStack.push_back(ff); - assert(!ff->IsV()); - } + FacePointer ff = fp->FFp(i); + if(! ff->IsS()) + { + ff->SetS(); + ++selCnt; + visitStack.push_back(ff); + assert(!ff->IsV()); + } } } return selCnt; -} +} /// \brief Select ONLY the faces whose quality is in the specified closed interval. static size_t FaceFromQualityRange(MeshType &m,float minq, float maxq) { @@ -458,21 +454,21 @@ static size_t FaceFromQualityRange(MeshType &m,float minq, float maxq) return selCnt; } -/// \brief Select ONLY the vertices whose quality is in the specified closed interval. +/// \brief Select ONLY the vertices whose quality is in the specified closed interval. static size_t VertexFromQualityRange(MeshType &m,float minq, float maxq) { size_t selCnt=0; VertexClear(m); - VertexIterator vi; - assert(HasPerVertexQuality(m)); + VertexIterator vi; + assert(HasPerVertexQuality(m)); for(vi=m.vert.begin();vi!=m.vert.end();++vi) - if(!(*vi).IsD()) + if(!(*vi).IsD()) { if( (*vi).Q()>=minq && (*vi).Q()<=maxq ) - { - (*vi).SetS(); - ++selCnt; - } + { + (*vi).SetS(); + ++selCnt; + } } return selCnt; }