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

Disambiguated some grid utility names (IPtoTP into IPfToPf and IPiToPf) in order to avoid ambiguities (due to automatic cast?)

This commit is contained in:
Paolo Cignoni 2008-10-30 09:01:03 +00:00
parent 6627c21d43
commit 49c72bc54e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcg/complex/trimesh/create/resampler.h
View File

@ -153,7 +153,7 @@ template <class OLD_MESH_TYPE,class NEW_MESH_TYPE, class FLT>
typename Old_Mesh::FaceType *f=NULL; typename Old_Mesh::FaceType *f=NULL;
const float max_dist = max_dim; const float max_dist = max_dim;
vcg::Point3f testPt; vcg::Point3f testPt;
this->IPToP(Point3i(x,y,z),testPt); this->IPiToPf(Point3i(x,y,z),testPt);
vcg::Point3f closestNorm; vcg::Point3f closestNorm;
vcg::Point3f closestPt; vcg::Point3f closestPt;
@ -249,7 +249,7 @@ template <class OLD_MESH_TYPE,class NEW_MESH_TYPE, class FLT>
for(vi=new_mesh.vert.begin();vi!=new_mesh.vert.end();++vi) for(vi=new_mesh.vert.begin();vi!=new_mesh.vert.end();++vi)
if(!(*vi).IsD()) if(!(*vi).IsD())
{ {
IPToP((*vi).cP(),(*vi).P()); IPfToPf((*vi).cP(),(*vi).P());
} }
} }

8
vcg/space/index/grid_static_obj.h
View File

@ -77,12 +77,12 @@ class GridStaticObj : public BasicGrid<FLT>
/// Date le coordinate ritorna la cella /// Date le coordinate ritorna la cella
inline ObjType & Grid( const int x, const int y, const int z ) {return grid[GridInd(Point3i(x,y,z))]; } inline ObjType & Grid( const int x, const int y, const int z ) {return grid[GridIndI(Point3i(x,y,z))]; }
// Dato un punto ritorna la cella // Dato un punto ritorna la cella
inline ObjType & Grid( const Point3<FLT> & p ) { return grid[GridInd(p)]; } inline ObjType & Grid( const Point3<FLT> & p ) { return grid[GridIndF(p)]; }
inline int GridInd( const Point3i & pi ) const inline int GridIndI( const Point3i & pi ) const
{ {
#ifndef NDEBUG #ifndef NDEBUG
if ( pi[0]<0 || pi[0]>=this->siz[0] || pi[1]<0 || pi[1]>=this->siz[1] || pi[2]<0 || pi[2]>=this->siz[2] ) if ( pi[0]<0 || pi[0]>=this->siz[0] || pi[1]<0 || pi[1]>=this->siz[1] || pi[2]<0 || pi[2]>=this->siz[2] )
@ -94,7 +94,7 @@ class GridStaticObj : public BasicGrid<FLT>
} }
// Dato un punto ritorna l'indice della cella // Dato un punto ritorna l'indice della cella
inline int GridInd( const Point3<FLT> & p ) const { return GridInd(GridP(p)); } inline int GridIndF( const Point3<FLT> & p ) const { return GridIndI(GridP(p)); }
void Create( const Point3i &_siz, const ObjType & init ) void Create( const Point3i &_siz, const ObjType & init )
{ {

4
vcg/space/index/grid_util.h
View File

@ -145,7 +145,7 @@ public:
* @param integer coordinates pi of the cell * @param integer coordinates pi of the cell
* @return p is a 3D point representing the lower corner of the cell * @return p is a 3D point representing the lower corner of the cell
*/ */
inline void IPToP(const Point3i & pi, CoordType &p ) const inline void IPiToPf(const Point3i & pi, CoordType &p ) const
{ {
p[0] = ((ScalarType)pi[0])*voxel[0]; p[0] = ((ScalarType)pi[0])*voxel[0];
p[1] = ((ScalarType)pi[1])*voxel[1]; p[1] = ((ScalarType)pi[1])*voxel[1];
@ -155,7 +155,7 @@ public:
// Same of above but for the case that you just want to transform // Same of above but for the case that you just want to transform
// from a space to the other. // from a space to the other.
inline void IPToP(const CoordType & pi, CoordType &p ) const inline void IPfToPf(const CoordType & pi, CoordType &p ) const
{ {
p[0] = ((ScalarType)pi[0])*voxel[0]; p[0] = ((ScalarType)pi[0])*voxel[0];
p[1] = ((ScalarType)pi[1])*voxel[1]; p[1] = ((ScalarType)pi[1])*voxel[1];