mewin/glm
1
0
Fork 0
Code Releases Activity

Merge pull request #920 from inviwo/feature/hash-qua

Browse Source 
Hash hashes qua instead of tquat closes #919 #920
This commit is contained in:
Christophe 2019-07-09 13:46:47 +02:00 committed by GitHub
commit 4fc28977d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/hash.hpp
View File

@ -73,9 +73,9 @@ namespace std
}; };
template<typename T, glm::qualifier Q> template<typename T, glm::qualifier Q>
struct hash<glm::tquat<T,Q>> struct hash<glm::qua<T,Q>>
{ {
GLM_FUNC_DECL size_t operator()(glm::tquat<T, Q> const& q) const; GLM_FUNC_DECL size_t operator()(glm::qua<T, Q> const& q) const;
}; };
template<typename T, glm::qualifier Q> template<typename T, glm::qualifier Q>

4
glm/gtx/hash.inl
View File

@ -62,7 +62,7 @@ namespace std
} }
template<typename T, glm::qualifier Q> template<typename T, glm::qualifier Q>
GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, Q>>::operator()(glm::tquat<T,Q> const& q) const GLM_FUNC_QUALIFIER size_t hash<glm::qua<T, Q>>::operator()(glm::qua<T,Q> const& q) const
{ {
size_t seed = 0; size_t seed = 0;
hash<T> hasher; hash<T> hasher;
@ -77,7 +77,7 @@ namespace std
GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, Q>>::operator()(glm::tdualquat<T, Q> const& q) const GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, Q>>::operator()(glm::tdualquat<T, Q> const& q) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tquat<T, Q>> hasher; hash<glm::qua<T, Q>> hasher;
glm::detail::hash_combine(seed, hasher(q.real)); glm::detail::hash_combine(seed, hasher(q.real));
glm::detail::hash_combine(seed, hasher(q.dual)); glm::detail::hash_combine(seed, hasher(q.dual));
return seed; return seed;