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

Many changes for the different interpretation of hash_set between gcc and .net. Probably to be completed.

This commit is contained in:
Paolo Cignoni 2006-05-25 09:37:14 +00:00
parent 3d8bbcc87f
commit 18458e04a2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vcg/complex/trimesh/clustering.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.8 2006/05/24 16:42:22 m_di_benedetto
Corrected bbox inflation amount in case of _cellsize != 0
Revision 1.7 2006/05/24 15:16:01 cignoni Revision 1.7 2006/05/24 15:16:01 cignoni
better comment to the init parameters better comment to the init parameters
@ -97,7 +100,17 @@ public:
operator size_t () const operator size_t () const
{return Hash();} {return Hash();}
}; };
}}
namespace STDEXT
{
template <>
struct hash<vcg::tri::HashedPoint3i>{
inline size_t operator ()(const vcg::tri::HashedPoint3i &p) const {return size_t(p);}
};
}
namespace vcg{
namespace tri{
// //
@ -180,6 +193,10 @@ class Clustering
} }
}; };
struct SimpleTriHashFunc{
inline size_t operator ()(const SimpleTri &p) const {return size_t(p);}
};
// The init function Take two parameters // The init function Take two parameters
// _size is the approximate total number of cells composing the grid surrounding the objects (usually a large number) // _size is the approximate total number of cells composing the grid surrounding the objects (usually a large number)
@ -214,7 +231,7 @@ class Clustering
BasicGrid<CellType,ScalarType> Grid; BasicGrid<CellType,ScalarType> Grid;
STDEXT::hash_set<SimpleTri> TriSet; STDEXT::hash_set<SimpleTri,SimpleTriHashFunc> TriSet;
STDEXT::hash_map<HashedPoint3i,CellType> GridCell; STDEXT::hash_map<HashedPoint3i,CellType> GridCell;
void Add(MeshType &m) void Add(MeshType &m)
@ -254,7 +271,7 @@ class Clustering
} }
Allocator<MeshType>::AddVertices(m,GridCell.size()); Allocator<MeshType>::AddVertices(m,GridCell.size());
STDEXT::hash_map<HashedPoint3i,CellType>::iterator gi; typename STDEXT::hash_map<HashedPoint3i,CellType>::iterator gi;
int i=0; int i=0;
for(gi=GridCell.begin();gi!=GridCell.end();++gi) for(gi=GridCell.begin();gi!=GridCell.end();++gi)
{ {
@ -263,7 +280,7 @@ class Clustering
++i; ++i;
} }
Allocator<MeshType>::AddFaces(m,TriSet.size()); Allocator<MeshType>::AddFaces(m,TriSet.size());
STDEXT::hash_set<SimpleTri>::iterator ti; typename STDEXT::hash_set<SimpleTri,SimpleTriHashFunc>::iterator ti;
i=0; i=0;
for(ti=TriSet.begin();ti!=TriSet.end();++ti) for(ti=TriSet.begin();ti!=TriSet.end();++ti)
{ {
@ -274,7 +291,7 @@ class Clustering
// the best orientation according to the averaged normal // the best orientation according to the averaged normal
if(!DuplicateFaceParam) if(!DuplicateFaceParam)
{ {
CoordType N=Normal(m.face[i]); CoordType N=vcg::Normal(m.face[i]);
int badOrient=0; int badOrient=0;
if( N*(*ti).v[0]->n <0) ++badOrient; if( N*(*ti).v[0]->n <0) ++badOrient;
if( N*(*ti).v[1]->n <0) ++badOrient; if( N*(*ti).v[1]->n <0) ++badOrient;