diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-23 09:27:58 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:48 +0000 |
| commit | 87cf108f5da481d9a4eeb5d0fbb7145ecef4863e (patch) | |
| tree | 2bfe2276aec2cf02839c938cc90616a577c29207 /src/animation/backend/additiveclipblend.cpp | |
| parent | 3624ddb7beeff87196cf1ccc6684dd05457945e1 (diff) | |
Rename blendFactor on QAdditiveClipBlend to additiveFactor
Likewise for the backend node.
Task-number: QTBUG-58903
Change-Id: I2a2d084f80cf5b36a2ba6c1c03f511a1f74a2f62
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/backend/additiveclipblend.cpp')
| -rw-r--r-- | src/animation/backend/additiveclipblend.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/animation/backend/additiveclipblend.cpp b/src/animation/backend/additiveclipblend.cpp index ea7db4621..a361001ad 100644 --- a/src/animation/backend/additiveclipblend.cpp +++ b/src/animation/backend/additiveclipblend.cpp @@ -48,7 +48,7 @@ namespace Animation { AdditiveClipBlend::AdditiveClipBlend() : ClipBlendNode(ClipBlendNode::AdditiveBlendType) - , m_blendFactor(0.0f) + , m_additiveFactor(0.0f) { } @@ -60,14 +60,14 @@ void AdditiveClipBlend::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == Qt3DCore::PropertyUpdated) { Qt3DCore::QPropertyUpdatedChangePtr change = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e); - if (change->propertyName() == QByteArrayLiteral("blendFactor")) - m_blendFactor = change->value().toFloat(); + if (change->propertyName() == QByteArrayLiteral("additiveFactor")) + m_additiveFactor = change->value().toFloat(); } } float AdditiveClipBlend::blend(float value1, float value2) const { - return value1 + (m_blendFactor * value2); + return value1 + (m_additiveFactor * value2); } void AdditiveClipBlend::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) @@ -75,7 +75,7 @@ void AdditiveClipBlend::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBas ClipBlendNode::initializeFromPeer(change); const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(change); const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data; - m_blendFactor = cloneData.blendFactor; + m_additiveFactor = cloneData.additiveFactor; } } // Animation |