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

reverted to version 1.20 for critical bug

This commit is contained in:
ganovelli 2006-10-02 09:25:49 +00:00
parent 59d7770ebb
commit 8f509dd74d
1 changed files with 42 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,20 +20,10 @@
* for more details. * * for more details. *
* * * *
****************************************************************************/ ****************************************************************************/
// marco
// added comments
// corrected bad reference in void Grid( const Point3i & _c, CellIterator & first, CellIterator & last )
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.21 2006/08/23 15:23:05 marfr960
added comments
corrected bad reference in void Grid( const Point3i & _c, CellIterator & first, CellIterator & last )
Revision 1.20 2006/07/26 08:12:56 pietroni Revision 1.20 2006/07/26 08:12:56 pietroni
added InitEmpty Function added InitEmpty Function
@ -157,12 +147,6 @@ namespace vcg{
//type of container of pointer to object in a Cell //type of container of pointer to object in a Cell
//typedef typename std::pair<ObjType*,int> EntryType ; //typedef typename std::pair<ObjType*,int> EntryType ;
/* EntryType is the entry data tyep stored into a cell.
* It is composed by:
* - a ObjType* pointer, pointing to the simplex to spatially index
* - an integer (temporal mark ??? ) ???
*/
class EntryType : public std::pair<ObjType*,int> class EntryType : public std::pair<ObjType*,int>
{ {
public: public:
@ -184,7 +168,7 @@ namespace vcg{
{ {
protected: protected:
Point3i cell_n; // cell index Point3i cell_n;//cell number
public: public:
@ -208,7 +192,7 @@ namespace vcg{
///find the simplex into the cell ///find the simplex into the cell
bool Find(ObjType* sim,IteMap &I) bool Find(ObjType* sim,IteMap &I)
{ {
for (I=_entries.begin();I != _entries.end();I++) for (I=_entries.begin();I<_entries.end();I++)
if ((*I).first==sim) if ((*I).first==sim)
return true; return true;
return false; return false;
@ -235,10 +219,10 @@ namespace vcg{
}; // end struct Cell }; // end struct Cell
//record of the hash table
typedef typename std::pair<int,Cell> HRecord;
//hash table definition //hash table definition
typedef typename STDEXT::hash_multimap<int,Cell> Htable; typedef typename STDEXT::hash_multimap<int,Cell> Htable;
//record of the hash table
typedef typename std::pair<int,Cell> HRecord;
//iterator to the hash table //iterator to the hash table
typedef typename Htable::iterator IteHtable; typedef typename Htable::iterator IteHtable;
@ -271,23 +255,15 @@ namespace vcg{
int count = (int) hash_table.count(h); int count = (int) hash_table.count(h);
if (count==0)///in this case there is no entry for that key if (count==0)///in this case there is no entry for that key
return false; return false;
else
{
std::pair<IteHtable, IteHtable> p =hash_table.equal_range(h); std::pair<IteHtable, IteHtable> p =hash_table.equal_range(h);
IteHtable i = p.first;
bool found = false; while((i != p.second)&&((*i).second.CellN()!=cell))++i;
IteHtable i;
for (i = p.first; i != p.second; i++)
{
if ( ((*i).second.CellN() == cell) )
{
found = true;
break;
}
}
if (!found) /// the scan is terminated and if (i==p.second)///the scan is terminated and we have not found the right cell
{ {
// we have not found the right cell
conflicts++; conflicts++;
return false; return false;
} }
@ -297,6 +273,7 @@ namespace vcg{
return true; return true;
} }
} }
}
virtual void _UpdateHMark(ObjType* s){(void)s;} virtual void _UpdateHMark(ObjType* s){(void)s;}
@ -306,16 +283,10 @@ namespace vcg{
{ {
IteHtable I; IteHtable I;
if (!_IsInHtable(cell,I)) if (!_IsInHtable(cell,I))
{
entry_inserted++;
_InsertNewHentry(s,cell); _InsertNewHentry(s,cell);
}
else///there is the entry specified by the iterator I so update only the temporary mark else///there is the entry specified by the iterator I so update only the temporary mark
{
entry_updated++;
(*I).second.Update(s,tempMark); (*I).second.Update(s,tempMark);
} }
}
// hashing // hashing
const int Hash(Point3i p) const const int Hash(Point3i p) const
@ -326,7 +297,6 @@ namespace vcg{
public: public:
int entry_inserted, entry_updated;
/////We need some extra space for numerical precision. /////We need some extra space for numerical precision.
//template <class Box3Type> //template <class Box3Type>
// void SetBBox( const Box3Type & b ) // void SetBBox( const Box3Type & b )
@ -370,9 +340,6 @@ namespace vcg{
assert((grid_size.V(0)>0)&&(grid_size.V(1)>0)&&(grid_size.V(2)>0)); assert((grid_size.V(0)>0)&&(grid_size.V(1)>0)&&(grid_size.V(2)>0));
siz=grid_size; siz=grid_size;
// voxel[i] is the lenght of the edge i of the cell
// siz[i] is the number of cells in direction i
// dim[i] is the spatial dimension of the grid
voxel[0] = dim[0]/siz[0]; voxel[0] = dim[0]/siz[0];
voxel[1] = dim[1]/siz[1]; voxel[1] = dim[1]/siz[1];
voxel[2] = dim[2]/siz[2]; voxel[2] = dim[2]/siz[2];
@ -390,13 +357,7 @@ namespace vcg{
Point3i &siz = this->siz; Point3i &siz = this->siz;
CoordType &voxel = this->voxel; CoordType &voxel = this->voxel;
entry_inserted = 0;
entry_updated = 0;
int _size=std::distance<OBJITER>(_oBegin,_oEnd); int _size=std::distance<OBJITER>(_oBegin,_oEnd);
HashSpace = _size;
if(!_bbox.IsNull()) this->bbox=_bbox; if(!_bbox.IsNull()) this->bbox=_bbox;
else else
{ {
@ -438,36 +399,19 @@ namespace vcg{
Grid(vcg::Point3i(x,y,z),first,last); Grid(vcg::Point3i(x,y,z),first,last);
} }
/* return the simplexes on a specified cell ///return the simplexes on a specified cell
*
* @param _c is the 3D integer index of the cell [IN]
* @param first is the pointer to the first entry stored into the cell _c
* @param second is the pointer to the last entry stored into the cell _c
* @note an entry is a pair composed by the simplex (e.g., a vertex, a face, ...) indexed by the grid and
* an integer representing a temporal time stamp
* @note the time stamp is not used here, it is used in the dynamic version of the spatial hashing
*/
void Grid( const Point3i & _c, CellIterator & first, CellIterator & last ) void Grid( const Point3i & _c, CellIterator & first, CellIterator & last )
{ {
IteHtable I; IteHtable I;
if (_IsInHtable(_c,I))//if there is the cell then if (_IsInHtable(_c,I))//if there is the cell then
{ { ///return pointers to first and last element cell elems
// (*I) is the pair<int, cell> corresponding to _c first= &*(*I).second._entries.begin();
// (*I).second is the cell last= &*(*I).second._entries.end();
// (*I).second._entries is the vector of simplices stored into the cell
// (*I).second._entries.begin() is the pointer to the first entry
// *(*I).second._entries.begin() is the pointer to the pointer to the first entry
// &*(*I).second._entries.begin() is the address of the pointer to the pointer to the first entry (hooray)
// WARNING : (*I).second._entries.end() does not point to an entry, it is just a marker to end
// of the vector
first = &(*(*I).second._entries.begin());
last= &*((*I).second._entries.end() - 1);
} }
else else
{ ///return 2 equals pointers { ///return 2 equals pointers
first =&(*(*hash_table.begin()).second._entries.begin()); first=&*(*hash_table.begin()).second._entries.begin();
last = &(*((*hash_table.begin()).second._entries.begin() )); last= &*(*hash_table.begin()).second._entries.begin();
} }
} }