diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-07 19:02:14 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-17 19:41:18 +0000 |
commit | 26a118cfbce29014864f6cdddae66cccb65ffb4f (patch) | |
tree | daea9f2fc41c1df586c35cd56daa61f920ce5b58 /examples/qt3d/controls | |
parent | ace675a084ab944a245500b9f54be653126c3147 (diff) |
Remove transforms property of QTransform
Compound transformations are now built up using QMatrix4x4 in both QML
and C++. Updating examples accordingly.
Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/controls')
-rw-r--r-- | examples/qt3d/controls/Logo.qml | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index 1fe45340b..d4286ca7b 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -76,20 +76,15 @@ Entity { Transform { id: logoTransform - Rotate { - id: rotate_x - angle: rotation_x.value - axis: Qt.vector3d(1, 0, 0) - } - Rotate { - id: rotate_y - angle: rotation_y.value - axis: Qt.vector3d(0, 1, 0) - } - Rotate { - id: rotate_z - angle: rotation_z.value - axis: Qt.vector3d(0, 0, 1) + matrix: { + var m = Qt.matrix4x4(1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1); + m.rotate(rotation_z.value, Qt.vector3d(0, 0, 1)); + m.rotate(rotation_y.value, Qt.vector3d(0, 1, 0)); + m.rotate(rotation_x.value, Qt.vector3d(1, 0, 0)); + return m; } } |