diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-03-24 13:42:02 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-03-26 07:29:37 +0000 |
| commit | 66e842dc6d052293c7ec97e0ba0cfb1d10c7590c (patch) | |
| tree | e9bb503480ef980131be74512a73fab626f62e1f /src/animation/backend/lerpclipblend.cpp | |
| parent | eec0906106c7367f155f84444703754a9e66f745 (diff) | |
Remove blend() virtual function from backend blend tree nodes
No longer needed as replaced by the more general doBlend() protected
virtual.
Change-Id: I5f11c068f8a379baa53a033e5ce8ce63ff64d5ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/backend/lerpclipblend.cpp')
| -rw-r--r-- | src/animation/backend/lerpclipblend.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/animation/backend/lerpclipblend.cpp b/src/animation/backend/lerpclipblend.cpp index 7e61a35ca..eef0072f9 100644 --- a/src/animation/backend/lerpclipblend.cpp +++ b/src/animation/backend/lerpclipblend.cpp @@ -70,11 +70,6 @@ void LerpClipBlend::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } } -float LerpClipBlend::blend(float value1, float value2) const -{ - return ((1.0f - m_blendFactor) * value1) + (m_blendFactor * value2); -} - ClipResults LerpClipBlend::doBlend(const QVector<ClipResults> &blendData) const { Q_ASSERT(blendData.size() == 2); @@ -106,7 +101,7 @@ double LerpClipBlend::duration() const ClipBlendNode *endNode = clipBlendNodeManager()->lookupNode(m_endClipId); const double endNodeDuration = endNode ? endNode->duration() : 0.0; - return blend(startNodeDuration, endNodeDuration); + return (1.0f - m_blendFactor) * startNodeDuration + m_blendFactor * endNodeDuration; } } // Animation |