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

Revert "Fix constructor of struct qua to honor macro "GLM_FORCE_QUAT_DATA_WXYZ""

Browse Source 
This reverts commit f931c4996a.
This commit is contained in:
Gaoyang Zhang 2021-05-06 14:12:23 +08:00
parent f6f3596a6b
commit d573bf099a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/type_quat.hpp
View File

@ -88,7 +88,7 @@ namespace glm
// -- Explicit basic constructors -- // -- Explicit basic constructors --
GLM_FUNC_DECL GLM_CONSTEXPR qua(T s, vec<3, T, Q> const& v); GLM_FUNC_DECL GLM_CONSTEXPR qua(T s, vec<3, T, Q> const& v);
GLM_FUNC_DECL GLM_CONSTEXPR qua(T, T, T, T); GLM_FUNC_DECL GLM_CONSTEXPR qua(T w, T x, T y, T z);
// -- Conversion constructors -- // -- Conversion constructors --

3
glm/detail/type_quat.inl
View File

@ -141,11 +141,10 @@ namespace detail
{} {}
template <typename T, qualifier Q> template <typename T, qualifier Q>
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _w, T _x, T _y, T _z) GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _w, T _x, T _y, T _z)
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
: w(_w), x(_x), y(_y), z(_z) : w(_w), x(_x), y(_y), z(_z)
# else # else
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _x, T _y, T _z, T _w)
: x(_x), y(_y), z(_z), w(_w) : x(_x), y(_y), z(_z), w(_w)
# endif # endif
{} {}