mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #890 from oliver-om/qua_conversion_const

Browse Source 
Add const to quaternion conversion operators #890
This commit is contained in:
Christophe 2019-04-22 12:34:55 +02:00 committed by GitHub
commit d5760d9cd0
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/detail/type_quat.hpp
View File

@ -101,8 +101,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 mat<3, 3, T, Q>(); GLM_FUNC_DECL explicit operator mat<3, 3, T, Q>() const;
GLM_FUNC_DECL explicit operator mat<4, 4, T, Q>(); GLM_FUNC_DECL explicit operator mat<4, 4, T, Q>() const;
# endif # endif
/// Create a quaternion from two normalized axis /// Create a quaternion from two normalized axis

4
glm/detail/type_quat.inl
View File

@ -197,13 +197,13 @@ namespace detail
# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS # if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_QUALIFIER qua<T, Q>::operator mat<3, 3, T, Q>() GLM_FUNC_QUALIFIER qua<T, Q>::operator mat<3, 3, T, Q>() const
{ {
return mat3_cast(*this); return mat3_cast(*this);
} }
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_QUALIFIER qua<T, Q>::operator mat<4, 4, T, Q>() GLM_FUNC_QUALIFIER qua<T, Q>::operator mat<4, 4, T, Q>() const
{ {
return mat4_cast(*this); return mat4_cast(*this);
} }