From bb87d68927ddce660c25816e861d80245934a74e Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Sun, 23 Sep 2018 16:20:52 +0200 Subject: [PATCH] restored vertex perturbation in the voronoi remesher --- vcg/complex/algorithms/voronoi_processing.h | 10 +++++----- vcg/complex/algorithms/voronoi_remesher.h | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/vcg/complex/algorithms/voronoi_processing.h b/vcg/complex/algorithms/voronoi_processing.h index 7fc83e58..008c5e91 100644 --- a/vcg/complex/algorithms/voronoi_processing.h +++ b/vcg/complex/algorithms/voronoi_processing.h @@ -114,13 +114,13 @@ class VoronoiProcessing typedef typename MeshType::FaceContainer FaceContainer; typedef typename tri::Geodesic::VertDist VertDist; - static math::MarsenneTwisterRNG &RandomGenerator() - { - static math::MarsenneTwisterRNG rnd; - return rnd; - } public: + static math::MarsenneTwisterRNG &RandomGenerator() + { + static math::MarsenneTwisterRNG rnd; + return rnd; + } typedef typename MeshType::template PerVertexAttributeHandle PerVertexPointerHandle; typedef typename MeshType::template PerVertexAttributeHandle PerVertexBoolHandle; diff --git a/vcg/complex/algorithms/voronoi_remesher.h b/vcg/complex/algorithms/voronoi_remesher.h index 82d58d63..3f206494 100644 --- a/vcg/complex/algorithms/voronoi_remesher.h +++ b/vcg/complex/algorithms/voronoi_remesher.h @@ -430,12 +430,13 @@ protected: // TODO: rimettere a posto // restricted relaxation with fixed points -// vpp.seedPerturbationProbability = 0.2f; // old values -// vpp.seedPerturbationAmount = 0.005f; -// Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep, vpp); -// vpp.seedPerturbationProbability = 0.0f; -// Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep/2, vpp); + Voronoi::RandomGenerator().initialize(5489u); + vpp.seedPerturbationProbability = 0.2f; + vpp.seedPerturbationAmount = 0.005f; Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep, vpp); + vpp.seedPerturbationProbability = 0.0f; + Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep/2, vpp); +// Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep, vpp); #ifdef DEBUG_VORO