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/simple-shaders-qml/main.qml | |
| 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/simple-shaders-qml/main.qml')
| -rw-r--r-- | examples/qt3d/simple-shaders-qml/main.qml | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index ce83c01a9..93f7d031c 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ +import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 -import QtQuick 2.2 as QQ2 Entity { id: sceneRoot @@ -78,10 +78,14 @@ Entity { id: torusEntityInlineShader property Transform transform: Transform { - Translate { translation: Qt.vector3d(-2.0, 0.0, 0.0) } - Rotate { - angle: 45 - axis: Qt.vector3d(1, 0, 0) + matrix: { + var m = Qt.matrix4x4(1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1); + m.rotate(45, Qt.vector3d(1, 0, 0)); + m.translate(Qt.vector3d(-2.0, 0.0, 0.0)); + return m; } } @@ -157,11 +161,15 @@ Entity { Entity { id: torusEntitySeparateShader - property Transform transform: Transform { - Translate { translation: Qt.vector3d(2.0, 0.0, 0.0) } - Rotate { - angle: 15 - axis: Qt.vector3d(1, 0, 0) + property Transform transform: Transform { + matrix: { + var m = Qt.matrix4x4(1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1); + m.rotate(15, Qt.vector3d(1, 0, 0)); + m.translate(Qt.vector3d(2.0, 0.0, 0.0)); + return m; } } |