From 8c15e83600f08442fe8494a3ade5880cfed494a6 Mon Sep 17 00:00:00 2001 From: korialis Date: Thu, 2 Dec 2021 10:07:33 +0100 Subject: [PATCH] restore valence counting with vfstarvf --- vcg/complex/algorithms/isotropic_remeshing.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/vcg/complex/algorithms/isotropic_remeshing.h b/vcg/complex/algorithms/isotropic_remeshing.h index 5ddfa7d2..aa142888 100644 --- a/vcg/complex/algorithms/isotropic_remeshing.h +++ b/vcg/complex/algorithms/isotropic_remeshing.h @@ -619,26 +619,30 @@ private: std::vector incident; - // vcg::face::VVStarVF(tp.V(), incident); - idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); + vcg::face::VVStarVF(tp.V(), incident); + idealV = idealValence(tp); + actualV = int(incident.size()); //tp.NumberOfIncidentVertices(); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1)); tp.NextF();tp.FlipE();tp.FlipV(); const VertexType *v1=tp.V(); - // vcg::face::VVStarVF(tp.V(), incident); - idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); + vcg::face::VVStarVF(tp.V(), incident); + idealV = idealValence(tp); + actualV = int(incident.size()); //tp.NumberOfIncidentVertices(); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV + 1)); tp.FlipE();tp.FlipV();tp.FlipE(); const VertexType *v2=tp.V(); - // vcg::face::VVStarVF(tp.V(), incident); - idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); + vcg::face::VVStarVF(tp.V(), incident); + idealV = idealValence(tp); + actualV = int(incident.size()); //tp.NumberOfIncidentVertices(); oldDist += abs(idealV - actualV); newDist += abs(idealV - (actualV - 1)); tp.NextF();tp.FlipE();tp.FlipV(); const VertexType *v3=tp.V(); - // vcg::face::VVStarVF(tp.V(), incident); - idealV = idealValence(tp); actualV = tp.NumberOfIncidentVertices();//int(incident.size()); + vcg::face::VVStarVF(tp.V(), incident); + idealV = idealValence(tp); + actualV = int(incident.size());//tp.NumberOfIncidentVertices(); 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()));