summaryrefslogtreecommitdiffstats
path: root/external/include/glm/gtx/quaternion.inl
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--external/include/glm/gtx/quaternion.inl158
1 files changed, 100 insertions, 58 deletions
diff --git a/external/include/glm/gtx/quaternion.inl b/external/include/glm/gtx/quaternion.inl
index c86ec18..fde7a8f 100644
--- a/external/include/glm/gtx/quaternion.inl
+++ b/external/include/glm/gtx/quaternion.inl
@@ -6,84 +6,90 @@
namespace glm
{
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> cross(tvec3<T, P> const& v, tquat<T, P> const& q)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> quat_identity()
+ {
+ return tquat<T, Q>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+ }
+
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER vec<3, T, Q> cross(vec<3, T, Q> const& v, tquat<T, Q> const& q)
{
return inverse(q) * v;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> cross(tquat<T, P> const& q, tvec3<T, P> const& v)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER vec<3, T, Q> cross(tquat<T, Q> const& q, vec<3, T, Q> const& v)
{
return q * v;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> squad
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> squad
(
- tquat<T, P> const & q1,
- tquat<T, P> const & q2,
- tquat<T, P> const & s1,
- tquat<T, P> const & s2,
- T const & h)
+ tquat<T, Q> const& q1,
+ tquat<T, Q> const& q2,
+ tquat<T, Q> const& s1,
+ tquat<T, Q> const& s2,
+ T const& h)
{
return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> intermediate
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> intermediate
(
- tquat<T, P> const & prev,
- tquat<T, P> const & curr,
- tquat<T, P> const & next
+ tquat<T, Q> const& prev,
+ tquat<T, Q> const& curr,
+ tquat<T, Q> const& next
)
{
- tquat<T, P> invQuat = inverse(curr);
+ tquat<T, Q> invQuat = inverse(curr);
return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> exp(tquat<T, P> const& q)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> exp(tquat<T, Q> const& q)
{
- tvec3<T, P> u(q.x, q.y, q.z);
+ vec<3, T, Q> u(q.x, q.y, q.z);
T const Angle = glm::length(u);
if (Angle < epsilon<T>())
- return tquat<T, P>();
+ return tquat<T, Q>();
- tvec3<T, P> const v(u / Angle);
- return tquat<T, P>(cos(Angle), sin(Angle) * v);
+ vec<3, T, Q> const v(u / Angle);
+ return tquat<T, Q>(cos(Angle), sin(Angle) * v);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> log(tquat<T, P> const& q)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> log(tquat<T, Q> const& q)
{
- tvec3<T, P> u(q.x, q.y, q.z);
+ vec<3, T, Q> u(q.x, q.y, q.z);
T Vec3Len = length(u);
if (Vec3Len < epsilon<T>())
{
if(q.w > static_cast<T>(0))
- return tquat<T, P>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+ return tquat<T, Q>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
else if(q.w < static_cast<T>(0))
- return tquat<T, P>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
+ return tquat<T, Q>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
else
- return tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
+ return tquat<T, Q>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
}
else
{
T t = atan(Vec3Len, T(q.w)) / Vec3Len;
T QuatLen2 = Vec3Len * Vec3Len + q.w * q.w;
- return tquat<T, P>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z);
+ return tquat<T, Q>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z);
}
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> pow(tquat<T, P> const & x, T const & y)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> pow(tquat<T, Q> const& x, T const& y)
{
//Raising to the power of 0 should yield 1
//Needed to prevent a division by 0 error later on
if(y > -epsilon<T>() && y < epsilon<T>())
- return tquat<T, P>(1,0,0,0);
+ return tquat<T, Q>(1,0,0,0);
//To deal with non-unit quaternions
T magnitude = sqrt(x.x * x.x + x.y * x.y + x.z * x.z + x.w *x.w);
@@ -91,30 +97,30 @@ namespace glm
//Equivalent to raising a real number to a power
//Needed to prevent a division by 0 error later on
if(abs(x.w / magnitude) > static_cast<T>(1) - epsilon<T>() && abs(x.w / magnitude) < static_cast<T>(1) + epsilon<T>())
- return tquat<T, P>(pow(x.w, y),0,0,0);
+ return tquat<T, Q>(pow(x.w, y),0,0,0);
T Angle = acos(x.w / magnitude);
T NewAngle = Angle * y;
T Div = sin(NewAngle) / sin(Angle);
T Mag = pow(magnitude, y - static_cast<T>(1));
- return tquat<T, P>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
+ return tquat<T, Q>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec3<T, P> rotate(tquat<T, P> const& q, tvec3<T, P> const& v)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER vec<3, T, Q> rotate(tquat<T, Q> const& q, vec<3, T, Q> const& v)
{
return q * v;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tvec4<T, P> rotate(tquat<T, P> const& q, tvec4<T, P> const& v)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER vec<4, T, Q> rotate(tquat<T, Q> const& q, vec<4, T, Q> const& v)
{
return q * v;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, P> const& q)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, Q> const& q)
{
T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
if(w < T(0))
@@ -123,20 +129,20 @@ namespace glm
return -sqrt(w);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER T length2(tquat<T, P> const& q)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER T length2(tquat<T, Q> const& q)
{
return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> shortMix(tquat<T, P> const& x, tquat<T, P> const& y, T const& a)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> shortMix(tquat<T, Q> const& x, tquat<T, Q> const& y, T const& a)
{
if(a <= static_cast<T>(0)) return x;
if(a >= static_cast<T>(1)) return y;
T fCos = dot(x, y);
- tquat<T, P> y2(y); //BUG!!! tquat<T> y2;
+ tquat<T, Q> y2(y); //BUG!!! tquat<T> y2;
if(fCos < static_cast<T>(0))
{
y2 = -y;
@@ -159,27 +165,29 @@ namespace glm
k1 = sin((static_cast<T>(0) + a) * fAngle) * fOneOverSin;
}
- return tquat<T, P>(
+ return tquat<T, Q>(
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 <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> fastMix(tquat<T, P> const& x, tquat<T, P> const& y, T const & a)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> fastMix(tquat<T, Q> const& x, tquat<T, Q> const& y, T const& a)
{
return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tquat<T, P> rotation(tvec3<T, P> const& orig, tvec3<T, P> const& dest)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> rotation(vec<3, T, Q> const& orig, vec<3, T, Q> const& dest)
{
T cosTheta = dot(orig, dest);
- tvec3<T, P> rotationAxis;
+ vec<3, T, Q> rotationAxis;
- if(cosTheta >= static_cast<T>(1) - epsilon<T>())
- return quat();
+ if(cosTheta >= static_cast<T>(1) - epsilon<T>()) {
+ // orig and dest point in the same direction
+ return quat_identity<T,Q>();
+ }
if(cosTheta < static_cast<T>(-1) + epsilon<T>())
{
@@ -188,9 +196,9 @@ namespace glm
// So guess one; any will do as long as it's perpendicular to start
// This implementation favors a rotation around the Up axis (Y),
// since it's often what you want to do.
- rotationAxis = cross(tvec3<T, P>(0, 0, 1), orig);
+ rotationAxis = cross(vec<3, T, Q>(0, 0, 1), orig);
if(length2(rotationAxis) < epsilon<T>()) // bad luck, they were parallel, try again!
- rotationAxis = cross(tvec3<T, P>(1, 0, 0), orig);
+ rotationAxis = cross(vec<3, T, Q>(1, 0, 0), orig);
rotationAxis = normalize(rotationAxis);
return angleAxis(pi<T>(), rotationAxis);
@@ -202,11 +210,45 @@ namespace glm
T s = sqrt((T(1) + cosTheta) * static_cast<T>(2));
T invs = static_cast<T>(1) / s;
- return tquat<T, P>(
- s * static_cast<T>(0.5f),
+ return tquat<T, Q>(
+ s * static_cast<T>(0.5f),
rotationAxis.x * invs,
rotationAxis.y * invs,
rotationAxis.z * invs);
}
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAt(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+ {
+# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
+ return quatLookAtLH(direction, up);
+# else
+ return quatLookAtRH(direction, up);
+# endif
+ }
+
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtRH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+ {
+ mat<3, 3, T, Q> Result;
+
+ Result[2] = -direction;
+ Result[0] = normalize(cross(up, Result[2]));
+ Result[1] = cross(Result[2], Result[0]);
+
+ return quat_cast(Result);
+ }
+
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtLH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+ {
+ mat<3, 3, T, Q> Result;
+
+ Result[2] = direction;
+ Result[0] = normalize(cross(up, Result[2]));
+ Result[1] = cross(Result[2], Result[0]);
+
+ return quat_cast(Result);
+ }
+
}//namespace glm