mirror of
https://github.com/g-truc/glm.git
synced 2024-11-22 08:54:35 +00:00
Fix constructor of struct qua to honor macro "GLM_FORCE_QUAT_DATA_WXYZ"
Signed-off-by: Gaoyang Zhang <gy@blurgy.xyz>
This commit is contained in:
parent
761a842a59
commit
f931c4996a
@ -88,7 +88,7 @@ namespace glm
|
||||
// -- Explicit basic constructors --
|
||||
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR qua(T s, vec<3, T, Q> const& v);
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR qua(T w, T x, T y, T z);
|
||||
GLM_FUNC_DECL GLM_CONSTEXPR qua(T, T, T, T);
|
||||
|
||||
// -- Conversion constructors --
|
||||
|
||||
|
@ -141,10 +141,11 @@ namespace detail
|
||||
{}
|
||||
|
||||
template <typename T, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _w, T _x, T _y, T _z)
|
||||
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T _w, T _x, T _y, T _z)
|
||||
: w(_w), x(_x), y(_y), z(_z)
|
||||
# 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)
|
||||
# endif
|
||||
{}
|
||||
|
Loading…
Reference in New Issue
Block a user