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

Updated to reflect the naming changes in updateNormals

This commit is contained in:
Paolo Cignoni 2012-10-09 08:00:25 +00:00
parent f9b2088e12
commit ba4a51e02d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcg/complex/algorithms/clean.h
View File

@ -1316,8 +1316,8 @@ private:
{ {
if(m.vert.empty()) return false; if(m.vert.empty()) return false;
tri::UpdateNormals<MeshType>::PerVertexAngleWeighted(m); tri::UpdateNormal<MeshType>::PerVertexAngleWeighted(m);
tri::UpdateNormals<MeshType>::NormalizePerVertex(m); tri::UpdateNormal<MeshType>::NormalizePerVertex(m);
std::vector< VertexPointer > minVertVec; std::vector< VertexPointer > minVertVec;
std::vector< VertexPointer > maxVertVec; std::vector< VertexPointer > maxVertVec;
@ -1407,7 +1407,7 @@ private:
} }
} }
// tri::UpdateNormals<MeshType>::PerFace(m); // tri::UpdateNormal<MeshType>::PerFace(m);
} }
while( repeat && count ); while( repeat && count );
return total; return total;
@ -1456,7 +1456,7 @@ private:
} }
} }
// tri::UpdateNormals<MeshType>::PerFace(m); // tri::UpdateNormal<MeshType>::PerFace(m);
} }
while( repeat && count ); while( repeat && count );
return total; return total;

10
vcg/complex/algorithms/smooth.h
View File

@ -914,7 +914,7 @@ static void FaceNormalLaplacianVF(MeshType &m)
FaceIterator fi; FaceIterator fi;
tri::UpdateNormals<MeshType>::AreaNormalizeFace(m); tri::UpdateNormal<MeshType>::AreaNormalizeFace(m);
for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD())
{ {
@ -948,7 +948,7 @@ static void FaceNormalLaplacianVF(MeshType &m)
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
(*fi).N()=TDF[*fi].m; (*fi).N()=TDF[*fi].m;
tri::UpdateNormals<MeshType>::NormalizePerFace(m); tri::UpdateNormal<MeshType>::NormalizePerFace(m);
TDF.Stop(); TDF.Stop();
} }
@ -968,7 +968,7 @@ static void FaceNormalLaplacianFF(MeshType &m, int step=1, bool SmoothSelected=f
assert(tri::HasFFAdjacency(m)); assert(tri::HasFFAdjacency(m));
FaceIterator fi; FaceIterator fi;
tri::UpdateNormals<MeshType>::NormalizePerFaceByArea(m); tri::UpdateNormal<MeshType>::NormalizePerFaceByArea(m);
for(int iStep=0;iStep<step;++iStep) for(int iStep=0;iStep<step;++iStep)
{ {
for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()) for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD())
@ -984,7 +984,7 @@ static void FaceNormalLaplacianFF(MeshType &m, int step=1, bool SmoothSelected=f
if(!SmoothSelected || (*fi).IsS()) if(!SmoothSelected || (*fi).IsS())
(*fi).N()=TDF[*fi].m; (*fi).N()=TDF[*fi].m;
tri::UpdateNormals<MeshType>::NormalizePerFace(m); tri::UpdateNormal<MeshType>::NormalizePerFace(m);
} }
} }
@ -1200,7 +1200,7 @@ static void VertexCoordPasoDoble(MeshType &m, int step, typename MeshType::Scala
for(int j=0;j<step;++j) for(int j=0;j<step;++j)
{ {
vcg::tri::UpdateNormals<MeshType>::PerFace(m); vcg::tri::UpdateNormal<MeshType>::PerFace(m);
FaceNormalAngleThreshold(m,TDF,Sigma); FaceNormalAngleThreshold(m,TDF,Sigma);
for(int k=0;k<FitStep;k++) for(int k=0;k<FitStep;k++)
FitMesh(m,TDV,TDF,FitLambda); FitMesh(m,TDV,TDF,FitLambda);