From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/gtc/quaternion.inl | 533 ++++++++++++++++---------------- 1 file changed, 273 insertions(+), 260 deletions(-) (limited to 'external/include/glm/gtc/quaternion.inl') diff --git a/external/include/glm/gtc/quaternion.inl b/external/include/glm/gtc/quaternion.inl index c9b2af7..df4a5f7 100644 --- a/external/include/glm/gtc/quaternion.inl +++ b/external/include/glm/gtc/quaternion.inl @@ -4,78 +4,80 @@ #include "../trigonometric.hpp" #include "../geometric.hpp" #include "../exponential.hpp" +#include "../detail/compute_vector_relational.hpp" +#include "epsilon.hpp" #include namespace glm{ namespace detail { - template - struct compute_dot + template + struct compute_dot, T, Aligned> { - static GLM_FUNC_QUALIFIER T call(tquat const& x, tquat const& y) + static GLM_FUNC_QUALIFIER T call(tquat const& a, tquat const& b) { - tvec4 tmp(x.x * y.x, x.y * y.y, x.z * y.z, x.w * y.w); + vec<4, T, Q> tmp(a.x * b.x, a.y * b.y, a.z * b.z, a.w * b.w); return (tmp.x + tmp.y) + (tmp.z + tmp.w); } }; - template + template struct compute_quat_add { - static tquat call(tquat const& q, tquat const& p) + static tquat call(tquat const& q, tquat const& p) { - return tquat(q.w + p.w, q.x + p.x, q.y + p.y, q.z + p.z); + return tquat(q.w + p.w, q.x + p.x, q.y + p.y, q.z + p.z); } }; - template + template struct compute_quat_sub { - static tquat call(tquat const& q, tquat const& p) + static tquat call(tquat const& q, tquat const& p) { - return tquat(q.w - p.w, q.x - p.x, q.y - p.y, q.z - p.z); + return tquat(q.w - p.w, q.x - p.x, q.y - p.y, q.z - p.z); } }; - template + template struct compute_quat_mul_scalar { - static tquat call(tquat const& q, T s) + static tquat call(tquat const& q, T s) { - return tquat(q.w * s, q.x * s, q.y * s, q.z * s); + return tquat(q.w * s, q.x * s, q.y * s, q.z * s); } }; - template + template struct compute_quat_div_scalar { - static tquat call(tquat const& q, T s) + static tquat call(tquat const& q, T s) { - return tquat(q.w / s, q.x / s, q.y / s, q.z / s); + return tquat(q.w / s, q.x / s, q.y / s, q.z / s); } }; - template + template struct compute_quat_mul_vec4 { - static tvec4 call(tquat const & q, tvec4 const & v) + static vec<4, T, Q> call(tquat const& q, vec<4, T, Q> const& v) { - return tvec4(q * tvec3(v), v.w); + return vec<4, T, Q>(q * vec<3, T, Q>(v), v.w); } }; }//namespace detail // -- Component accesses -- - template - GLM_FUNC_QUALIFIER T & tquat::operator[](typename tquat::length_type i) + template + GLM_FUNC_QUALIFIER T & tquat::operator[](typename tquat::length_type i) { assert(i >= 0 && i < this->length()); return (&x)[i]; } - template - GLM_FUNC_QUALIFIER T const & tquat::operator[](typename tquat::length_type i) const + template + GLM_FUNC_QUALIFIER T const& tquat::operator[](typename tquat::length_type i) const { assert(i >= 0 && i < this->length()); return (&x)[i]; @@ -83,129 +85,139 @@ namespace detail // -- Implicit basic constructors -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat() -# ifndef GLM_FORCE_NO_CTOR_INIT - : x(0), y(0), z(0), w(1) +# if !GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat() +# ifdef GLM_FORCE_CTOR_INIT + : x(0), y(0), z(0), w(1) # endif {} # endif # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const & q) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const& q) : x(q.x), y(q.y), z(q.z), w(q.w) {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const & q) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const& q) : x(q.x), y(q.y), z(q.z), w(q.w) {} // -- Explicit basic constructors -- - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tquat::tquat(ctor) - {} - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T const & s, tvec3 const & v) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T s, vec<3, T, Q> const& v) : x(v.x), y(v.y), z(v.z), w(s) {} - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T const & w, T const & x, T const & y, T const & z) - : x(x), y(y), z(z), w(w) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T _w, T _x, T _y, T _z) + : x(_x), y(_y), z(_z), w(_w) {} // -- Conversion constructors -- - template - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const & q) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(tquat const& q) : x(static_cast(q.x)) , y(static_cast(q.y)) , z(static_cast(q.z)) , w(static_cast(q.w)) {} - //template + //template //GLM_FUNC_QUALIFIER tquat::tquat //( - // valType const & pitch, - // valType const & yaw, - // valType const & roll + // valType const& pitch, + // valType const& yaw, + // valType const& roll //) //{ - // tvec3 eulerAngle(pitch * valType(0.5), yaw * valType(0.5), roll * valType(0.5)); - // tvec3 c = glm::cos(eulerAngle * valType(0.5)); - // tvec3 s = glm::sin(eulerAngle * valType(0.5)); - // + // vec<3, valType> eulerAngle(pitch * valType(0.5), yaw * valType(0.5), roll * valType(0.5)); + // vec<3, valType> c = glm::cos(eulerAngle * valType(0.5)); + // vec<3, valType> s = glm::sin(eulerAngle * valType(0.5)); + // // this->w = c.x * c.y * c.z + s.x * s.y * s.z; // this->x = s.x * c.y * c.z - c.x * s.y * s.z; // this->y = c.x * s.y * c.z + s.x * c.y * s.z; // this->z = c.x * c.y * s.z - s.x * s.y * c.z; //} - template - GLM_FUNC_QUALIFIER tquat::tquat(tvec3 const & u, tvec3 const & v) + template + GLM_FUNC_QUALIFIER tquat::tquat(vec<3, T, Q> const& u, vec<3, T, Q> const& v) { - tvec3 const LocalW(cross(u, v)); - T Dot = detail::compute_dot::value>::call(u, v); - tquat q(T(1) + Dot, LocalW.x, LocalW.y, LocalW.z); + T norm_u_norm_v = sqrt(dot(u, u) * dot(v, v)); + T real_part = norm_u_norm_v + dot(u, v); + vec<3, T, Q> t; + + if(real_part < static_cast(1.e-6f) * norm_u_norm_v) + { + // If u and v are exactly opposite, rotate 180 degrees + // around an arbitrary orthogonal axis. Axis normalisation + // can happen later, when we normalise the quaternion. + real_part = static_cast(0); + t = abs(u.x) > abs(u.z) ? vec<3, T, Q>(-u.y, u.x, static_cast(0)) : vec<3, T, Q>(static_cast(0), -u.z, u.y); + } + else + { + // Otherwise, build quaternion the standard way. + t = cross(u, v); + } - *this = normalize(q); + *this = normalize(tquat(real_part, t.x, t.y, t.z)); } - template - GLM_FUNC_QUALIFIER tquat::tquat(tvec3 const & eulerAngle) + template + GLM_FUNC_QUALIFIER tquat::tquat(vec<3, T, Q> const& eulerAngle) { - tvec3 c = glm::cos(eulerAngle * T(0.5)); - tvec3 s = glm::sin(eulerAngle * T(0.5)); - + vec<3, T, Q> c = glm::cos(eulerAngle * T(0.5)); + vec<3, T, Q> s = glm::sin(eulerAngle * T(0.5)); + this->w = c.x * c.y * c.z + s.x * s.y * s.z; this->x = s.x * c.y * c.z - c.x * s.y * s.z; this->y = c.x * s.y * c.z + s.x * c.y * s.z; this->z = c.x * c.y * s.z - s.x * s.y * c.z; } - template - GLM_FUNC_QUALIFIER tquat::tquat(tmat3x3 const & m) + template + GLM_FUNC_QUALIFIER tquat::tquat(mat<3, 3, T, Q> const& m) { *this = quat_cast(m); } - template - GLM_FUNC_QUALIFIER tquat::tquat(tmat4x4 const & m) + template + GLM_FUNC_QUALIFIER tquat::tquat(mat<4, 4, T, Q> const& m) { *this = quat_cast(m); } # if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS - template - GLM_FUNC_QUALIFIER tquat::operator tmat3x3() + template + GLM_FUNC_QUALIFIER tquat::operator mat<3, 3, T, Q>() { return mat3_cast(*this); } - - template - GLM_FUNC_QUALIFIER tquat::operator tmat4x4() + + template + GLM_FUNC_QUALIFIER tquat::operator mat<4, 4, T, Q>() { return mat4_cast(*this); } # endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS - template - GLM_FUNC_QUALIFIER tquat conjugate(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat conjugate(tquat const& q) { - return tquat(q.w, -q.x, -q.y, -q.z); + return tquat(q.w, -q.x, -q.y, -q.z); } - template - GLM_FUNC_QUALIFIER tquat inverse(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat inverse(tquat const& q) { return conjugate(q) / dot(q, q); } @@ -213,8 +225,8 @@ namespace detail // -- Unary arithmetic operators -- # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const& q) { this->w = q.w; this->x = q.x; @@ -224,9 +236,9 @@ namespace detail } # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const & q) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator=(tquat const& q) { this->w = static_cast(q.w); this->x = static_cast(q.x); @@ -235,26 +247,26 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator+=(tquat const& q) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator+=(tquat const& q) { - return (*this = detail::compute_quat_add::value>::call(*this, tquat(q))); + return (*this = detail::compute_quat_add::value>::call(*this, tquat(q))); } - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator-=(tquat const& q) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator-=(tquat const& q) { - return (*this = detail::compute_quat_sub::value>::call(*this, tquat(q))); + return (*this = detail::compute_quat_sub::value>::call(*this, tquat(q))); } - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator*=(tquat const & r) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator*=(tquat const& r) { - tquat const p(*this); - tquat const q(r); + tquat const p(*this); + tquat const q(r); this->w = p.w * q.w - p.x * q.x - p.y * q.y - p.z * q.z; this->x = p.w * q.x + p.x * q.w + p.y * q.z - p.z * q.y; @@ -263,132 +275,145 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator*=(U s) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator*=(U s) { - return (*this = detail::compute_quat_mul_scalar::value>::call(*this, static_cast(s))); + return (*this = detail::compute_quat_mul_scalar::value>::call(*this, static_cast(s))); } - template - template - GLM_FUNC_QUALIFIER tquat & tquat::operator/=(U s) + template + template + GLM_FUNC_QUALIFIER tquat & tquat::operator/=(U s) { - return (*this = detail::compute_quat_div_scalar::value>::call(*this, static_cast(s))); + return (*this = detail::compute_quat_div_scalar::value>::call(*this, static_cast(s))); } // -- Unary bit operators -- - template - GLM_FUNC_QUALIFIER tquat operator+(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat operator+(tquat const& q) { return q; } - template - GLM_FUNC_QUALIFIER tquat operator-(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat operator-(tquat const& q) { - return tquat(-q.w, -q.x, -q.y, -q.z); + return tquat(-q.w, -q.x, -q.y, -q.z); } // -- Binary operators -- - template - GLM_FUNC_QUALIFIER tquat operator+(tquat const & q, tquat const & p) + template + GLM_FUNC_QUALIFIER tquat operator+(tquat const& q, tquat const& p) { - return tquat(q) += p; + return tquat(q) += p; } - template - GLM_FUNC_QUALIFIER tquat operator*(tquat const & q, tquat const & p) + template + GLM_FUNC_QUALIFIER tquat operator-(tquat const& q, tquat const& p) { - return tquat(q) *= p; + return tquat(q) -= p; } - template - GLM_FUNC_QUALIFIER tvec3 operator*(tquat const & q, tvec3 const & v) + template + GLM_FUNC_QUALIFIER tquat operator*(tquat const& q, tquat const& p) { - tvec3 const QuatVector(q.x, q.y, q.z); - tvec3 const uv(glm::cross(QuatVector, v)); - tvec3 const uuv(glm::cross(QuatVector, uv)); + return tquat(q) *= p; + } + + template + GLM_FUNC_QUALIFIER vec<3, T, Q> operator*(tquat const& q, vec<3, T, Q> const& v) + { + vec<3, T, Q> const QuatVector(q.x, q.y, q.z); + vec<3, T, Q> const uv(glm::cross(QuatVector, v)); + vec<3, T, Q> const uuv(glm::cross(QuatVector, uv)); return v + ((uv * q.w) + uuv) * static_cast(2); } - template - GLM_FUNC_QUALIFIER tvec3 operator*(tvec3 const & v, tquat const & q) + template + GLM_FUNC_QUALIFIER vec<3, T, Q> operator*(vec<3, T, Q> const& v, tquat const& q) { return glm::inverse(q) * v; } - template - GLM_FUNC_QUALIFIER tvec4 operator*(tquat const& q, tvec4 const& v) + template + GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(tquat const& q, vec<4, T, Q> const& v) { - return detail::compute_quat_mul_vec4::value>::call(q, v); + return detail::compute_quat_mul_vec4::value>::call(q, v); } - template - GLM_FUNC_QUALIFIER tvec4 operator*(tvec4 const & v, tquat const & q) + template + GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(vec<4, T, Q> const& v, tquat const& q) { return glm::inverse(q) * v; } - template - GLM_FUNC_QUALIFIER tquat operator*(tquat const & q, T const & s) + template + GLM_FUNC_QUALIFIER tquat operator*(tquat const& q, T const& s) { - return tquat( + return tquat( q.w * s, q.x * s, q.y * s, q.z * s); } - template - GLM_FUNC_QUALIFIER tquat operator*(T const & s, tquat const & q) + template + GLM_FUNC_QUALIFIER tquat operator*(T const& s, tquat const& q) { return q * s; } - template - GLM_FUNC_QUALIFIER tquat operator/(tquat const & q, T const & s) + template + GLM_FUNC_QUALIFIER tquat operator/(tquat const& q, T const& s) { - return tquat( + return tquat( q.w / s, q.x / s, q.y / s, q.z / s); } // -- Boolean operators -- - template - GLM_FUNC_QUALIFIER bool operator==(tquat const & q1, tquat const & q2) + template + GLM_FUNC_QUALIFIER bool operator==(tquat const& q1, tquat const& q2) { - return (q1.x == q2.x) && (q1.y == q2.y) && (q1.z == q2.z) && (q1.w == q2.w); + return all(epsilonEqual(q1, q2, epsilon())); } - template - GLM_FUNC_QUALIFIER bool operator!=(tquat const & q1, tquat const & q2) + template + GLM_FUNC_QUALIFIER bool operator!=(tquat const& q1, tquat const& q2) { - return (q1.x != q2.x) || (q1.y != q2.y) || (q1.z != q2.z) || (q1.w != q2.w); + return any(epsilonNotEqual(q1, q2, epsilon())); } // -- Operations -- - template - GLM_FUNC_QUALIFIER T length(tquat const & q) + template + GLM_FUNC_QUALIFIER T dot(tquat const& x, tquat const& y) + { + GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); + return detail::compute_dot, T, detail::is_aligned::value>::call(x, y); + } + + template + GLM_FUNC_QUALIFIER T length(tquat const& q) { return glm::sqrt(dot(q, q)); } - template - GLM_FUNC_QUALIFIER tquat normalize(tquat const & q) + template + GLM_FUNC_QUALIFIER tquat normalize(tquat const& q) { T len = length(q); if(len <= T(0)) // Problem - return tquat(1, 0, 0, 0); + return tquat(static_cast(1), static_cast(0), static_cast(0), static_cast(0)); T oneOverLen = T(1) / len; - return tquat(q.w * oneOverLen, q.x * oneOverLen, q.y * oneOverLen, q.z * oneOverLen); + return tquat(q.w * oneOverLen, q.x * oneOverLen, q.y * oneOverLen, q.z * oneOverLen); } - template - GLM_FUNC_QUALIFIER tquat cross(tquat const & q1, tquat const & q2) + template + GLM_FUNC_QUALIFIER tquat cross(tquat const& q1, tquat const& q2) { - return tquat( + return tquat( q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z, q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y, q1.w * q2.y + q1.y * q2.w + q1.z * q2.x - q1.x * q2.z, @@ -396,14 +421,14 @@ namespace detail } /* // (x * sin(1 - a) * angle / sin(angle)) + (y * sin(a) * angle / sin(angle)) - template - GLM_FUNC_QUALIFIER tquat mix(tquat const & x, tquat const & y, T const & a) + template + GLM_FUNC_QUALIFIER tquat mix(tquat const& x, tquat const& y, T const& a) { if(a <= T(0)) return x; if(a >= T(1)) return y; float fCos = dot(x, y); - tquat y2(y); //BUG!!! tquat y2; + tquat y2(y); //BUG!!! tquat y2; if(fCos < T(0)) { y2 = -y; @@ -426,19 +451,19 @@ namespace detail k1 = sin((T(0) + a) * fAngle) * fOneOverSin; } - return tquat( + return tquat( k0 * x.w + k1 * y2.w, k0 * x.x + k1 * y2.x, k0 * x.y + k1 * y2.y, k0 * x.z + k1 * y2.z); } - template - GLM_FUNC_QUALIFIER tquat mix2 + template + GLM_FUNC_QUALIFIER tquat mix2 ( - tquat const & x, - tquat const & y, - T const & a + tquat const& x, + tquat const& y, + T const& a ) { bool flip = false; @@ -466,13 +491,13 @@ namespace detail if(flip) alpha = -alpha; - + return normalize(beta * x + alpha * y); } */ - template - GLM_FUNC_QUALIFIER tquat mix(tquat const & x, tquat const & y, T a) + template + GLM_FUNC_QUALIFIER tquat mix(tquat const& x, tquat const& y, T a) { T cosTheta = dot(x, y); @@ -480,7 +505,7 @@ namespace detail if(cosTheta > T(1) - epsilon()) { // Linear interpolation - return tquat( + return tquat( mix(x.w, y.w, a), mix(x.x, y.x, a), mix(x.y, y.y, a), @@ -494,8 +519,8 @@ namespace detail } } - template - GLM_FUNC_QUALIFIER tquat lerp(tquat const & x, tquat const & y, T a) + template + GLM_FUNC_QUALIFIER tquat lerp(tquat const& x, tquat const& y, T a) { // Lerp is only defined in [0, 1] assert(a >= static_cast(0)); @@ -504,14 +529,14 @@ namespace detail return x * (T(1) - a) + (y * a); } - template - GLM_FUNC_QUALIFIER tquat slerp(tquat const & x, tquat const & y, T a) + template + GLM_FUNC_QUALIFIER tquat slerp(tquat const& x, tquat const& y, T a) { - tquat z = y; + tquat z = y; T cosTheta = dot(x, y); - // If cosTheta < 0, the interpolation will take the long way around the sphere. + // If cosTheta < 0, the interpolation will take the long way around the sphere. // To fix this, one quat must be negated. if (cosTheta < T(0)) { @@ -523,7 +548,7 @@ namespace detail if(cosTheta > T(1) - epsilon()) { // Linear interpolation - return tquat( + return tquat( mix(x.w, z.w, a), mix(x.x, z.x, a), mix(x.y, z.y, a), @@ -537,10 +562,10 @@ namespace detail } } - template - GLM_FUNC_QUALIFIER tquat rotate(tquat const & q, T const & angle, tvec3 const & v) + template + GLM_FUNC_QUALIFIER tquat rotate(tquat const& q, T const& angle, vec<3, T, Q> const& v) { - tvec3 Tmp = v; + vec<3, T, Q> Tmp = v; // Axis of rotation must be normalised T len = glm::length(Tmp); @@ -555,38 +580,45 @@ namespace detail T const AngleRad(angle); T const Sin = sin(AngleRad * T(0.5)); - return q * tquat(cos(AngleRad * T(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin); - //return gtc::quaternion::cross(q, tquat(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin)); + return q * tquat(cos(AngleRad * T(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin); + //return gtc::quaternion::cross(q, tquat(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin)); } - template - GLM_FUNC_QUALIFIER tvec3 eulerAngles(tquat const & x) + template + GLM_FUNC_QUALIFIER vec<3, T, Q> eulerAngles(tquat const& x) { - return tvec3(pitch(x), yaw(x), roll(x)); + return vec<3, T, Q>(pitch(x), yaw(x), roll(x)); } - template - GLM_FUNC_QUALIFIER T roll(tquat const & q) + template + GLM_FUNC_QUALIFIER T roll(tquat const& q) { - return T(atan(T(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z)); + return static_cast(atan(static_cast(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z)); } - template - GLM_FUNC_QUALIFIER T pitch(tquat const & q) + template + GLM_FUNC_QUALIFIER T pitch(tquat const& q) { - return T(atan(T(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z)); + //return T(atan(T(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z)); + const T y = static_cast(2) * (q.y * q.z + q.w * q.x); + const T x = q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z; + + if(detail::compute_equal::call(y, static_cast(0)) && detail::compute_equal::call(x, static_cast(0))) //avoid atan2(0,0) - handle singularity - Matiis + return static_cast(static_cast(2) * atan(q.x,q.w)); + + return static_cast(atan(y,x)); } - template - GLM_FUNC_QUALIFIER T yaw(tquat const & q) + template + GLM_FUNC_QUALIFIER T yaw(tquat const& q) { - return asin(clamp(T(-2) * (q.x * q.z - q.w * q.y), T(-1), T(1))); + return asin(clamp(static_cast(-2) * (q.x * q.z - q.w * q.y), static_cast(-1), static_cast(1))); } - template - GLM_FUNC_QUALIFIER tmat3x3 mat3_cast(tquat const & q) + template + GLM_FUNC_QUALIFIER mat<3, 3, T, Q> mat3_cast(tquat const& q) { - tmat3x3 Result(T(1)); + mat<3, 3, T, Q> Result(T(1)); T qxx(q.x * q.x); T qyy(q.y * q.y); T qzz(q.z * q.z); @@ -611,14 +643,14 @@ namespace detail return Result; } - template - GLM_FUNC_QUALIFIER tmat4x4 mat4_cast(tquat const & q) + template + GLM_FUNC_QUALIFIER mat<4, 4, T, Q> mat4_cast(tquat const& q) { - return tmat4x4(mat3_cast(q)); + return mat<4, 4, T, Q>(mat3_cast(q)); } - template - GLM_FUNC_QUALIFIER tquat quat_cast(tmat3x3 const & m) + template + GLM_FUNC_QUALIFIER tquat quat_cast(mat<3, 3, T, Q> const& m) { T fourXSquaredMinus1 = m[0][0] - m[1][1] - m[2][2]; T fourYSquaredMinus1 = m[1][1] - m[0][0] - m[2][2]; @@ -643,70 +675,51 @@ namespace detail biggestIndex = 3; } - T biggestVal = sqrt(fourBiggestSquaredMinus1 + T(1)) * T(0.5); + T biggestVal = sqrt(fourBiggestSquaredMinus1 + static_cast(1)) * static_cast(0.5); T mult = static_cast(0.25) / biggestVal; - tquat Result(uninitialize); switch(biggestIndex) { case 0: - Result.w = biggestVal; - Result.x = (m[1][2] - m[2][1]) * mult; - Result.y = (m[2][0] - m[0][2]) * mult; - Result.z = (m[0][1] - m[1][0]) * mult; - break; + return tquat(biggestVal, (m[1][2] - m[2][1]) * mult, (m[2][0] - m[0][2]) * mult, (m[0][1] - m[1][0]) * mult); case 1: - Result.w = (m[1][2] - m[2][1]) * mult; - Result.x = biggestVal; - Result.y = (m[0][1] + m[1][0]) * mult; - Result.z = (m[2][0] + m[0][2]) * mult; - break; + return tquat((m[1][2] - m[2][1]) * mult, biggestVal, (m[0][1] + m[1][0]) * mult, (m[2][0] + m[0][2]) * mult); case 2: - Result.w = (m[2][0] - m[0][2]) * mult; - Result.x = (m[0][1] + m[1][0]) * mult; - Result.y = biggestVal; - Result.z = (m[1][2] + m[2][1]) * mult; - break; + return tquat((m[2][0] - m[0][2]) * mult, (m[0][1] + m[1][0]) * mult, biggestVal, (m[1][2] + m[2][1]) * mult); case 3: - Result.w = (m[0][1] - m[1][0]) * mult; - Result.x = (m[2][0] + m[0][2]) * mult; - Result.y = (m[1][2] + m[2][1]) * mult; - Result.z = biggestVal; - break; - - default: // Silence a -Wswitch-default warning in GCC. Should never actually get here. Assert is just for sanity. + return tquat((m[0][1] - m[1][0]) * mult, (m[2][0] + m[0][2]) * mult, (m[1][2] + m[2][1]) * mult, biggestVal); + default: // Silence a -Wswitch-default warning in GCC. Should never actually get here. Assert is just for sanity. assert(false); - break; + return tquat(1, 0, 0, 0); } - return Result; } - template - GLM_FUNC_QUALIFIER tquat quat_cast(tmat4x4 const & m4) + template + GLM_FUNC_QUALIFIER tquat quat_cast(mat<4, 4, T, Q> const& m4) { - return quat_cast(tmat3x3(m4)); + return quat_cast(mat<3, 3, T, Q>(m4)); } - template - GLM_FUNC_QUALIFIER T angle(tquat const & x) + template + GLM_FUNC_QUALIFIER T angle(tquat const& x) { - return acos(x.w) * T(2); + return acos(x.w) * static_cast(2); } - template - GLM_FUNC_QUALIFIER tvec3 axis(tquat const & x) + template + GLM_FUNC_QUALIFIER vec<3, T, Q> axis(tquat const& x) { T tmp1 = static_cast(1) - x.w * x.w; if(tmp1 <= static_cast(0)) - return tvec3(0, 0, 1); + return vec<3, T, Q>(0, 0, 1); T tmp2 = static_cast(1) / sqrt(tmp1); - return tvec3(x.x * tmp2, x.y * tmp2, x.z * tmp2); + return vec<3, T, Q>(x.x * tmp2, x.y * tmp2, x.z * tmp2); } - template - GLM_FUNC_QUALIFIER tquat angleAxis(T const & angle, tvec3 const & v) + template + GLM_FUNC_QUALIFIER tquat angleAxis(T const& angle, vec<3, T, Q> const& v) { - tquat Result(uninitialize); + tquat Result; T const a(angle); T const s = glm::sin(a * static_cast(0.5)); @@ -718,74 +731,74 @@ namespace detail return Result; } - template - GLM_FUNC_QUALIFIER tvec4 lessThan(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> lessThan(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] < y[i]; return Result; } - template - GLM_FUNC_QUALIFIER tvec4 lessThanEqual(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> lessThanEqual(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] <= y[i]; return Result; } - template - GLM_FUNC_QUALIFIER tvec4 greaterThan(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> greaterThan(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] > y[i]; return Result; } - template - GLM_FUNC_QUALIFIER tvec4 greaterThanEqual(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> greaterThanEqual(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) Result[i] = x[i] >= y[i]; return Result; } - template - GLM_FUNC_QUALIFIER tvec4 equal(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> equal(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] == y[i]; + Result[i] = detail::compute_equal::call(x[i], y[i]); return Result; } - template - GLM_FUNC_QUALIFIER tvec4 notEqual(tquat const & x, tquat const & y) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> notEqual(tquat const& x, tquat const& y) { - tvec4 Result(uninitialize); + vec<4, bool, Q> Result; for(length_t i = 0; i < x.length(); ++i) - Result[i] = x[i] != y[i]; + Result[i] = !detail::compute_equal::call(x[i], y[i]); return Result; } - template - GLM_FUNC_QUALIFIER tvec4 isnan(tquat const& q) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> isnan(tquat const& q) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'isnan' only accept floating-point inputs"); - return tvec4(isnan(q.x), isnan(q.y), isnan(q.z), isnan(q.w)); + return vec<4, bool, Q>(isnan(q.x), isnan(q.y), isnan(q.z), isnan(q.w)); } - template - GLM_FUNC_QUALIFIER tvec4 isinf(tquat const& q) + template + GLM_FUNC_QUALIFIER vec<4, bool, Q> isinf(tquat const& q) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'isinf' only accept floating-point inputs"); - return tvec4(isinf(q.x), isinf(q.y), isinf(q.z), isinf(q.w)); + return vec<4, bool, Q>(isinf(q.x), isinf(q.y), isinf(q.z), isinf(q.w)); } }//namespace glm -- cgit v1.2.3