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

Corrected a small bug in the Poisson disk sampling: as an unwanted side effect invoking the sampling will change the size of the bbox of the mesh. Mostly harmless but weird.

This commit is contained in:
Paolo Cignoni 2013-02-23 05:50:27 +00:00
parent 55d278cdff
commit 26392a560b
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,22 +112,23 @@ class TrivialSampler
template <class MetroMesh, class VertexSampler = TrivialSampler< MetroMesh> > template <class MetroMesh, class VertexSampler = TrivialSampler< MetroMesh> >
class SurfaceSampling class SurfaceSampling
{ {
typedef typename MetroMesh::CoordType CoordType; typedef typename MetroMesh::CoordType CoordType;
typedef typename MetroMesh::ScalarType ScalarType; typedef typename MetroMesh::ScalarType ScalarType;
typedef typename MetroMesh::VertexType VertexType; typedef typename MetroMesh::VertexType VertexType;
typedef typename MetroMesh::VertexPointer VertexPointer; typedef typename MetroMesh::VertexPointer VertexPointer;
typedef typename MetroMesh::VertexIterator VertexIterator; typedef typename MetroMesh::VertexIterator VertexIterator;
typedef typename MetroMesh::FacePointer FacePointer; typedef typename MetroMesh::FacePointer FacePointer;
typedef typename MetroMesh::FaceIterator FaceIterator; typedef typename MetroMesh::FaceIterator FaceIterator;
typedef typename MetroMesh::FaceType FaceType; typedef typename MetroMesh::FaceType FaceType;
typedef typename MetroMesh::FaceContainer FaceContainer; typedef typename MetroMesh::FaceContainer FaceContainer;
typedef typename vcg::Box3<ScalarType> BoxType;
typedef typename vcg::SpatialHashTable<FaceType, ScalarType> MeshSHT; typedef typename vcg::SpatialHashTable<FaceType, ScalarType> MeshSHT;
typedef typename vcg::SpatialHashTable<FaceType, ScalarType>::CellIterator MeshSHTIterator; typedef typename vcg::SpatialHashTable<FaceType, ScalarType>::CellIterator MeshSHTIterator;
typedef typename vcg::SpatialHashTable<VertexType, ScalarType> MontecarloSHT; typedef typename vcg::SpatialHashTable<VertexType, ScalarType> MontecarloSHT;
typedef typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator MontecarloSHTIterator; typedef typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator MontecarloSHTIterator;
typedef typename vcg::SpatialHashTable<VertexType, ScalarType> SampleSHT; typedef typename vcg::SpatialHashTable<VertexType, ScalarType> SampleSHT;
typedef typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator SampleSHTIterator; typedef typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator SampleSHTIterator;
public: public:
@ -1186,11 +1187,12 @@ static void PoissonDiskPruning(MetroMesh &origMesh, VertexSampler &ps, MetroMesh
int t0 = clock(); int t0 = clock();
// inflating // inflating
origMesh.bbox.Offset(cellsize); BoxType bb=origMesh.bbox;
bb.Offset(cellsize);
int sizeX = std::max(1.0f,origMesh.bbox.DimX() / cellsize); int sizeX = std::max(1.0f,bb.DimX() / cellsize);
int sizeY = std::max(1.0f,origMesh.bbox.DimY() / cellsize); int sizeY = std::max(1.0f,bb.DimY() / cellsize);
int sizeZ = std::max(1.0f,origMesh.bbox.DimZ() / cellsize); int sizeZ = std::max(1.0f,bb.DimZ() / cellsize);
Point3i gridsize(sizeX, sizeY, sizeZ); Point3i gridsize(sizeX, sizeY, sizeZ);
if(pp.pds) pp.pds->gridSize = gridsize; if(pp.pds) pp.pds->gridSize = gridsize;
@ -1198,7 +1200,7 @@ static void PoissonDiskPruning(MetroMesh &origMesh, VertexSampler &ps, MetroMesh
if(pp.adaptiveRadiusFlag) if(pp.adaptiveRadiusFlag)
ComputePoissonSampleRadii(montecarloMesh, diskRadius, pp.radiusVariance, pp.invertQuality); ComputePoissonSampleRadii(montecarloMesh, diskRadius, pp.radiusVariance, pp.invertQuality);
montecarloSHT.InitEmpty(origMesh.bbox, gridsize); montecarloSHT.InitEmpty(bb, gridsize);
for (VertexIterator vi = montecarloMesh.vert.begin(); vi != montecarloMesh.vert.end(); vi++) for (VertexIterator vi = montecarloMesh.vert.begin(); vi != montecarloMesh.vert.end(); vi++)
montecarloSHT.Add(&(*vi)); montecarloSHT.Add(&(*vi));
@ -1272,16 +1274,17 @@ static void PoissonDisk(MetroMesh &origMesh, VertexSampler &ps, MetroMesh &monte
ScalarType cellsize = 2.0f* diskRadius / sqrt(3.0); ScalarType cellsize = 2.0f* diskRadius / sqrt(3.0);
// inflating // inflating
origMesh.bbox.Offset(cellsize); BoxType bb=origMesh.bbox;
bb.Offset(cellsize);
int sizeX = std::max(1.0f,origMesh.bbox.DimX() / cellsize); int sizeX = std::max(1.0f,bb.DimX() / cellsize);
int sizeY = std::max(1.0f,origMesh.bbox.DimY() / cellsize); int sizeY = std::max(1.0f,bb.DimY() / cellsize);
int sizeZ = std::max(1.0f,origMesh.bbox.DimZ() / cellsize); int sizeZ = std::max(1.0f,bb.DimZ() / cellsize);
Point3i gridsize(sizeX, sizeY, sizeZ); Point3i gridsize(sizeX, sizeY, sizeZ);
// spatial hash table of the generated samples - used to check the radius constrain // spatial hash table of the generated samples - used to check the radius constrain
SampleSHT checkSHT; SampleSHT checkSHT;
checkSHT.InitEmpty(origMesh.bbox, gridsize); checkSHT.InitEmpty(bb, gridsize);
// sampling algorithm // sampling algorithm
@ -1297,7 +1300,7 @@ static void PoissonDisk(MetroMesh &origMesh, VertexSampler &ps, MetroMesh &monte
int level = 0; int level = 0;
// initialize spatial hash to index pre-generated samples // initialize spatial hash to index pre-generated samples
montecarloSHTVec[0].InitEmpty(origMesh.bbox, gridsize); montecarloSHTVec[0].InitEmpty(bb, gridsize);
// create active cell list // create active cell list
for (VertexIterator vi = montecarloMesh.vert.begin(); vi != montecarloMesh.vert.end(); vi++) for (VertexIterator vi = montecarloMesh.vert.begin(); vi != montecarloMesh.vert.end(); vi++)
montecarloSHTVec[0].Add(&(*vi)); montecarloSHTVec[0].Add(&(*vi));
@ -1313,7 +1316,7 @@ static void PoissonDisk(MetroMesh &origMesh, VertexSampler &ps, MetroMesh &monte
if(level>0) if(level>0)
{// initialize spatial hash with the remaining points {// initialize spatial hash with the remaining points
montecarloSHT.InitEmpty(origMesh.bbox, gridsize); montecarloSHT.InitEmpty(bb, gridsize);
// create active cell list // create active cell list
for (typename MontecarloSHT::HashIterator hi = montecarloSHTVec[level-1].hash_table.begin(); hi != montecarloSHTVec[level-1].hash_table.end(); hi++) for (typename MontecarloSHT::HashIterator hi = montecarloSHTVec[level-1].hash_table.begin(); hi != montecarloSHTVec[level-1].hash_table.end(); hi++)
montecarloSHT.Add((*hi).second); montecarloSHT.Add((*hi).second);