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

restored vertex perturbation in the voronoi remesher

This commit is contained in:
Luigi Malomo 2018-09-23 16:20:52 +02:00
parent abd332b6dc
commit bb87d68927
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,13 +114,13 @@ class VoronoiProcessing
typedef typename MeshType::FaceContainer FaceContainer; typedef typename MeshType::FaceContainer FaceContainer;
typedef typename tri::Geodesic<MeshType>::VertDist VertDist; typedef typename tri::Geodesic<MeshType>::VertDist VertDist;
static math::MarsenneTwisterRNG &RandomGenerator()
{
static math::MarsenneTwisterRNG rnd;
return rnd;
}
public: public:
static math::MarsenneTwisterRNG &RandomGenerator()
{
static math::MarsenneTwisterRNG rnd;
return rnd;
}
typedef typename MeshType::template PerVertexAttributeHandle<VertexPointer> PerVertexPointerHandle; typedef typename MeshType::template PerVertexAttributeHandle<VertexPointer> PerVertexPointerHandle;
typedef typename MeshType::template PerVertexAttributeHandle<bool> PerVertexBoolHandle; typedef typename MeshType::template PerVertexAttributeHandle<bool> PerVertexBoolHandle;

11
vcg/complex/algorithms/voronoi_remesher.h
View File

@ -430,12 +430,13 @@ protected:
// TODO: rimettere a posto // TODO: rimettere a posto
// restricted relaxation with fixed points // restricted relaxation with fixed points
// vpp.seedPerturbationProbability = 0.2f; // old values Voronoi::RandomGenerator().initialize(5489u);
// vpp.seedPerturbationAmount = 0.005f; vpp.seedPerturbationProbability = 0.2f;
// Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep, vpp); vpp.seedPerturbationAmount = 0.005f;
// vpp.seedPerturbationProbability = 0.0f;
// Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep/2, vpp);
Voronoi::RestrictedVoronoiRelaxing(baseMesh, seedPointVec, seedFixedVec, VoroRelaxationStep, vpp); 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 #ifdef DEBUG_VORO