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

Corrected a small bug in the poisson sampling exact number helper.

This commit is contained in:
Paolo Cignoni 2014-05-23 15:05:16 +00:00
parent 2916ad7207
commit 28d838ca49
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vcg/complex/algorithms/point_sampling.h
View File

@ -1908,27 +1908,27 @@ void PoissonPruningExact(MeshType &m, /// the mesh that has to be pruned
float tolerance=0.04, float tolerance=0.04,
int maxIter=20) int maxIter=20)
{ {
size_t sampleNumMin = int(float(sampleNum)*(1.0f-tolerance)); size_t sampleNumMin = int(float(sampleNum)*(1.0f-tolerance)); // the expected values range.
size_t sampleNumMax = int(float(sampleNum)*(1.0f+tolerance)); size_t sampleNumMax = int(float(sampleNum)*(1.0f+tolerance)); // e.g. any sampling in [sampleNumMin, sampleNumMax] is OK
float RangeMinRad = m.bbox.Diag()/10.0f; float RangeMinRad = m.bbox.Diag()/10.0f;
float RangeMaxRad = m.bbox.Diag()/10.0f; float RangeMaxRad = m.bbox.Diag()/10.0f;
size_t RangeMinNum; size_t RangeMinSampleNum;
size_t RangeMaxNum; size_t RangeMaxSampleNum;
std::vector<typename MeshType::VertexPointer> poissonSamplesTmp; std::vector<typename MeshType::VertexPointer> poissonSamplesTmp;
do do
{ {
RangeMinRad/=2.0f; RangeMinRad/=2.0f;
PoissonPruning(m,poissonSamplesTmp,RangeMinRad); PoissonPruning(m,poissonSamplesTmp,RangeMinRad);
RangeMinNum = poissonSamplesTmp.size(); RangeMinSampleNum = poissonSamplesTmp.size();
} while(RangeMinNum > sampleNumMin); } while(RangeMinSampleNum < sampleNumMin);
do do
{ {
RangeMaxRad*=2.0f; RangeMaxRad*=2.0f;
PoissonPruning(m,poissonSamplesTmp,RangeMaxRad); PoissonPruning(m,poissonSamplesTmp,RangeMaxRad);
RangeMaxNum = poissonSamplesTmp.size(); RangeMaxSampleNum = poissonSamplesTmp.size();
} while(RangeMaxNum < sampleNumMax); } while(RangeMaxSampleNum > sampleNumMax);
float curRadius; float curRadius;
int iterCnt=0; int iterCnt=0;
@ -1937,7 +1937,7 @@ void PoissonPruningExact(MeshType &m, /// the mesh that has to be pruned
{ {
curRadius=(RangeMaxRad+RangeMinRad)/2.0f; curRadius=(RangeMaxRad+RangeMinRad)/2.0f;
PoissonPruning(m,poissonSamplesTmp,curRadius); PoissonPruning(m,poissonSamplesTmp,curRadius);
qDebug("(%6.3f:%5i %6.3f:%5i) Cur Radius %f -> %i sample instead of %i",RangeMinRad,RangeMinNum,RangeMaxRad,RangeMaxNum,curRadius,poissonSamplesTmp.size(),sampleNum); //qDebug("(%6.3f:%5i %6.3f:%5i) Cur Radius %f -> %i sample instead of %i",RangeMinRad,RangeMinSampleNum,RangeMaxRad,RangeMaxSampleNum,curRadius,poissonSamplesTmp.size(),sampleNum);
if(poissonSamplesTmp.size() > sampleNum) if(poissonSamplesTmp.size() > sampleNum)
RangeMinRad = curRadius; RangeMinRad = curRadius;
if(poissonSamplesTmp.size() < sampleNum) if(poissonSamplesTmp.size() < sampleNum)