1
0

Merge pull request #3156 from LogicParrot/hashFix

Updated vector hashing bit operations
This commit is contained in:
LogicParrot 2016-04-22 18:39:56 +03:00
commit deacd25370

View File

@ -396,13 +396,11 @@ public:
/** Provides a hash of a vector's contents */ /** Provides a hash of a vector's contents */
size_t operator()(const Vector3<What> & a_Vector) const size_t operator()(const Vector3<What> & a_Vector) const
{ {
// Guaranteed to have no hash collisions for any 128x128x128 area // Guaranteed to have non repeating hashes for any 128x128x128 area
size_t Hash = 0; size_t Hash = static_cast<size_t>(a_Vector.y);
Hash <<= 16;
Hash ^= static_cast<size_t>(a_Vector.x); Hash ^= static_cast<size_t>(a_Vector.x);
Hash <<= 8; Hash ^= static_cast<size_t>(a_Vector.z) << 8;
Hash ^= static_cast<size_t>(a_Vector.y);
Hash <<= 8;
Hash ^= static_cast<size_t>(a_Vector.z);
return Hash; return Hash;
} }
}; };