Fix constructor of struct qua to honor macro "GLM_FORCE_QUAT_DATA_WXYZ"

Signed-off-by: Gaoyang Zhang <[email protected]>
xiongyanan · May 2, 2021 · f931c49 · f931c49
1 parent 761a842
commit f931c49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/glm/detail/type_quat.hpp b/glm/detail/type_quat.hpp
@@ -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 --
 

diff --git a/glm/detail/type_quat.inl b/glm/detail/type_quat.inl
@@ -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
 	{}