mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed quat slerp using mix function when cosTheta close to 1

Browse Source
This commit is contained in:
Christophe Riccio 2012-12-20 18:13:04 +01:00
parent 0b41846700
commit 560b474008
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glm/gtc/quaternion.inl
View File

@ -451,20 +451,20 @@ namespace detail
T const & a T const & a
) )
{ {
T cosTheta = dot(x, y); T cosTheta = dot(x, y);
if(cosTheta <= epsilon<T>()) if(glm::abs(cosTheta - T(1)) <= epsilon<T>())
{ {
return detail::tquat<T>( return detail::tquat<T>(
mix(x.x, y.x, a), mix(x.x, y.x, a),
mix(x.y, y.y, a), mix(x.y, y.y, a),
mix(x.z, y.z, a), mix(x.z, y.z, a),
mix(x.w, y.w, a)); mix(x.w, y.w, a));
} }
else else
{ {
T angle = acos(cosTheta); T angle = acos(cosTheta);
return (glm::sin((T(1) - a) * angle) * x + glm::sin(a * angle) * y) / glm::sin(angle); return (glm::sin((T(1) - a) * angle) * x + glm::sin(a * angle) * y) / glm::sin(angle);
} }
} }
template <typename T> template <typename T>

1
readme.txt
View File

@ -44,6 +44,7 @@ GLM 0.9.4.1: 2012-12-17
- Fixed interaction between quaternion and euler angles. - Fixed interaction between quaternion and euler angles.
- Fixed GTC_constants build - Fixed GTC_constants build
- Fixed GTX_multiple - Fixed GTX_multiple
- Fixed quat slerp using mix function when cosTheta close to 1
================================================================================ ================================================================================
GLM 0.9.4.0: 2012-11-18 GLM 0.9.4.0: 2012-11-18