diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /tests/manual/mesh-morphing/main.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'tests/manual/mesh-morphing/main.cpp')
| -rw-r--r-- | tests/manual/mesh-morphing/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 |