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

added selection to the pasodoble smoothing

This commit is contained in:
Paolo Cignoni 2007-11-05 23:47:20 +00:00
parent c2f8cdac1f
commit b50e3f7760
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/complex/trimesh/smooth.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.14 2007/03/27 09:40:47 cignoni
Changed use of selected to visited flags. Improved variable namings and comments
Revision 1.13 2006/11/07 15:13:56 zifnab1974 Revision 1.13 2006/11/07 15:13:56 zifnab1974
Necessary changes for compilation with gcc 3.4.6. Especially the hash function is a problem Necessary changes for compilation with gcc 3.4.6. Especially the hash function is a problem
@ -819,7 +822,8 @@ void FitMesh(MESH_TYPE &m,
template<class MESH_TYPE> template<class MESH_TYPE>
void FastFitMesh(MESH_TYPE &m, void FastFitMesh(MESH_TYPE &m,
SimpleTempData<typename MESH_TYPE::VertContainer, PDVertInfo<typename MESH_TYPE::ScalarType> > &TDV, SimpleTempData<typename MESH_TYPE::VertContainer, PDVertInfo<typename MESH_TYPE::ScalarType> > &TDV,
SimpleTempData<typename MESH_TYPE::FaceContainer, PDFaceInfo<typename MESH_TYPE::ScalarType> > &TDF) SimpleTempData<typename MESH_TYPE::FaceContainer, PDFaceInfo<typename MESH_TYPE::ScalarType> > &TDF,
bool OnlySelected=false)
{ {
//vcg::face::Pos<typename MESH_TYPE::FaceType> ep; //vcg::face::Pos<typename MESH_TYPE::FaceType> ep;
vcg::face::VFIterator<typename MESH_TYPE::FaceType> ep; vcg::face::VFIterator<typename MESH_TYPE::FaceType> ep;
@ -842,9 +846,16 @@ void FastFitMesh(MESH_TYPE &m,
TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt); TDV[*vi].np=(*vi).P()+ Sum*(1.0/cnt);
} }
for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(OnlySelected)
{
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if((*vi).IsS()) (*vi).P()=TDV[*vi].np;
}
else
{
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
(*vi).P()=TDV[*vi].np; (*vi).P()=TDV[*vi].np;
}
} }
@ -910,7 +921,7 @@ void PasoDobleSmoothFast(MeshType &m, int step, typename MeshType::ScalarType Si
NormalSmooth<MeshType>(m,TDF,Sigma); NormalSmooth<MeshType>(m,TDF,Sigma);
for(int j=0;j<FitStep;++j) for(int j=0;j<FitStep;++j)
FastFitMesh<MeshType>(m,TDV,TDF); FastFitMesh<MeshType>(m,TDV,TDF,SmoothSelected);