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

Just a few other size_t vs int clarifications

This commit is contained in:
Paolo Cignoni 2014-08-09 00:02:52 +00:00
parent 35d099384f
commit 352d386a53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1283,7 +1283,7 @@ struct PoissonDiskParam
int totalTime; int totalTime;
Point3i gridSize; Point3i gridSize;
int gridCellNum; int gridCellNum;
int sampleNum; size_t sampleNum;
int montecarloSampleNum; int montecarloSampleNum;
}; };
@ -1421,7 +1421,7 @@ static void InitSpatialHashTable(MeshType &montecarloMesh, MontecarloSHT &montec
} }
static void PoissonDiskPruningByNumber(VertexSampler &ps, MeshType &m, static void PoissonDiskPruningByNumber(VertexSampler &ps, MeshType &m,
int sampleNum, ScalarType &diskRadius, size_t sampleNum, ScalarType &diskRadius,
PoissonDiskParam &pp, PoissonDiskParam &pp,
float tolerance=0.04, float tolerance=0.04,
int maxIter=20) int maxIter=20)
@ -1461,7 +1461,7 @@ static void PoissonDiskPruningByNumber(VertexSampler &ps, MeshType &m,
ps.reset(); ps.reset();
curRadius=(RangeMaxRad+RangeMinRad)/2.0f; curRadius=(RangeMaxRad+RangeMinRad)/2.0f;
PoissonDiskPruning(ps, m ,curRadius,pp); PoissonDiskPruning(ps, m ,curRadius,pp);
qDebug("PoissonDiskPruning Iteratin (%6.3f:%5i %6.3f:%5i) Cur Radius %f -> %i sample instead of %i",RangeMinRad,RangeMinRadNum,RangeMaxRad,RangeMaxRadNum,curRadius,pp.pds.sampleNum,sampleNum); qDebug("PoissonDiskPruning Iteratin (%6.3f:%5lu %6.3f:%5lu) Cur Radius %f -> %lu sample instead of %lu",RangeMinRad,RangeMinRadNum,RangeMaxRad,RangeMaxRadNum,curRadius,pp.pds.sampleNum,sampleNum);
if(pp.pds.sampleNum > sampleNum){ if(pp.pds.sampleNum > sampleNum){
RangeMinRad = curRadius; RangeMinRad = curRadius;
RangeMinRadNum = pp.pds.sampleNum; RangeMinRadNum = pp.pds.sampleNum;