diff options
Diffstat (limited to 'tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp')
-rw-r--r-- | tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp b/tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp index c53f6ec62..3265de167 100644 --- a/tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp +++ b/tests/auto/animation/blendedclipanimator/tst_blendedclipanimator.cpp @@ -28,7 +28,7 @@ #include <QtTest/QTest> #include <Qt3DAnimation/private/blendedclipanimator_p.h> -#include <Qt3DAnimation/qanimationclip.h> +#include <Qt3DAnimation/qanimationcliploader.h> #include <Qt3DAnimation/qblendedclipanimator.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> @@ -39,7 +39,7 @@ #include <QtTest/QTest> #include <Qt3DAnimation/qblendedclipanimator.h> -#include <Qt3DAnimation/qlerpblend.h> +#include <Qt3DAnimation/qlerpclipblend.h> #include <Qt3DAnimation/qchannelmapper.h> #include <Qt3DAnimation/private/qblendedclipanimator_p.h> #include <Qt3DAnimation/private/blendedclipanimator_p.h> @@ -65,7 +65,6 @@ private Q_SLOTS: QCOMPARE(backendBlendedClipAnimator.isRunning(), false); QCOMPARE(backendBlendedClipAnimator.startTime(), 0); QCOMPARE(backendBlendedClipAnimator.currentLoop(), 0); - QCOMPARE(backendBlendedClipAnimator.mappingData().size(), 0); QCOMPARE(backendBlendedClipAnimator.loops(), 1); } @@ -83,9 +82,6 @@ private Q_SLOTS: backendBlendedClipAnimator.setMapperId(Qt3DCore::QNodeId::createId()); backendBlendedClipAnimator.setRunning(true); backendBlendedClipAnimator.setStartTime(28); - QVector<Qt3DAnimation::Animation::AnimationUtils::BlendingMappingData> mappingData; - mappingData.resize(5); - backendBlendedClipAnimator.setMappingData(mappingData); backendBlendedClipAnimator.cleanup(); // THEN @@ -95,7 +91,6 @@ private Q_SLOTS: QCOMPARE(backendBlendedClipAnimator.isRunning(), false); QCOMPARE(backendBlendedClipAnimator.startTime(), 0); QCOMPARE(backendBlendedClipAnimator.currentLoop(), 0); - QCOMPARE(backendBlendedClipAnimator.mappingData().size(), 0); QCOMPARE(backendBlendedClipAnimator.loops(), 1); } @@ -104,11 +99,11 @@ private Q_SLOTS: // GIVEN Qt3DAnimation::QBlendedClipAnimator blendedClipAnimator; Qt3DAnimation::QChannelMapper mapper; - Qt3DAnimation::QLerpBlend blendTree; + Qt3DAnimation::QLerpClipBlend blendTree; blendedClipAnimator.setRunning(true); blendedClipAnimator.setBlendTree(&blendTree); blendedClipAnimator.setChannelMapper(&mapper); - blendedClipAnimator.setLoops(10); + blendedClipAnimator.setLoopCount(10); { // WHEN |