diff --git a/vcg/complex/algorithms/isotropic_remeshing.h b/vcg/complex/algorithms/isotropic_remeshing.h index afb5f888..e988dc13 100644 --- a/vcg/complex/algorithms/isotropic_remeshing.h +++ b/vcg/complex/algorithms/isotropic_remeshing.h @@ -166,26 +166,7 @@ private: maxQ = distr.Percentile(0.9f); minQ = distr.Percentile(0.1f); } - static inline void forEachFacePos(MeshType &m, std::function action) - { - for(auto fi=m.face.begin();fi!=m.face.end();++fi) - if(!(*fi).IsD()) - { - for(int i=0;i<3;++i) - { - PosType pi(&*fi,i); - action(pi); - } - } - } - static inline void forEachFace(MeshType &m, std::function action) - { - for(auto fi=m.face.begin();fi!=m.face.end();++fi) - if(!(*fi).IsD()) - { - action(*fi); - } - } + //Computes PerVertexQuality as a function of the 'deviation' of the normals taken from //the faces incident to each vertex static void computeQuality(MeshType &m) @@ -300,7 +281,7 @@ private: static void ImproveValence(MeshType &m, Params ¶ms) { tri::UpdateTopology::FaceFace(m); //collapser does not update FF - forEachFacePos(m, [&](PosType &p){ + ForEachFacePos(m, [&](PosType &p){ if(p.FFlip() > p.F()) if(((!params.selectedOnly) || (p.F()->IsS() && p.FFlip()->IsS())) && testSwap(p, params.creaseAngleCosThr) && @@ -635,7 +616,7 @@ private: { int count = 0; - forEachFacePos(m, [&](PosType &p){ + ForEachFacePos(m, [&](PosType &p){ if((p.FFlip() > p.F()) && testCreaseEdge(p, creaseThr)) { p.V()->SetS();