mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved coding style consistency

Browse Source
This commit is contained in:
Christophe Riccio 2015-08-31 22:50:24 +02:00
parent bf30816e36
commit e7bae9891a
2 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
glm/gtx/hash.hpp
View File

@ -70,93 +70,93 @@
namespace std namespace std
{ {
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tvec1<T,P>> struct hash<glm::tvec1<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tvec1<T,P> &v) const; GLM_FUNC_DECL size_t operator()(glm::tvec1<T, P> const & v) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tvec2<T,P>> struct hash<glm::tvec2<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tvec2<T,P> &v) const; GLM_FUNC_DECL size_t operator()(glm::tvec2<T, P> const & v) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tvec3<T,P>> struct hash<glm::tvec3<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tvec3<T,P> &v) const; GLM_FUNC_DECL size_t operator()(glm::tvec3<T, P> const & v) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tvec4<T,P>> struct hash<glm::tvec4<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tvec4<T,P> &v) const; GLM_FUNC_DECL size_t operator()(glm::tvec4<T, P> const & v) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tquat<T,P>> struct hash<glm::tquat<T,P>>
{ {
GLM_FUNC_DECL size_t operator()(const glm::tquat<T,P> &q) const; GLM_FUNC_DECL size_t operator()(glm::tquat<T, P> const & q) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tdualquat<T,P>> struct hash<glm::tdualquat<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tdualquat<T,P> &q) const; GLM_FUNC_DECL size_t operator()(glm::tdualquat<T,P> const & q) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat2x2<T,P>> struct hash<glm::tmat2x2<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat2x2<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat2x2<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat2x3<T,P>> struct hash<glm::tmat2x3<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat2x3<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat2x3<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat2x4<T,P>> struct hash<glm::tmat2x4<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat2x4<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat2x4<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat3x2<T,P>> struct hash<glm::tmat3x2<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat3x2<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat3x2<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat3x3<T,P>> struct hash<glm::tmat3x3<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat3x3<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat3x3<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat3x4<T,P>> struct hash<glm::tmat3x4<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat3x4<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat3x4<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat4x2<T,P>> struct hash<glm::tmat4x2<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat4x2<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat4x2<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat4x3<T,P>> struct hash<glm::tmat4x3<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat4x3<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat4x3<T,P> const & m) const;
}; };
template <typename T, glm::precision P> template <typename T, glm::precision P>
struct hash<glm::tmat4x4<T,P>> struct hash<glm::tmat4x4<T,P> >
{ {
GLM_FUNC_DECL size_t operator()(const glm::tmat4x4<T,P> &m) const; GLM_FUNC_DECL size_t operator()(glm::tmat4x4<T,P> const & m) const;
}; };
} // namespace std } // namespace std

65
glm/gtx/hash.inl
View File

@ -52,16 +52,14 @@ namespace detail
namespace std namespace std
{ {
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tvec1<T, P>>::operator()(glm::tvec1<T, P> const & v) const
hash<glm::tvec1<T,P>>::operator()(const glm::tvec1<T,P> &v) const
{ {
hash<T> hasher; hash<T> hasher;
return hasher(v.x); return hasher(v.x);
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tvec2<T, P>>::operator()(glm::tvec2<T, P> const & v) const
hash<glm::tvec2<T,P>>::operator()(const glm::tvec2<T,P> &v) const
{ {
size_t seed = 0; size_t seed = 0;
hash<T> hasher; hash<T> hasher;
@ -71,8 +69,7 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tvec3<T, P>>::operator()(glm::tvec3<T, P> const & v) const
hash<glm::tvec3<T,P>>::operator()(const glm::tvec3<T,P> &v) const
{ {
size_t seed = 0; size_t seed = 0;
hash<T> hasher; hash<T> hasher;
@ -83,8 +80,7 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tvec4<T, P>>::operator()(glm::tvec4<T, P> const & v) const
hash<glm::tvec4<T,P>>::operator()(const glm::tvec4<T,P> &v) const
{ {
size_t seed = 0; size_t seed = 0;
hash<T> hasher; hash<T> hasher;
@ -96,8 +92,7 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, P>>::operator()(glm::tquat<T,P> const & q) const
hash<glm::tquat<T,P>>::operator()(const glm::tquat<T,P> &q) const
{ {
size_t seed = 0; size_t seed = 0;
hash<T> hasher; hash<T> hasher;
@ -109,55 +104,50 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, P>>::operator()(glm::tdualquat<T, P> const & q) const
hash<glm::tdualquat<T,P>>::operator()(const glm::tdualquat<T,P> &q) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tquat<T,P>> hasher; hash<glm::tquat<T, P>> 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;
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x2<T, P>>::operator()(glm::tmat2x2<T, P> const & m) const
hash<glm::tmat2x2<T,P>>::operator()(const glm::tmat2x2<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec2<T,P>> hasher; hash<glm::tvec2<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
return seed; return seed;
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x3<T, P>>::operator()(glm::tmat2x3<T, P> const & m) const
hash<glm::tmat2x3<T,P>>::operator()(const glm::tmat2x3<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec3<T,P>> hasher; hash<glm::tvec3<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
return seed; return seed;
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x4<T, P>>::operator()(glm::tmat2x4<T, P> const & m) const
hash<glm::tmat2x4<T,P>>::operator()(const glm::tmat2x4<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec4<T,P>> hasher; hash<glm::tvec4<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
return seed; return seed;
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x2<T, P>>::operator()(glm::tmat3x2<T, P> const & m) const
hash<glm::tmat3x2<T,P>>::operator()(const glm::tmat3x2<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec2<T,P>> hasher; hash<glm::tvec2<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));
@ -165,11 +155,10 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x3<T, P>>::operator()(glm::tmat3x3<T, P> const & m) const
hash<glm::tmat3x3<T,P>>::operator()(const glm::tmat3x3<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec3<T,P>> hasher; hash<glm::tvec3<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));
@ -177,11 +166,10 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x4<T, P>>::operator()(glm::tmat3x4<T, P> const & m) const
hash<glm::tmat3x4<T,P>>::operator()(const glm::tmat3x4<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec4<T,P>> hasher; hash<glm::tvec4<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));
@ -189,11 +177,10 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x2<T,P>>::operator()(glm::tmat4x2<T,P> const & m) const
hash<glm::tmat4x2<T,P>>::operator()(const glm::tmat4x2<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec2<T,P>> hasher; hash<glm::tvec2<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));
@ -202,11 +189,10 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x3<T,P>>::operator()(glm::tmat4x3<T,P> const & m) const
hash<glm::tmat4x3<T,P>>::operator()(const glm::tmat4x3<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec3<T,P>> hasher; hash<glm::tvec3<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));
@ -215,11 +201,10 @@ namespace std
} }
template <typename T, glm::precision P> template <typename T, glm::precision P>
GLM_FUNC_QUALIFIER size_t GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x4<T,P>>::operator()(glm::tmat4x4<T, P> const & m) const
hash<glm::tmat4x4<T,P>>::operator()(const glm::tmat4x4<T,P> &m) const
{ {
size_t seed = 0; size_t seed = 0;
hash<glm::tvec4<T,P>> hasher; hash<glm::tvec4<T, P>> hasher;
glm::detail::hash_combine(seed, hasher(m[0])); glm::detail::hash_combine(seed, hasher(m[0]));
glm::detail::hash_combine(seed, hasher(m[1])); glm::detail::hash_combine(seed, hasher(m[1]));
glm::detail::hash_combine(seed, hasher(m[2])); glm::detail::hash_combine(seed, hasher(m[2]));