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

Moved the removal of faces with edges outside a given range to a selection function into UpdateSelection<>::

This commit is contained in:
Paolo Cignoni 2010-06-16 11:40:14 +00:00
parent 044412a099
commit 79783ac1bb
2 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vcg/complex/trimesh/clean.h
View File

@ -434,30 +434,6 @@ private:
} }
return count_fd; return count_fd;
} }
template<bool Selected>
static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits<ScalarType>::max)())
{
FaceIterator fi;
int count_fd = 0;
MinEdgeThr=MinEdgeThr*MinEdgeThr;
MaxEdgeThr=MaxEdgeThr*MaxEdgeThr;
for(fi=m.face.begin(); fi!=m.face.end();++fi)
if(!(*fi).IsD())
if(!Selected || (*fi).IsS())
{
for(unsigned int i=0;i<3;++i)
{
const ScalarType squaredEdge=SquaredDistance((*fi).V0(i)->cP(),(*fi).V1(i)->cP());
if((squaredEdge<=MinEdgeThr) || (squaredEdge>=MaxEdgeThr) )
{
count_fd++;
Allocator<MeshType>::DeleteFace(m,*fi);
break; // skip the rest of the edges of the tri
}
}
}
return count_fd;
}
// alias for the old style. Kept for backward compatibility // alias for the old style. Kept for backward compatibility
static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);} static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);}
@ -467,11 +443,6 @@ private:
{ {
return RemoveFaceOutOfRangeAreaSel<false>(m,MinAreaThr,MaxAreaThr); return RemoveFaceOutOfRangeAreaSel<false>(m,MinAreaThr,MaxAreaThr);
} }
static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits<ScalarType>::max)())
{
return RemoveFaceOutOfRangeEdgeSel<false>(m,MinEdgeThr,MaxEdgeThr);
}
/** /**
* Is the mesh only composed by quadrilaterals? * Is the mesh only composed by quadrilaterals?

39
vcg/complex/trimesh/update/selection.h
View File

@ -19,20 +19,6 @@
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. * * for more details. *
* * * *
****************************************************************************/
/****************************************************************************
History
$Log: not supported by cvs2svn $
Revision 1.3 2007/04/20 10:11:51 cignoni
Corrected bug in selectionVertexFromFaceStrict
Revision 1.2 2007/02/01 06:37:05 cignoni
Added FaceFromBorder
Revision 1.1 2006/10/16 08:50:58 cignoni
First Working Version
****************************************************************************/ ****************************************************************************/
#ifndef __VCG_TRI_UPDATE_SELECTION #ifndef __VCG_TRI_UPDATE_SELECTION
#define __VCG_TRI_UPDATE_SELECTION #define __VCG_TRI_UPDATE_SELECTION
@ -258,6 +244,31 @@ static size_t FaceFromBorderFlag(MeshType &m)
} }
return 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<ScalarType>::max)())
{
FaceIterator fi;
size_t count_fd = 0;
MinEdgeThr=MinEdgeThr*MinEdgeThr;
MaxEdgeThr=MaxEdgeThr*MaxEdgeThr;
for(fi=m.face.begin(); fi!=m.face.end();++fi)
if(!(*fi).IsD())
{
for(unsigned int i=0;i<3;++i)
{
const ScalarType squaredEdge=SquaredDistance((*fi).V0(i)->cP(),(*fi).V1(i)->cP());
if((squaredEdge<=MinEdgeThr) || (squaredEdge>=MaxEdgeThr) )
{
count_fd++;
(*fi).SetS();
break; // skip the rest of the edges of the tri
}
}
}
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) static size_t FaceConnectedFF(MeshType &m)
{ {