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

added some missing typename for gcc compiling

This commit is contained in:
Paolo Cignoni 2009-01-15 08:04:12 +00:00
parent 0e037cabc1
commit ab8fe0462d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,9 +676,9 @@ static void SingleFaceRaster(FaceType &f, VertexSampler &ps, const Point2<Scala
// check the radius constrain // check the radius constrain
static bool checkPoissonDisk(vcg::SpatialHashTable<VertexType> sht, Point3<ScalarType> p, ScalarType radius) static bool checkPoissonDisk(vcg::SpatialHashTable<VertexType> sht, Point3<ScalarType> p, ScalarType radius)
{ {
vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator itBegin; typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator itBegin;
vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator itEnd; typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator itEnd;
vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator it; typename vcg::SpatialHashTable<VertexType, ScalarType>::CellIterator it;
// get the samples closest to the given one // get the samples closest to the given one
sht.Grid(p, itBegin, itEnd); sht.Grid(p, itBegin, itEnd);
@ -689,9 +689,7 @@ static bool checkPoissonDisk(vcg::SpatialHashTable<VertexType> sht, Point3<Scala
for (it = itBegin; it != itEnd; it++) for (it = itBegin; it != itEnd; it++)
{ {
v = *it; v = *it;
if (Distance(v->P(),p) < radius)
d = (v->P() - p)
if (d.Norm() < radius)
return false; return false;
} }
@ -714,7 +712,7 @@ static void Poissondisk(MetroMesh &m, VertexSampler &ps, int sampleNum, int vers
// spatial index of mesh face - used to search where to place the samples // spatial index of mesh face - used to search where to place the samples
vcg::SpatialHashTable<FaceType, ScalarType> searchSHT; vcg::SpatialHashTable<FaceType, ScalarType> searchSHT;
vcg::SpatialHashTable<FaceType, ScalarType>::CellIterator cellIt; typename vcg::SpatialHashTable<FaceType, ScalarType>::CellIterator cellIt;
// 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
vcg::SpatialHashTable<VertexType, ScalarType> checkSHT; vcg::SpatialHashTable<VertexType, ScalarType> checkSHT;
@ -761,8 +759,8 @@ static void Poissondisk(MetroMesh &m, VertexSampler &ps, int sampleNum, int vers
std::vector<Point3i *> activeCells; std::vector<Point3i *> activeCells;
std::vector<Point3i *> cellsToSubdivide; std::vector<Point3i *> cellsToSubdivide;
std::vector<FaceType *> faceToSubdivide; std::vector<FaceType *> faceToSubdivide;
std::vector<FaceType *>::iterator faceToSubdivideIterator; typename std::vector<FaceType *>::iterator faceToSubdivideIterator;
std::vector<Point3i>::iterator it; typename std::vector<Point3i>::iterator it;
int level = 0; int level = 0;
do do