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

gtc/quaternion matrix conversion const support

Browse Source
This commit is contained in:
Celestin de Villa 2015-10-31 21:20:42 +01:00
parent 10572b2f22
commit 78e420703c
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/gtc/quaternion.hpp
View File

@ -134,8 +134,8 @@ namespace glm
/// Explicit conversion operators /// Explicit conversion operators
# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS # if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
GLM_FUNC_DECL explicit operator tmat3x3<T, P>(); GLM_FUNC_DECL explicit operator tmat3x3<T, P>() const;
GLM_FUNC_DECL explicit operator tmat4x4<T, P>(); GLM_FUNC_DECL explicit operator tmat4x4<T, P>() const;
# endif # endif
/// Create a quaternion from two normalized axis /// Create a quaternion from two normalized axis

4
glm/gtc/quaternion.inl
View File

@ -265,13 +265,13 @@ namespace detail
# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS # if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat3x3<T, P>() GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat3x3<T, P>() const
{ {
return mat3_cast(*this); return mat3_cast(*this);
} }
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat4x4<T, P>() GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat4x4<T, P>() const
{ {
return mat4_cast(*this); return mat4_cast(*this);
} }