From fa2c3fa060150caf59817a110370408d4a817db9 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Tue, 1 Jul 2008 09:33:47 +0000
Subject: [PATCH] updated the spatial indexing class to the new basicgrid class
 that has only one template parameter

---
 vcg/space/index/grid_static_ptr.h | 4 ++--
 vcg/space/index/spatial_hashing.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vcg/space/index/grid_static_ptr.h b/vcg/space/index/grid_static_ptr.h
index e507570e..ccd004c2 100644
--- a/vcg/space/index/grid_static_ptr.h
+++ b/vcg/space/index/grid_static_ptr.h
@@ -199,7 +199,7 @@ namespace vcg {
 	*/
 
 	template < class OBJTYPE, class FLT=float >
-	class GridStaticPtr: public BasicGrid<OBJTYPE,FLT>
+	class GridStaticPtr: public BasicGrid<FLT>, SpatialIndex<OBJTYPE,FLT>
 	{
 	public:
 		typedef OBJTYPE ObjType;
@@ -209,7 +209,7 @@ namespace vcg {
 		typedef Box3<ScalarType> Box3x;
 		typedef Line3<ScalarType> Line3x;
 		typedef GridStaticPtr<OBJTYPE,FLT> GridPtrType;
-    typedef BasicGrid<OBJTYPE,FLT> BT;
+    typedef BasicGrid<FLT> BT;
 
 		/** Internal class for keeping the first pointer of object.
 		Definizione Link dentro la griglia. Classe di supporto per GridStaticObj.
diff --git a/vcg/space/index/spatial_hashing.h b/vcg/space/index/spatial_hashing.h
index 7291899d..af93e457 100644
--- a/vcg/space/index/spatial_hashing.h
+++ b/vcg/space/index/spatial_hashing.h
@@ -136,7 +136,7 @@ namespace vcg{
 	Matthias Teschner and Bruno Heidelberger and Matthias Muller and Danat Pomeranets and Markus Gross
 	*/
 	template < typename OBJTYPE,class FLT=double>
-	class SpatialHashTable:public BasicGrid<OBJTYPE,FLT>
+	class SpatialHashTable:public BasicGrid<FLT>, SpatialIndex<OBJTYPE,FLT>
 	{
 
 	public:
@@ -145,7 +145,7 @@ namespace vcg{
 		typedef ObjType* ObjPtr;
 		typedef typename ObjType::ScalarType ScalarType;
 		typedef Point3<ScalarType> CoordType;
-        typedef typename BasicGrid<OBJTYPE, FLT>::Box3x Box3x;
+        typedef typename BasicGrid<FLT>::Box3x Box3x;
 
 //		typedef typename SpatialHashTable<ObjType,FLT> SpatialHashType;
         typedef SpatialHashTable SpatialHashType;