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

modify generatePoissonDisk taking into account spatial hash properties

This commit is contained in:
Massimiliano Corsini 2009-01-20 11:06:12 +00:00
parent f1ef838535
commit 226d111f9c
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vcg/complex/trimesh/point_sampling.h
View File

@ -666,16 +666,13 @@ static CoordType RandomBox(vcg::Box3<ScalarType> box)
}
// generate Poisson-disk sample using a set of pre-generated samples (with the Montecarlo algorithm)
static bool generatePoissonDiskSample(Point3i *cell, MontecarloSHT & samplepool, vcg::Point3<ScalarType> & p)
// It always return a point.
static vcg::Point3<ScalarType> generatePoissonDiskSample(Point3i *cell, MontecarloSHT & samplepool)
{
MontecarloSHTIterator cellBegin;
MontecarloSHTIterator cellEnd;
samplepool.Grid(*cell, cellBegin, cellEnd);
assert(cellBegin != cellEnd);
p = (*cellBegin)->P();
return true;
return (*cellBegin)->P();
}
// check the radius constrain
@ -795,8 +792,6 @@ static void Poissondisk(MetroMesh &origMesh, VertexSampler &ps, MetroMesh &monte
vcg::Box3<ScalarType> currentBox;
vcg::Point3<ScalarType > s; // current sample
int level = 0;
bool validsample;
bool acceptedsample;
do
{
@ -833,20 +828,10 @@ static void Poissondisk(MetroMesh &origMesh, VertexSampler &ps, MetroMesh &monte
currentCell = activeCells[i];
// generate a sample chosen from the pre-generated one
validsample = generatePoissonDiskSample(currentCell, montecarloSHT, s);
s = generatePoissonDiskSample(currentCell, montecarloSHT);
samplesgenerated[level]++;
if (validsample)
{
// sample is valid
acceptedsample = checkPoissonDisk(*ps.m, checkSHT, s, r);
}
else
{
acceptedsample = false;
}
if (acceptedsample)
if (checkPoissonDisk(*ps.m, checkSHT, s, r))
{
// add sample
tri::Allocator<MetroMesh>::AddVertices(supportMesh,1);