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

restore valence counting with vfstarvf

This commit is contained in:
korialis 2021-12-02 10:07:33 +01:00
parent be8f3e773f
commit 8c15e83600
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vcg/complex/algorithms/isotropic_remeshing.h
View File

@ -619,26 +619,30 @@ private:
std::vector<VertexType*> incident; std::vector<VertexType*> incident;
// vcg::face::VVStarVF<FaceType>(tp.V(), incident); vcg::face::VVStarVF<FaceType>(tp.V(), incident);
idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); idealV = idealValence(tp);
actualV = int(incident.size()); //tp.NumberOfIncidentVertices();
oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1)); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1));
tp.NextF();tp.FlipE();tp.FlipV(); tp.NextF();tp.FlipE();tp.FlipV();
const VertexType *v1=tp.V(); const VertexType *v1=tp.V();
// vcg::face::VVStarVF<FaceType>(tp.V(), incident); vcg::face::VVStarVF<FaceType>(tp.V(), incident);
idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); idealV = idealValence(tp);
actualV = int(incident.size()); //tp.NumberOfIncidentVertices();
oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV + 1)); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV + 1));
tp.FlipE();tp.FlipV();tp.FlipE(); tp.FlipE();tp.FlipV();tp.FlipE();
const VertexType *v2=tp.V(); const VertexType *v2=tp.V();
// vcg::face::VVStarVF<FaceType>(tp.V(), incident); vcg::face::VVStarVF<FaceType>(tp.V(), incident);
idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); idealV = idealValence(tp);
actualV = int(incident.size()); //tp.NumberOfIncidentVertices();
oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1)); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1));
tp.NextF();tp.FlipE();tp.FlipV(); tp.NextF();tp.FlipE();tp.FlipV();
const VertexType *v3=tp.V(); const VertexType *v3=tp.V();
// vcg::face::VVStarVF<FaceType>(tp.V(), incident); vcg::face::VVStarVF<FaceType>(tp.V(), incident);
idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); idealV = idealValence(tp);
actualV = int(incident.size());//tp.NumberOfIncidentVertices();
oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV + 1)); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV + 1));
const ScalarType qOld = std::min(Quality(v0->P(),v2->P(),v3->P()),Quality(v0->P(),v1->P(),v2->P())); const ScalarType qOld = std::min(Quality(v0->P(),v2->P(),v3->P()),Quality(v0->P(),v1->P(),v2->P()));