Merge pull request 'SLERP for antiparallel Quaternions' (#165) from slerp-fix-antiparallel-quaternions into develop
Reviewed-on: #165 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
This commit is contained in:
commit
7105e199c6
@ -51,15 +51,17 @@ void QuaternionOperations::slerp(const double q1[4], const double q2[4], const d
|
||||
multiply(q1s, q2I, qD);
|
||||
angle = std::acos(qD[3]);
|
||||
|
||||
if (std::cos(angle) < 0.0) {
|
||||
// we need to invert one quaternion
|
||||
VectorOperations<double>::mulScalar(q1s, -1, q1s, 4);
|
||||
multiply(q1s, q2I, qD);
|
||||
angle = std::acos(qD[3]);
|
||||
}
|
||||
|
||||
if (std::sin(angle) == 0.0) {
|
||||
// nothing to calculate here
|
||||
std::memcpy(q, q1s, 4 * sizeof(double));
|
||||
return;
|
||||
} else if (std::cos(angle) < 0.0) {
|
||||
// we need to invert one quaternione
|
||||
VectorOperations<double>::mulScalar(q1s, -1, q1s, 4);
|
||||
multiply(q1s, q2I, qD);
|
||||
angle = std::acos(qD[3]);
|
||||
}
|
||||
|
||||
VectorOperations<double>::mulScalar(q1s, std::sin((1 - weight) * angle) / std::sin(angle), left,
|
||||
|
Loading…
Reference in New Issue
Block a user