summaryrefslogtreecommitdiffstats
path: root/tests/manual/skinned-mesh
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-08-11 15:18:23 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-08-16 13:19:54 +0000
commitd4e71a7876cc2f1512d49d8f1c655b7e0eaab83b (patch)
tree5241ee9fe091a8b7efd079c5ab0420aab14ae828 /tests/manual/skinned-mesh
parentf7153ecdcfaa09cfe43be4d1f4792fc7d746fa1e (diff)
Adapt manual test to rotate the child joint
More realistic use case than translating a joint. Change-Id: I8d7dd45320d461ed8d9792cfa6b7fa4610cd5d45 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/manual/skinned-mesh')
-rw-r--r--tests/manual/skinned-mesh/main.qml26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/manual/skinned-mesh/main.qml b/tests/manual/skinned-mesh/main.qml
index 5f364bd63..6e8adbf50 100644
--- a/tests/manual/skinned-mesh/main.qml
+++ b/tests/manual/skinned-mesh/main.qml
@@ -80,7 +80,6 @@ DefaultSceneEntity {
var animation = animationComp.createObject(rootJoint)
var targetJoint = rootJoint.childJoints[0]
animation.target = targetJoint
- animation.neutralPos = targetJoint.translation
animation.running = true
}
@@ -89,23 +88,24 @@ DefaultSceneEntity {
SequentialAnimation {
id: sequentialAnimation
property variant target: null
- property vector3d neutralPos: Qt.vector3d(0, 0, 0)
- property real dx: 1.0
+ property real dz: 30.0
loops: Animation.Infinite
- Vector3dAnimation {
+ NumberAnimation {
target: sequentialAnimation.target
- property: "translation"
- from: sequentialAnimation.neutralPos.plus(Qt.vector3d(-sequentialAnimation.dx, 0.0, 0.0))
- to: sequentialAnimation.neutralPos.plus(Qt.vector3d(sequentialAnimation.dx, 0.0, 0.0))
- duration: 500
+ property: "rotationZ"
+ from: -dz
+ to: dz
+ duration: 600
+ easing.type: Easing.OutCubic
}
- Vector3dAnimation {
+ NumberAnimation {
target: sequentialAnimation.target
- property: "translation"
- from: sequentialAnimation.neutralPos.plus(Qt.vector3d(sequentialAnimation.dx, 0.0, 0.0))
- to: sequentialAnimation.neutralPos.plus(Qt.vector3d(-sequentialAnimation.dx, 0.0, 0.0))
- duration: 500
+ property: "rotationZ"
+ from: dz
+ to: -dz
+ duration: 600
+ easing.type: Easing.OutCubic
}
}
}