diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2017-02-06 11:01:06 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-02-07 09:03:12 +0000 |
| commit | c0df6af32e80a09a8bf72bd6c9cc28270613220b (patch) | |
| tree | a196bce7410ddd934a8327506eed6fdc5d8f1ca4 /tests/manual | |
| parent | 1150383da5f55b44d6101f086cca310fa94db6a5 (diff) | |
Move animations from extras to animations
Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/anim-viewer/main.qml | 1 | ||||
| -rw-r--r-- | tests/manual/mesh-morphing/main.cpp | 16 | ||||
| -rw-r--r-- | tests/manual/mesh-morphing/mesh-morphing.pro | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/tests/manual/anim-viewer/main.qml b/tests/manual/anim-viewer/main.qml index 95a4900e3..a31f8182d 100644 --- a/tests/manual/anim-viewer/main.qml +++ b/tests/manual/anim-viewer/main.qml @@ -43,6 +43,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 import Qt3D.Extras 2.2 +import Qt3D.Animation 2.2 import QtQuick.Scene3D 2.0 diff --git a/tests/manual/mesh-morphing/main.cpp b/tests/manual/mesh-morphing/main.cpp index 4ae791181..641722a4c 100644 --- a/tests/manual/mesh-morphing/main.cpp +++ b/tests/manual/mesh-morphing/main.cpp @@ -43,8 +43,8 @@ #include <Qt3DExtras/qcylindermesh.h> #include <Qt3DExtras/QPhongMaterial> #include <Qt3DExtras/QMorphPhongMaterial> -#include <Qt3DExtras/QVertexBlendAnimation> -#include <Qt3DExtras/QMorphTarget> +#include <Qt3DAnimation/QVertexBlendAnimation> +#include <Qt3DAnimation/QMorphTarget> #include <Qt3DExtras/QCylinderGeometry> #include <Qt3DCore/qentity.h> @@ -111,13 +111,13 @@ int main(int argc, char **argv) attributes.push_back(Qt3DRender::QAttribute::defaultPositionAttributeName()); attributes.push_back(Qt3DRender::QAttribute::defaultNormalAttributeName()); - QVector<Qt3DExtras::QMorphTarget*> morphTargets; - morphTargets.push_back(Qt3DExtras::QMorphTarget::fromGeometry(cylinder1, attributes)); - morphTargets.push_back(Qt3DExtras::QMorphTarget::fromGeometry(cylinder2, attributes)); - morphTargets.push_back(Qt3DExtras::QMorphTarget::fromGeometry(cylinder3, attributes)); + QVector<Qt3DAnimation::QMorphTarget*> morphTargets; + morphTargets.push_back(Qt3DAnimation::QMorphTarget::fromGeometry(cylinder1, attributes)); + morphTargets.push_back(Qt3DAnimation::QMorphTarget::fromGeometry(cylinder2, attributes)); + morphTargets.push_back(Qt3DAnimation::QMorphTarget::fromGeometry(cylinder3, attributes)); morphTargets.push_back(morphTargets.first()); - Qt3DExtras::QVertexBlendAnimation *animation = new Qt3DExtras::QVertexBlendAnimation; + Qt3DAnimation::QVertexBlendAnimation *animation = new Qt3DAnimation::QVertexBlendAnimation; QVector<float> times; times.push_back(0.0f); times.push_back(5.0f); @@ -132,7 +132,7 @@ int main(int argc, char **argv) Qt3DExtras::QMorphPhongMaterial *material = new Qt3DExtras::QMorphPhongMaterial(rootEntity); material->setDiffuse(Qt::red); - QObject::connect(animation, &Qt3DExtras::QVertexBlendAnimation::interpolatorChanged, + QObject::connect(animation, &Qt3DAnimation::QVertexBlendAnimation::interpolatorChanged, material, &Qt3DExtras::QMorphPhongMaterial::setInterpolator); // Cylinder diff --git a/tests/manual/mesh-morphing/mesh-morphing.pro b/tests/manual/mesh-morphing/mesh-morphing.pro index ad2a31b8b..27419655f 100644 --- a/tests/manual/mesh-morphing/mesh-morphing.pro +++ b/tests/manual/mesh-morphing/mesh-morphing.pro @@ -2,7 +2,7 @@ error( "Couldn't find the manual.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput quick qml 3dextras 3dquickextras +QT += 3dcore 3drender 3dquick 3dinput quick qml 3dextras 3dquickextras 3danimation 3dquickanimation SOURCES += \ main.cpp |