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

updated the spatial indexing class to the new basicgrid class that has only one template parameter

This commit is contained in:
Paolo Cignoni 2008-07-01 09:33:47 +00:00
parent 4e227776f3
commit fa2c3fa060
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ namespace vcg {
*/ */
template < class OBJTYPE, class FLT=float > template < class OBJTYPE, class FLT=float >
class GridStaticPtr: public BasicGrid<OBJTYPE,FLT> class GridStaticPtr: public BasicGrid<FLT>, SpatialIndex<OBJTYPE,FLT>
{ {
public: public:
typedef OBJTYPE ObjType; typedef OBJTYPE ObjType;
@ -209,7 +209,7 @@ namespace vcg {
typedef Box3<ScalarType> Box3x; typedef Box3<ScalarType> Box3x;
typedef Line3<ScalarType> Line3x; typedef Line3<ScalarType> Line3x;
typedef GridStaticPtr<OBJTYPE,FLT> GridPtrType; typedef GridStaticPtr<OBJTYPE,FLT> GridPtrType;
typedef BasicGrid<OBJTYPE,FLT> BT; typedef BasicGrid<FLT> BT;
/** Internal class for keeping the first pointer of object. /** Internal class for keeping the first pointer of object.
Definizione Link dentro la griglia. Classe di supporto per GridStaticObj. Definizione Link dentro la griglia. Classe di supporto per GridStaticObj.

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

@ -136,7 +136,7 @@ namespace vcg{
Matthias Teschner and Bruno Heidelberger and Matthias Muller and Danat Pomeranets and Markus Gross Matthias Teschner and Bruno Heidelberger and Matthias Muller and Danat Pomeranets and Markus Gross
*/ */
template < typename OBJTYPE,class FLT=double> template < typename OBJTYPE,class FLT=double>
class SpatialHashTable:public BasicGrid<OBJTYPE,FLT> class SpatialHashTable:public BasicGrid<FLT>, SpatialIndex<OBJTYPE,FLT>
{ {
public: public:
@ -145,7 +145,7 @@ namespace vcg{
typedef ObjType* ObjPtr; typedef ObjType* ObjPtr;
typedef typename ObjType::ScalarType ScalarType; typedef typename ObjType::ScalarType ScalarType;
typedef Point3<ScalarType> CoordType; typedef Point3<ScalarType> CoordType;
typedef typename BasicGrid<OBJTYPE, FLT>::Box3x Box3x; typedef typename BasicGrid<FLT>::Box3x Box3x;
// typedef typename SpatialHashTable<ObjType,FLT> SpatialHashType; // typedef typename SpatialHashTable<ObjType,FLT> SpatialHashType;
typedef SpatialHashTable SpatialHashType; typedef SpatialHashTable SpatialHashType;