diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-03-02 10:09:32 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-03-02 21:03:26 +0000 |
commit | 2519573517979f6a2995f9a445321ef7d62091e8 (patch) | |
tree | fe5ddcfd7b5e4127c5de029562c7bc30ab905a78 /tests/manual/animation-keyframe-simple/main.qml | |
parent | d024347bc358f8202465374ca3958738df580984 (diff) |
Split blend tree manual test out from simple key frame test
Change-Id: I9aba21499008980f3bd07efb14c912961090ecb1
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/manual/animation-keyframe-simple/main.qml')
-rw-r--r-- | tests/manual/animation-keyframe-simple/main.qml | 185 |
1 files changed, 0 insertions, 185 deletions
diff --git a/tests/manual/animation-keyframe-simple/main.qml b/tests/manual/animation-keyframe-simple/main.qml index 2c7be6879..17744209a 100644 --- a/tests/manual/animation-keyframe-simple/main.qml +++ b/tests/manual/animation-keyframe-simple/main.qml @@ -62,191 +62,6 @@ DefaultSceneEntity { ] } - Entity { - id: sphere - - components: [ - Transform { - id: sphereTransform - translation: Qt.vector3d(5, 0, 0) - onTranslationChanged: console.log("t = " + translation) - }, - SphereMesh { - }, - PhongMaterial { - id: sphereMaterial - ambient: Qt.rgba(0.02, 0.02, 0.02, 1.0) - diffuse: "red" - shininess: 50 - }, - ObjectPicker { - onClicked: blendedAnimator.running = true - }, - BlendedClipAnimator { - id: blendedAnimator - loops: 2 - - onRunningChanged: console.log("running = " + running) - - blendTree: LerpBlend { - blendFactor: 0.5 - clips: [ - AnimationClip { - source: "cubeanimation.json" - onDurationChanged: console.log("duration = " + duration) - }, - AnimationClip { - source: "pulsing-moving-cube.json" - onDurationChanged: console.log("duration = " + duration) - }] - } - - - // By default introspect parent Entity and try - // to map fcurve groups to properties of QTransform - // mapping: AutomaticAnimationMapping {} - - // To do more, we can be explicit - channelMapper: ChannelMapper { - mappings: [ - ChannelMapping { channelName: "Location"; target: sphereTransform; property: "translation" }, - ChannelMapping { channelName: "Rotation"; target: sphereTransform; property: "rotation" }, - ChannelMapping { channelName: "Scaling"; target: sphereTransform; property: "scale3D" }, - ChannelMapping { channelName: "Diffuse Color"; target: sphereMaterial; property: "diffuse" } - ] - } - } - ] - } - - Entity { - id: cube2 - - components: [ - Transform { - id: cube2Transform - translation: Qt.vector3d(2.5, 0, 0) - onTranslationChanged: console.log("t = " + translation) - }, - CuboidMesh { - }, - PhongMaterial { - id: cube2Material - ambient: Qt.rgba(0.8, 0.8, 0.8, 1.0) - diffuse: Qt.rgba(0.7, 0.7, 0.7, 1.0) - shininess: 50 - }, - ObjectPicker { - onClicked: blendedAnimator2.running = true - }, - BlendedClipAnimator { - id: blendedAnimator2 - loops: 2 - - onRunningChanged: console.log("running = " + running) - - blendTree: AdditiveBlend { - blendFactor: 0.5 - clips: [ - AnimationClip { - source: "pulsing-moving-cube.json" - onDurationChanged: console.log("duration = " + duration) - }, - AnimationClip { - source: "pulsing-cube-additive.json" - onDurationChanged: console.log("duration = " + duration) - }] - } - - // By default introspect parent Entity and try - // to map fcurve groups to properties of QTransform - // mapping: AutomaticAnimationMapping {} - - // To do more, we can be explicit - channelMapper: ChannelMapper { - mappings: [ - ChannelMapping { channelName: "Location"; target: cube2Transform; property: "translation" }, - ChannelMapping { channelName: "Rotation"; target: cube2Transform; property: "rotation" }, - ChannelMapping { channelName: "Scaling"; target: cube2Transform; property: "scale3D" }, - ChannelMapping { channelName: "Diffuse Color"; target: cube2Transform; property: "diffuse" } - ] - } - } - ] - } - - Entity { - id: cube3 - - components: [ - Transform { - id: cube3Transform - translation: Qt.vector3d(2.5, 0, 2) - onTranslationChanged: console.log("t = " + translation) - }, - CuboidMesh { - }, - PhongMaterial { - id: cube3Material - ambient: Qt.rgba(0.8, 0.8, 0.8, 1.0) - diffuse: "green" - shininess: 50 - }, - ObjectPicker { - onClicked: blendedAnimator3.running = true - }, - BlendedClipAnimator { - id: blendedAnimator3 - loops: 2 - - onRunningChanged: console.log("running = " + running) - - blendTree: LerpBlend { - blendFactor: 0.5 - AdditiveBlend { - blendFactor: 0.5 - clips: [ - AnimationClip { - source: "pulsing-moving-cube.json" - onDurationChanged: console.log("duration = " + duration) - }, - AnimationClip { - source: "pulsing-cube-additive.json" - onDurationChanged: console.log("duration = " + duration) - }] - } - LerpBlend { - blendFactor: 0.5 - clips: [ - AnimationClip { - source: "cubeanimation.json" - onDurationChanged: console.log("duration = " + duration) - }, - AnimationClip { - source: "pulsing-moving-cube.json" - onDurationChanged: console.log("duration = " + duration) - }] - } - } - - // By default introspect parent Entity and try - // to map fcurve groups to properties of QTransform - // mapping: AutomaticAnimationMapping {} - - // To do more, we can be explicit - channelMapper: ChannelMapper { - mappings: [ - ChannelMapping { channelName: "Location"; target: cube3Transform; property: "translation" }, - ChannelMapping { channelName: "Rotation"; target: cube3Transform; property: "rotation" }, - ChannelMapping { channelName: "Scaling"; target: cube3Transform; property: "scale3D" }, - ChannelMapping { channelName: "Diffuse Color"; target: cube3Transform; property: "diffuse" } - ] - } - } - ] - } - - camera: Camera { position: Qt.vector3d(10, 3, 15) viewCenter: Qt.vector3d(2.5, 1, 0) |