Merge pull request #320 from plasmacel/master

Add std::hash support for glm types (with precision support) #320
This commit is contained in:
Christophe Riccio 2015-03-15 22:49:29 +01:00
commit 61e9b88db0
2 changed files with 370 additions and 0 deletions

152
glm/gtx/hash.hpp Normal file
View File

@ -0,0 +1,152 @@
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// Restrictions:
/// By making use of the Software for military purposes, you choose to make
/// a Bunny unhappy.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE.
///
/// @ref gtx_hash
/// @file glm/gtx/hash.hpp
/// @date 2015-03-07 / 2015-03-07
/// @author Christophe Riccio
///
/// @see core (dependence)
///
/// @defgroup gtx_hash GLM_GTX_hash
/// @ingroup gtx
///
/// @brief Add std::hash support for glm types
///
/// <glm/gtx/hash.hpp> need to be included to use these functionalities.
///////////////////////////////////////////////////////////////////////////////////
#pragma once
#include <functional>
#include "../vec2.hpp"
#include "../vec3.hpp"
#include "../vec4.hpp"
#include "../gtc/vec1.hpp"
#include "../gtc/quaternion.hpp"
#include "../mat2x2.hpp"
#include "../mat2x3.hpp"
#include "../mat2x4.hpp"
#include "../mat3x2.hpp"
#include "../mat3x3.hpp"
#include "../mat3x4.hpp"
#include "../mat4x2.hpp"
#include "../mat4x3.hpp"
#include "../mat4x4.hpp"
namespace std
{
template <typename T, glm::precision P>
struct hash<glm::tvec1<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tvec1<T,P> &v) const;
};
template <typename T, glm::precision P>
struct hash<glm::tvec2<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tvec2<T,P> &v) const;
};
template <typename T, glm::precision P>
struct hash<glm::tvec3<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tvec3<T,P> &v) const;
};
template <typename T, glm::precision P>
struct hash<glm::tvec4<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tvec4<T,P> &v) const;
};
template <typename T, glm::precision P>
struct hash<glm::tquat<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tquat<T,P> &q) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat2x2<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat2x2<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat2x3<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat2x3<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat2x4<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat2x4<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat3x2<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat3x2<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat3x3<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat3x3<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat3x4<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat3x4<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat4x2<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat4x2<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat4x3<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat4x3<T,P> &m) const;
};
template <typename T, glm::precision P>
struct hash<glm::tmat4x4<T,P>>
{
GLM_FUNC_DECL size_t operator()(const glm::tmat4x4<T,P> &m) const;
};
} // namespace std
#include "hash.inl"

218
glm/gtx/hash.inl Normal file
View File

@ -0,0 +1,218 @@
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// Restrictions:
/// By making use of the Software for military purposes, you choose to make
/// a Bunny unhappy.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE.
///
/// @ref gtx_hash
/// @file glm/gtx/hash.inl
/// @date 2015-03-07 / 2015-03-07
/// @author Christophe Riccio
///
/// @see core (dependence)
///
/// @defgroup gtx_hash GLM_GTX_hash
/// @ingroup gtx
///
/// @brief Add std::hash support for glm types
///
/// <glm/gtx/hash.inl> need to be included to use these functionalities.
///////////////////////////////////////////////////////////////////////////////////
namespace glm {
namespace detail
{
GLM_INLINE void hash_combine(size_t &seed, size_t hash)
{
hash += 0x9e3779b9 + (seed << 6) + (seed >> 2);
seed ^= hash;
}
}}
namespace std
{
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tvec1<T,P>>::operator()(const glm::tvec1<T,P> &v) const
{
hash<T> hasher;
return hasher(v.x);
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tvec2<T,P>>::operator()(const glm::tvec2<T,P> &v) const
{
size_t seed = 0;
hash<T> hasher;
glm::detail::hash_combine(seed, hasher(v.x));
glm::detail::hash_combine(seed, hasher(v.y));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tvec3<T,P>>::operator()(const glm::tvec3<T,P> &v) const
{
size_t seed = 0;
hash<T> hasher;
glm::detail::hash_combine(seed, hasher(v.x));
glm::detail::hash_combine(seed, hasher(v.y));
glm::detail::hash_combine(seed, hasher(v.z));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tvec4<T,P>>::operator()(const glm::tvec4<T,P> &v) const
{
size_t seed = 0;
hash<T> hasher;
glm::detail::hash_combine(seed, hasher(v.x));
glm::detail::hash_combine(seed, hasher(v.y));
glm::detail::hash_combine(seed, hasher(v.z));
glm::detail::hash_combine(seed, hasher(v.w));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tquat<T,P>>::operator()(const glm::tquat<T,P> &q) const
{
size_t seed = 0;
hash<T> hasher;
glm::detail::hash_combine(seed, hasher(q.x));
glm::detail::hash_combine(seed, hasher(q.y));
glm::detail::hash_combine(seed, hasher(q.z));
glm::detail::hash_combine(seed, hasher(q.w));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat2x2<T,P>>::operator()(const glm::tmat2x2<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec2<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat2x3<T,P>>::operator()(const glm::tmat2x3<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec3<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat2x4<T,P>>::operator()(const glm::tmat2x4<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec4<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat3x2<T,P>>::operator()(const glm::tmat3x2<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec2<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat3x3<T,P>>::operator()(const glm::tmat3x3<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec3<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat3x4<T,P>>::operator()(const glm::tmat3x4<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec4<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat4x2<T,P>>::operator()(const glm::tmat4x2<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec2<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
glm::detail::hash_combine(seed, hasher(m[3]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat4x3<T,P>>::operator()(const glm::tmat4x3<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec3<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
glm::detail::hash_combine(seed, hasher(m[3]));
return seed;
}
template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t
hash<glm::tmat4x4<T,P>>::operator()(const glm::tmat4x4<T,P> &m) const
{
size_t seed = 0;
hash<glm::tvec4<T,P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2]));
glm::detail::hash_combine(seed, hasher(m[3]));
return seed;
}
}