From 44c3453c84fe3f329d6b1656f87e27b4c9dd6103 Mon Sep 17 00:00:00 2001 From: Thom de Villa Date: Sat, 7 Mar 2015 14:01:55 +0100 Subject: [PATCH 1/3] std::hash support for glm types std::hash template specializations implemented for vec, quat and mat types --- glm/gtx/hash.hpp | 152 +++++++++++++++++++++++++++++++++ glm/gtx/hash.inl | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 370 insertions(+) create mode 100644 glm/gtx/hash.hpp create mode 100644 glm/gtx/hash.inl diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp new file mode 100644 index 00000000..0940e1d6 --- /dev/null +++ b/glm/gtx/hash.hpp @@ -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 Allow to perform std::hash operation on glm types +/// +/// need to be included to use these functionalities. +/////////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include + +#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 + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tvec1 &v) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tvec2 &v) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tvec3 &v) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tvec4 &v) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tquat &q) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat2x2 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat2x3 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat2x4 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat3x2 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat3x3 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat3x4 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat4x2 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat4x3 &m) const; + }; + + template + struct hash> + { + GLM_FUNC_DECL size_t operator()(const glm::tmat4x4 &m) const; + }; +} // namespace std + +#include "hash.inl" diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl new file mode 100644 index 00000000..27d25dfd --- /dev/null +++ b/glm/gtx/hash.inl @@ -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 Allow to perform hash operation on glm types +/// +/// 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tvec1 &v) const + { + hash hasher; + return hasher(v.x); + } + + template + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tvec2 &v) const + { + size_t seed = 0; + hash hasher; + glm::detail::hash_combine(seed, hasher(v.x)); + glm::detail::hash_combine(seed, hasher(v.y)); + return seed; + } + + template + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tvec3 &v) const + { + size_t seed = 0; + hash 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tvec4 &v) const + { + size_t seed = 0; + hash 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tquat &q) const + { + size_t seed = 0; + hash 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat2x2 &m) const + { + size_t seed = 0; + hash> hasher; + glm::detail::hash_combine(seed, hasher(m[0])); + glm::detail::hash_combine(seed, hasher(m[1])); + return seed; + } + + template + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat2x3 &m) const + { + size_t seed = 0; + hash> hasher; + glm::detail::hash_combine(seed, hasher(m[0])); + glm::detail::hash_combine(seed, hasher(m[1])); + return seed; + } + + template + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat2x4 &m) const + { + size_t seed = 0; + hash> hasher; + glm::detail::hash_combine(seed, hasher(m[0])); + glm::detail::hash_combine(seed, hasher(m[1])); + return seed; + } + + template + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat3x2 &m) const + { + size_t seed = 0; + hash> 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat3x3 &m) const + { + size_t seed = 0; + hash> 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat3x4 &m) const + { + size_t seed = 0; + hash> 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat4x2 &m) const + { + size_t seed = 0; + hash> 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat4x3 &m) const + { + size_t seed = 0; + hash> 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 + GLM_FUNC_QUALIFIER size_t + hash>::operator()(const glm::tmat4x4 &m) const + { + size_t seed = 0; + hash> 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; + } +} From 36e2bdd29475f8ddc788f02afda9f77fb11b9cb3 Mon Sep 17 00:00:00 2001 From: Thom de Villa Date: Sat, 7 Mar 2015 14:04:56 +0100 Subject: [PATCH 2/3] comment fix --- glm/gtx/hash.hpp | 2 +- glm/gtx/hash.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index 0940e1d6..fad46236 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -34,7 +34,7 @@ /// @defgroup gtx_hash GLM_GTX_hash /// @ingroup gtx /// -/// @brief Allow to perform std::hash operation on glm types +/// @brief Add std::hash support for glm types /// /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl index 27d25dfd..7dc92fb0 100644 --- a/glm/gtx/hash.inl +++ b/glm/gtx/hash.inl @@ -34,7 +34,7 @@ /// @defgroup gtx_hash GLM_GTX_hash /// @ingroup gtx /// -/// @brief Allow to perform hash operation on glm types +/// @brief Add std::hash support for glm types /// /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// From b1c45d3ce398f7fdfc53c415297a5f555d9fa584 Mon Sep 17 00:00:00 2001 From: Thom de Villa Date: Sat, 7 Mar 2015 14:25:59 +0100 Subject: [PATCH 3/3] add precision support to std::hash glm specializations --- glm/gtx/hash.hpp | 84 ++++++++++++++++++++++++------------------------ glm/gtx/hash.inl | 74 +++++++++++++++++++++--------------------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index fad46236..f029b751 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -64,88 +64,88 @@ namespace std { - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tvec1 &v) const; + GLM_FUNC_DECL size_t operator()(const glm::tvec1 &v) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tvec2 &v) const; + GLM_FUNC_DECL size_t operator()(const glm::tvec2 &v) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tvec3 &v) const; + GLM_FUNC_DECL size_t operator()(const glm::tvec3 &v) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tvec4 &v) const; + GLM_FUNC_DECL size_t operator()(const glm::tvec4 &v) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tquat &q) const; + GLM_FUNC_DECL size_t operator()(const glm::tquat &q) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat2x2 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat2x2 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat2x3 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat2x3 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat2x4 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat2x4 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat3x2 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat3x2 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat3x3 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat3x3 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat3x4 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat3x4 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat4x2 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat4x2 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat4x3 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat4x3 &m) const; }; - template - struct hash> + template + struct hash> { - GLM_FUNC_DECL size_t operator()(const glm::tmat4x4 &m) const; + GLM_FUNC_DECL size_t operator()(const glm::tmat4x4 &m) const; }; } // namespace std diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl index 7dc92fb0..2b77cccc 100644 --- a/glm/gtx/hash.inl +++ b/glm/gtx/hash.inl @@ -51,17 +51,17 @@ namespace detail namespace std { - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tvec1 &v) const + hash>::operator()(const glm::tvec1 &v) const { hash hasher; return hasher(v.x); } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tvec2 &v) const + hash>::operator()(const glm::tvec2 &v) const { size_t seed = 0; hash hasher; @@ -70,9 +70,9 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tvec3 &v) const + hash>::operator()(const glm::tvec3 &v) const { size_t seed = 0; hash hasher; @@ -82,9 +82,9 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tvec4 &v) const + hash>::operator()(const glm::tvec4 &v) const { size_t seed = 0; hash hasher; @@ -95,9 +95,9 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tquat &q) const + hash>::operator()(const glm::tquat &q) const { size_t seed = 0; hash hasher; @@ -108,81 +108,81 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat2x2 &m) const + hash>::operator()(const glm::tmat2x2 &m) const { size_t seed = 0; - hash> hasher; + hash> hasher; glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[1])); return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat2x3 &m) const + hash>::operator()(const glm::tmat2x3 &m) const { size_t seed = 0; - hash> hasher; + hash> hasher; glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[1])); return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat2x4 &m) const + hash>::operator()(const glm::tmat2x4 &m) const { size_t seed = 0; - hash> hasher; + hash> hasher; glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[1])); return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat3x2 &m) const + hash>::operator()(const glm::tmat3x2 &m) const { size_t seed = 0; - hash> hasher; + hash> 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 + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat3x3 &m) const + hash>::operator()(const glm::tmat3x3 &m) const { size_t seed = 0; - hash> hasher; + hash> 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 + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat3x4 &m) const + hash>::operator()(const glm::tmat3x4 &m) const { size_t seed = 0; - hash> hasher; + hash> 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 + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat4x2 &m) const + hash>::operator()(const glm::tmat4x2 &m) const { size_t seed = 0; - hash> hasher; + hash> 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])); @@ -190,12 +190,12 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat4x3 &m) const + hash>::operator()(const glm::tmat4x3 &m) const { size_t seed = 0; - hash> hasher; + hash> 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])); @@ -203,12 +203,12 @@ namespace std return seed; } - template + template GLM_FUNC_QUALIFIER size_t - hash>::operator()(const glm::tmat4x4 &m) const + hash>::operator()(const glm::tmat4x4 &m) const { size_t seed = 0; - hash> hasher; + hash> 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]));