diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-11 12:18:26 +0000 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-20 16:34:26 +0000 |
| commit | cf52d92133a356784e0f784e810b232290d8d3da (patch) | |
| tree | f89d68477f59d8a38970402119ccfe8b2b8082e5 /examples/qt3d/materials | |
| parent | ba3e89e4b609d19b0607d2cb1cdf13b83f6cd984 (diff) | |
Adapt examples to use rotation property and quaternion helper
This covers all examples that can use the standard S, R, T order of
transformations with a single rotation.
Change-Id: Ief6741f9605742c545d8ef2be9bf8ab65164835d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/materials')
| -rw-r--r-- | examples/qt3d/materials/RenderableEntity.qml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml index e309ec8ba..f6883be3a 100644 --- a/examples/qt3d/materials/RenderableEntity.qml +++ b/examples/qt3d/materials/RenderableEntity.qml @@ -51,16 +51,9 @@ Entity { Transform { id: transform - matrix: { - var m = Qt.matrix4x4(1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1); - m.translate(root.position); - m.rotate(root.rotationAngle, root.rotationAxis); - m.scale(root.scale); - return m; - } + scale: root.scale + rotation: fromAxisAndAngle(root.rotationAxis, root.rotationAngle) + translation: root.position } Mesh { |