mirror of
https://github.com/g-truc/glm.git
synced 2024-11-22 17:04:35 +00:00
quaternion: Revert #1069
This commit is contained in:
parent
1cc8e80e3b
commit
cf69137d6d
@ -42,17 +42,17 @@ namespace glm
|
|||||||
# if GLM_LANG & GLM_LANG_CXXMS_FLAG
|
# if GLM_LANG & GLM_LANG_CXXMS_FLAG
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
struct { T x, y, z, w; };
|
|
||||||
# else
|
|
||||||
struct { T w, x, y, z; };
|
struct { T w, x, y, z; };
|
||||||
|
# else
|
||||||
|
struct { T x, y, z, w; };
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
typename detail::storage<4, T, detail::is_aligned<Q>::value>::type data;
|
typename detail::storage<4, T, detail::is_aligned<Q>::value>::type data;
|
||||||
};
|
};
|
||||||
# else
|
# else
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
T x, y, z, w;
|
T w, x, y, z;
|
||||||
# else
|
# else
|
||||||
T w, x, y, z;
|
T w, x, y, z;
|
||||||
# endif
|
# endif
|
||||||
|
@ -75,10 +75,10 @@ namespace detail
|
|||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & qua<T, Q>::operator[](typename qua<T, Q>::length_type i)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & qua<T, Q>::operator[](typename qua<T, Q>::length_type i)
|
||||||
{
|
{
|
||||||
assert(i >= 0 && i < this->length());
|
assert(i >= 0 && i < this->length());
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
return (&x)[i];
|
|
||||||
# else
|
|
||||||
return (&w)[i];
|
return (&w)[i];
|
||||||
|
# else
|
||||||
|
return (&x)[i];
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,10 +86,10 @@ namespace detail
|
|||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& qua<T, Q>::operator[](typename qua<T, Q>::length_type i) const
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& qua<T, Q>::operator[](typename qua<T, Q>::length_type i) const
|
||||||
{
|
{
|
||||||
assert(i >= 0 && i < this->length());
|
assert(i >= 0 && i < this->length());
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
return (&x)[i];
|
|
||||||
# else
|
|
||||||
return (&w)[i];
|
return (&w)[i];
|
||||||
|
# else
|
||||||
|
return (&x)[i];
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,10 +99,10 @@ namespace detail
|
|||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua()
|
GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua()
|
||||||
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
# if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
: x(0), y(0), z(0), w(1)
|
|
||||||
# else
|
|
||||||
: w(1), x(0), y(0), z(0)
|
: w(1), x(0), y(0), z(0)
|
||||||
|
# else
|
||||||
|
: x(0), y(0), z(0), w(1)
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
@ -111,10 +111,10 @@ namespace detail
|
|||||||
# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE
|
# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<T, Q> const& q)
|
GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<T, Q> const& q)
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
: x(q.x), y(q.y), z(q.z), w(q.w)
|
|
||||||
# else
|
|
||||||
: w(q.w), x(q.x), y(q.y), z(q.z)
|
: w(q.w), x(q.x), y(q.y), z(q.z)
|
||||||
|
# else
|
||||||
|
: x(q.x), y(q.y), z(q.z), w(q.w)
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
# endif
|
# endif
|
||||||
@ -122,10 +122,10 @@ namespace detail
|
|||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<T, P> const& q)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<T, P> const& q)
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
: x(q.x), y(q.y), z(q.z), w(q.w)
|
|
||||||
# else
|
|
||||||
: w(q.w), x(q.x), y(q.y), z(q.z)
|
: w(q.w), x(q.x), y(q.y), z(q.z)
|
||||||
|
# else
|
||||||
|
: x(q.x), y(q.y), z(q.z), w(q.w)
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@ -133,20 +133,19 @@ namespace detail
|
|||||||
|
|
||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T s, vec<3, T, Q> const& v)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(T s, vec<3, T, Q> const& v)
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
: x(v.x), y(v.y), z(v.z), w(s)
|
|
||||||
# else
|
|
||||||
: w(s), x(v.x), y(v.y), z(v.z)
|
: w(s), x(v.x), y(v.y), z(v.z)
|
||||||
|
# else
|
||||||
|
: x(v.x), y(v.y), z(v.z), w(s)
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
|
|
||||||
template <typename T, qualifier Q>
|
template <typename T, qualifier Q>
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
|
||||||
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)
|
|
||||||
# else
|
|
||||||
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
|
||||||
|
: x(_x), y(_y), z(_z), w(_w)
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@ -164,10 +163,10 @@ namespace detail
|
|||||||
template<typename T, qualifier Q>
|
template<typename T, qualifier Q>
|
||||||
template<typename U, qualifier P>
|
template<typename U, qualifier P>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<U, P> const& q)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q>::qua(qua<U, P> const& q)
|
||||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
# ifdef GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
: x(static_cast<T>(q.x)), y(static_cast<T>(q.y)), z(static_cast<T>(q.z)), w(static_cast<T>(q.w))
|
|
||||||
# else
|
|
||||||
: w(static_cast<T>(q.w)), x(static_cast<T>(q.x)), y(static_cast<T>(q.y)), z(static_cast<T>(q.z))
|
: w(static_cast<T>(q.w)), x(static_cast<T>(q.x)), y(static_cast<T>(q.y)), z(static_cast<T>(q.z))
|
||||||
|
# else
|
||||||
|
: x(static_cast<T>(q.x)), y(static_cast<T>(q.y)), z(static_cast<T>(q.z)), w(static_cast<T>(q.w))
|
||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ glmCreateTestGTC(core_force_platform_unknown)
|
|||||||
glmCreateTestGTC(core_force_pure)
|
glmCreateTestGTC(core_force_pure)
|
||||||
glmCreateTestGTC(core_force_unrestricted_gentype)
|
glmCreateTestGTC(core_force_unrestricted_gentype)
|
||||||
glmCreateTestGTC(core_force_xyzw_only)
|
glmCreateTestGTC(core_force_xyzw_only)
|
||||||
glmCreateTestGTC(core_force_quat_xyzw)
|
glmCreateTestGTC(core_force_quat_wxyz)
|
||||||
glmCreateTestGTC(core_type_aligned)
|
glmCreateTestGTC(core_type_aligned)
|
||||||
glmCreateTestGTC(core_type_cast)
|
glmCreateTestGTC(core_type_cast)
|
||||||
glmCreateTestGTC(core_type_ctor)
|
glmCreateTestGTC(core_type_ctor)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#define GLM_FORCE_QUAT_DATA_XYZW
|
#define GLM_FORCE_QUAT_DATA_WXYZ
|
||||||
#define GLM_FORCE_INLINE
|
#define GLM_FORCE_INLINE
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
Loading…
Reference in New Issue
Block a user