Browse Source

Fixed slerp, linear interpolation when cosTheta is close to 1, #65

Christophe Riccio 12 years ago
parent
commit
e7dc01fc06
1 changed files with 4 additions and 4 deletions
  1. 4 4
      glm/gtc/quaternion.inl

+ 4 - 4
glm/gtc/quaternion.inl

@@ -512,10 +512,10 @@ namespace detail
 		{
 			// Linear interpolation
 			return detail::tquat<T>(
-				mix(x.w, y.w, a),
-				mix(x.x, y.x, a),
-				mix(x.y, y.y, a),
-				mix(x.z, y.z, a));
+				mix(x.w, z.w, a),
+				mix(x.x, z.x, a),
+				mix(x.y, z.y, a),
+				mix(x.z, z.z, a));
 		}
 		else
 		{