home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sirlantis/patch-1' into dev

Browse Source
This commit is contained in:
Mr.doob
2011-10-15 09:01:58 +02:00
parent d2b8a07822 b6e6624a1d
commit 6742f8e4a4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Quaternion.js
+13 -4
View File
@@ -207,8 +207,17 @@ THREE.Quaternion.prototype = {
THREE.Quaternion.slerp = function ( qa, qb, qm, t ) {
// http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/slerp/
var cosHalfTheta = qa.w * qb.w + qa.x * qb.x + qa.y * qb.y + qa.z * qb.z;
if (cosHalfTheta < 0) {
qm.w = -qb.w; qm.x = -qb.x; qm.y = -qb.y; qm.z = -qb.z;
cosHalfTheta = -cosHalfTheta;
} else {
qm.copy(qb);
}
if ( Math.abs( cosHalfTheta ) >= 1.0 ) {
qm.w = qa.w; qm.x = qa.x; qm.y = qa.y; qm.z = qa.z;
@@ -233,10 +242,10 @@ THREE.Quaternion.slerp = function ( qa, qb, qm, t ) {
var ratioA = Math.sin( ( 1 - t ) * halfTheta ) / sinHalfTheta,
ratioB = Math.sin( t * halfTheta ) / sinHalfTheta;
qm.w = ( qa.w * ratioA + qb.w * ratioB );
qm.x = ( qa.x * ratioA + qb.x * ratioB );
qm.y = ( qa.y * ratioA + qb.y * ratioB );
qm.z = ( qa.z * ratioA + qb.z * ratioB );
qm.w = ( qa.w * ratioA + qm.w * ratioB );
qm.x = ( qa.x * ratioA + qm.x * ratioB );
qm.y = ( qa.y * ratioA + qm.y * ratioB );
qm.z = ( qa.z * ratioA + qm.z * ratioB );
return qm;