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

Added perturbation to the voronoi seed relaxing

This commit is contained in:
Paolo Cignoni 2014-09-07 21:36:30 +00:00
parent a78ac53814
commit 053b649ed2
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,9 @@ struct VoronoiProcessingParameter
geodesicRelaxFlag = true; geodesicRelaxFlag = true;
relaxOnlyConstrainedFlag=false; relaxOnlyConstrainedFlag=false;
refinementRatio = 5.0f; refinementRatio = 5.0f;
seedPerturbationProbability=0;
seedPerturbationAmount = 0.001f;
} }
int colorStrategy; int colorStrategy;
@ -82,6 +85,8 @@ struct VoronoiProcessingParameter
/// triangulation that is dense enough to well approximate the voronoi diagram. /// triangulation that is dense enough to well approximate the voronoi diagram.
/// reasonable values are in the range 4..10. It is used by PreprocessForVoronoi and this value /// reasonable values are in the range 4..10. It is used by PreprocessForVoronoi and this value
/// says how many triangles you should expect in a voronoi region of a given radius. /// says how many triangles you should expect in a voronoi region of a given radius.
float seedPerturbationProbability; /// if true at each iteration step each seed has the given probability to be perturbed a little.
float seedPerturbationAmount; /// As a bbox diag fraction (e.g. in the 0..1 range).
// Convertion to Voronoi Diagram Parameters // Convertion to Voronoi Diagram Parameters
@ -109,6 +114,12 @@ 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:
typedef typename MeshType::template PerVertexAttributeHandle<VertexPointer> PerVertexPointerHandle; typedef typename MeshType::template PerVertexAttributeHandle<VertexPointer> PerVertexPointerHandle;
@ -1180,20 +1191,13 @@ static void FixVertexVector(MeshType &m, std::vector<VertexType *> &vertToFixVec
} }
static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &seedVec, static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<CoordType> &seedPosVec,
std::vector<bool> &fixedVec,
int relaxStep, int relaxStep,
VoronoiProcessingParameter &vpp, VoronoiProcessingParameter &vpp,
vcg::CallBackPos *cb=0) vcg::CallBackPos *cb=0)
{ {
PerVertexPointerHandle sources = tri::Allocator<MeshType>:: template GetPerVertexAttribute<VertexPointer> (m,"sources");
PerVertexBoolHandle fixed = tri::Allocator<MeshType>:: template GetPerVertexAttribute<bool> (m,"fixed");
PerVertexFloatHandle area = tri::Allocator<MeshType>:: template GetPerVertexAttribute<float> (m,"area"); PerVertexFloatHandle area = tri::Allocator<MeshType>:: template GetPerVertexAttribute<float> (m,"area");
std::vector<bool> fixedVec;
std::vector<CoordType> seedPosVec;
for(size_t i=0;i<seedVec.size();++i){
seedPosVec.push_back(seedVec[i]->P());
fixedVec.push_back(fixed[seedVec[i]]);
}
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
area[vi]=0; area[vi]=0;
@ -1207,7 +1211,7 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
assert(m.vn > seedPosVec.size()*20); assert(m.vn > seedPosVec.size()*20);
int i; int i;
ScalarType perturb = m.bbox.Diag()*vpp.seedPerturbationAmount;
for(i=0;i<relaxStep;++i) for(i=0;i<relaxStep;++i)
{ {
// Kdtree for the seeds must be rebuilt at each step; // Kdtree for the seeds must be rebuilt at each step;
@ -1221,7 +1225,6 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
ScalarType sqdist; ScalarType sqdist;
seedTree.doQueryClosest(vi->P(),seedInd,sqdist); seedTree.doQueryClosest(vi->P(),seedInd,sqdist);
vi->Q()=sqrt(sqdist); vi->Q()=sqrt(sqdist);
sources[vi]=seedVec[seedInd];
sumVec[seedInd].first+=area[vi]; sumVec[seedInd].first+=area[vi];
sumVec[seedInd].second+=vi->cP()*area[vi]; sumVec[seedInd].second+=vi->cP()*area[vi];
} }
@ -1229,7 +1232,7 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
vector<CoordType> newseedVec; vector<CoordType> newseedVec;
vector<bool> newfixedVec; vector<bool> newfixedVec;
for(int i=0;i<seedPosVec.size();++i) for(size_t i=0;i<seedPosVec.size();++i)
{ {
if(fixedVec[i]) if(fixedVec[i])
{ {
@ -1241,6 +1244,8 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
if(sumVec[i].first != 0) if(sumVec[i].first != 0)
{ {
newseedVec.push_back(sumVec[i].second /ScalarType(sumVec[i].first)); newseedVec.push_back(sumVec[i].second /ScalarType(sumVec[i].first));
if(vpp.seedPerturbationProbability > RandomGenerator().generate01())
newseedVec.back()+=math::GeneratePointInUnitBallUniform<ScalarType,math::MarsenneTwisterRNG>( RandomGenerator())*perturb;
newfixedVec.push_back(false); newfixedVec.push_back(false);
} }
} }
@ -1249,8 +1254,7 @@ static int RestrictedVoronoiRelaxing(MeshType &m, std::vector<VertexType *> &see
std::swap(fixedVec,newfixedVec); std::swap(fixedVec,newfixedVec);
tri::UpdateColor<MeshType>::PerVertexQualityRamp(m); tri::UpdateColor<MeshType>::PerVertexQualityRamp(m);
} }
return relaxStep;
SeedToVertexConversion(m,seedPosVec,seedVec);
} }
/// \brief Perform a Lloyd relaxation cycle over a mesh /// \brief Perform a Lloyd relaxation cycle over a mesh