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>

2 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index 4875d67cc..211da5788 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(backendAdditiveBlend.isEnabled(), false);
         QVERIFY(backendAdditiveBlend.peerId().isNull());
-        QCOMPARE(backendAdditiveBlend.blendFactor(), 0.0f);
+        QCOMPARE(backendAdditiveBlend.additiveFactor(), 0.0f);
         QCOMPARE(backendAdditiveBlend.blendType(), Qt3DAnimation::Animation::ClipBlendNode::AdditiveBlendType);
     }
 
@@ -58,7 +58,7 @@ private Q_SLOTS:
         // GIVEN
         Qt3DAnimation::QAdditiveClipBlend additiveBlend;
         Qt3DAnimation::QAnimationClipLoader clip;
-        additiveBlend.setBlendFactor(0.8f);
+        additiveBlend.setAdditiveFactor(0.8f);
         additiveBlend.addClip(&clip);
 
         {
@@ -69,7 +69,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(backendAdditiveBlend.isEnabled(), true);
             QCOMPARE(backendAdditiveBlend.peerId(), additiveBlend.id());
-            QCOMPARE(backendAdditiveBlend.blendFactor(), 0.8f);
+            QCOMPARE(backendAdditiveBlend.additiveFactor(), 0.8f);
             QCOMPARE(backendAdditiveBlend.clipIds().size(), 1);
             QCOMPARE(backendAdditiveBlend.clipIds().first(), clip.id());
         }
@@ -104,12 +104,12 @@ private Q_SLOTS:
             // WHEN
             const float newValue = 0.883f;
             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-            change->setPropertyName("blendFactor");
+            change->setPropertyName("additiveFactor");
             change->setValue(QVariant::fromValue(newValue));
             backendAdditiveBlend.sceneChangeEvent(change);
 
             // THEN
-            QCOMPARE(backendAdditiveBlend.blendFactor(), newValue);
+            QCOMPARE(backendAdditiveBlend.additiveFactor(), newValue);
         }
     }
 
@@ -135,7 +135,7 @@ private Q_SLOTS:
         Qt3DAnimation::Animation::AdditiveClipBlend addBlend;
 
         // WHEN
-        addBlend.setBlendFactor(blendFactor);
+        addBlend.setAdditiveFactor(blendFactor);
         const float computed = addBlend.blend(value1, value2);
 
         // THEN
diff --git a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
index f0e40ca67..cded4b569 100644
--- a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
+++ b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
@@ -51,7 +51,7 @@ private Q_SLOTS:
         Qt3DAnimation::QAdditiveClipBlend addBlend;
 
         // THEN
-        QCOMPARE(addBlend.blendFactor(), 0.0f);
+        QCOMPARE(addBlend.additiveFactor(), 0.0f);
     }
 
     void checkPropertyChanges()
@@ -61,21 +61,21 @@ private Q_SLOTS:
 
         {
             // WHEN
-            QSignalSpy spy(&addBlend, SIGNAL(blendFactorChanged(float)));
+            QSignalSpy spy(&addBlend, SIGNAL(additiveFactorChanged(float)));
             const float newValue = 0.5f;
-            addBlend.setBlendFactor(newValue);
+            addBlend.setAdditiveFactor(newValue);
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(addBlend.blendFactor(), newValue);
+            QCOMPARE(addBlend.additiveFactor(), newValue);
             QCOMPARE(spy.count(), 1);
 
             // WHEN
             spy.clear();
-            addBlend.setBlendFactor(newValue);
+            addBlend.setAdditiveFactor(newValue);
 
             // THEN
-            QCOMPARE(addBlend.blendFactor(), newValue);
+            QCOMPARE(addBlend.additiveFactor(), newValue);
             QCOMPARE(spy.count(), 0);
         }
     }
@@ -89,7 +89,7 @@ private Q_SLOTS:
 
         addBlend.addClip(&clip1);
         addBlend.addClip(&clip2);
-        addBlend.setBlendFactor(0.8f);
+        addBlend.setAdditiveFactor(0.8f);
 
 
         // WHEN
@@ -107,7 +107,7 @@ private Q_SLOTS:
             const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(creationChanges.first());
             const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data;
 
-            QCOMPARE(addBlend.blendFactor(), cloneData.blendFactor);
+            QCOMPARE(addBlend.additiveFactor(), cloneData.additiveFactor);
             QCOMPARE(addBlend.id(), creationChangeData->subjectId());
             QCOMPARE(addBlend.isEnabled(), true);
             QCOMPARE(addBlend.isEnabled(), creationChangeData->isNodeEnabled());
@@ -133,7 +133,7 @@ private Q_SLOTS:
             const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(creationChanges.first());
             const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data;
 
-            QCOMPARE(addBlend.blendFactor(), cloneData.blendFactor);
+            QCOMPARE(addBlend.additiveFactor(), cloneData.additiveFactor);
             QCOMPARE(addBlend.id(), creationChangeData->subjectId());
             QCOMPARE(addBlend.isEnabled(), false);
             QCOMPARE(addBlend.isEnabled(), creationChangeData->isNodeEnabled());
@@ -154,14 +154,14 @@ private Q_SLOTS:
 
         {
             // WHEN
-            addBlend.setBlendFactor(0.4f);
+            addBlend.setAdditiveFactor(0.4f);
             QCoreApplication::processEvents();
 
             // THEN
             QCOMPARE(arbiter.events.size(), 1);
             auto change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
-            QCOMPARE(change->propertyName(), "blendFactor");
-            QCOMPARE(change->value().value<float>(), addBlend.blendFactor());
+            QCOMPARE(change->propertyName(), "additiveFactor");
+            QCOMPARE(change->value().value<float>(), addBlend.additiveFactor());
             QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
 
             arbiter.events.clear();
@@ -169,7 +169,7 @@ private Q_SLOTS:
 
         {
             // WHEN
-            addBlend.setBlendFactor(0.4f);
+            addBlend.setAdditiveFactor(0.4f);
             QCoreApplication::processEvents();
 
             // THEN