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

P1 --> HASH_P1 

Old definition was conflicting with functions in segment.h
This commit is contained in:
Federico Ponchio 2006-01-23 15:26:31 +00:00
parent 1e427593b7
commit 52c3f0e4d4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.15 2005/11/23 15:55:35 pietroni
1 warning corrected
Revision 1.14 2005/11/07 14:15:36 pietroni Revision 1.14 2005/11/07 14:15:36 pietroni
added dynamic spatial hashing class for dynamic updating of entries (and relative functions) added dynamic spatial hashing class for dynamic updating of entries (and relative functions)
@ -77,9 +80,9 @@ added vcg header
#define VCGLIB_SPATIAL_HASHING #define VCGLIB_SPATIAL_HASHING
#define P0 73856093 #define HASH_P0 73856093
#define P1 19349663 #define HASH_P1 19349663
#define P2 83492791 #define HASH_P2 83492791
#include <vcg/space/index/grid_util.h> #include <vcg/space/index/grid_util.h>
#include <vcg/space/index/grid_closest.h> #include <vcg/space/index/grid_closest.h>
@ -263,7 +266,7 @@ namespace vcg{
// hashing // hashing
const int Hash(Point3i p) const const int Hash(Point3i p) const
{ {
return ((p.V(0)*P0 ^ p.V(1)*P1 ^ p.V(2)*P2)%HashSpace); return ((p.V(0)*HASH_P0 ^ p.V(1)*HASH_P1 ^ p.V(2)*HASH_P2)%HashSpace);
} }
@ -482,8 +485,8 @@ namespace vcg{
}// end namespace }// end namespace
#undef P0 #undef HASH_P0
#undef P1 #undef HASH_P1
#undef P2 #undef HASH_P2
#endif #endif