diff options
| author | Juan Jose Casafranca <juan.casafranca@kdab.com> | 2019-06-20 14:02:07 +0200 |
|---|---|---|
| committer | Juan Jose Casafranca <juan.casafranca@kdab.com> | 2019-07-15 10:46:36 +0200 |
| commit | 69f112354dc09645a21db75f0630140c4480d809 (patch) | |
| tree | a9b8345effec384dcc75354234f9c39a2fb88928 /src/animation/backend/fcurve.cpp | |
| parent | c732dd6f6bb4d121a16f6ab53bbb571e9f7f5965 (diff) | |
Take shortest path on quaternion slerp
Change-Id: I4499e945481a22adfbafcc82198f7c411d04301b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/backend/fcurve.cpp')
| -rw-r--r-- | src/animation/backend/fcurve.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/animation/backend/fcurve.cpp b/src/animation/backend/fcurve.cpp index 490866d54..18f1f427e 100644 --- a/src/animation/backend/fcurve.cpp +++ b/src/animation/backend/fcurve.cpp @@ -97,7 +97,7 @@ float FCurve::evaluateAtTime(float localTime, int lowerBound) const return m_keyframes.first().value; } -float FCurve::evaluateAtTimeAsSlerp(float localTime, int lowerBound, float omega) const +float FCurve::evaluateAtTimeAsSlerp(float localTime, int lowerBound, float halfTheta, float sinHalfTheta, float reverseQ1) const { // TODO: Implement extrapolation beyond first/last keyframes if (localTime < m_localTimes.first()) @@ -119,10 +119,11 @@ float FCurve::evaluateAtTimeAsSlerp(float localTime, int lowerBound, float omega return keyframe0.value; case QKeyFrame::LinearInterpolation: if (localTime >= t0 && localTime <= t1 && t1 > t0) { - const float t = (localTime - t0) / (t1 - t0); - const float div = 1.0f / std::sin(omega); - return std::sin((1 - t) * omega) * div * keyframe0.value + - std::sin(t * omega) * div * keyframe1.value; + const auto t = (localTime - t0) / (t1 - t0); + + const auto A = std::sin((1.0f-t) * halfTheta) / sinHalfTheta; + const auto B = std::sin(t * halfTheta) / sinHalfTheta; + return A * keyframe0.value + reverseQ1 * B * keyframe1.value; } break; case QKeyFrame::BezierInterpolation: |