flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Vector hasher is now a separate class

Browse Source
This commit is contained in:
Tiger Wang 2015-06-07 11:52:14 +01:00
parent ed6c37febc
commit f44d123ba8
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Path.h
View File

@ -145,7 +145,7 @@ private:
/* Pathfinding fields */ /* Pathfinding fields */
std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics> m_OpenList; std::priority_queue<cPathCell *, std::vector<cPathCell *>, compareHeuristics> m_OpenList;
std::unordered_map<Vector3i, cPathCell, Vector3i> m_Map; std::unordered_map<Vector3i, cPathCell, VectorHasher<int>> m_Map;
Vector3i m_Destination; Vector3i m_Destination;
Vector3i m_Source; Vector3i m_Source;
int m_BoundingBoxWidth; int m_BoundingBoxWidth;

12
src/Simulator/IncrementalRedstoneSimulator.h
View File

@ -76,19 +76,21 @@ private:
{ {
public: public:
/// Per-chunk data for the simulator, specified individual chunks to simulate /// Per-chunk data for the simulator, specified individual chunks to simulate
std::unordered_map<Vector3i, std::pair<BLOCKTYPE, bool>, Vector3i> m_ChunkData;
/** test */
std::unordered_map<Vector3i, std::pair<BLOCKTYPE, bool>, VectorHasher<int>> m_ChunkData;
std::vector<sPoweredBlocks> m_PoweredBlocks; std::vector<sPoweredBlocks> m_PoweredBlocks;
std::vector<sLinkedPoweredBlocks> m_LinkedBlocks; std::vector<sLinkedPoweredBlocks> m_LinkedBlocks;
std::unordered_map<Vector3i, bool, Vector3i> m_SimulatedPlayerToggleableBlocks; std::unordered_map<Vector3i, bool, VectorHasher<int>> m_SimulatedPlayerToggleableBlocks;
std::unordered_map<Vector3i, sRepeatersDelayList, Vector3i> m_RepeatersDelayList; std::unordered_map<Vector3i, sRepeatersDelayList, VectorHasher<int>> m_RepeatersDelayList;
}; };
public: public:
typedef std::vector <sPoweredBlocks> PoweredBlocksList; typedef std::vector <sPoweredBlocks> PoweredBlocksList;
typedef std::vector <sLinkedPoweredBlocks> LinkedBlocksList; typedef std::vector <sLinkedPoweredBlocks> LinkedBlocksList;
typedef std::unordered_map<Vector3i, bool, Vector3i> SimulatedPlayerToggleableList; typedef std::unordered_map<Vector3i, bool, VectorHasher<int>> SimulatedPlayerToggleableList;
typedef std::unordered_map<Vector3i, sRepeatersDelayList, Vector3i> RepeatersDelayList; typedef std::unordered_map<Vector3i, sRepeatersDelayList, VectorHasher<int>> RepeatersDelayList;
private: private:

28
src/Vector3.h
View File

@ -235,12 +235,6 @@ public:
return *this; return *this;
} }
/** Provides a hash of a vector's contents */
size_t operator()(const Vector3<T> & a_Vector) const
{
return ((std::hash<T>()(a_Vector.x) ^ (std::hash<T>()(a_Vector.y) << 1)) ^ std::hash<T>()(a_Vector.z));
}
// tolua_begin // tolua_begin
inline Vector3<T> operator + (const Vector3<T>& a_Rhs) const inline Vector3<T> operator + (const Vector3<T>& a_Rhs) const
@ -390,6 +384,28 @@ template <> inline Vector3<int> Vector3<int>::Floor(void) const
template <typename What>
class VectorHasher
{
public:
/** Provides a hash of a vector's contents */
size_t operator()(const Vector3<What> & a_Vector) const
{
// Guaranteed to have no hash collisions for any 128x128x128 area
size_t Hash = 0;
Hash ^= static_cast<size_t>(a_Vector.x);
Hash <<= 8;
Hash ^= static_cast<size_t>(a_Vector.y);
Hash <<= 8;
Hash ^= static_cast<size_t>(a_Vector.z);
return Hash;
}
};
template <typename T> template <typename T>
const double Vector3<T>::EPS = 0.000001; const double Vector3<T>::EPS = 0.000001;