summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/cylinder-qml
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-11-07 19:02:14 +0000
committerPaul Lemire <paul.lemire@kdab.com>2015-11-17 19:41:18 +0000
commit26a118cfbce29014864f6cdddae66cccb65ffb4f (patch)
treedaea9f2fc41c1df586c35cd56daa61f920ce5b58 /examples/qt3d/cylinder-qml
parentace675a084ab944a245500b9f54be653126c3147 (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/cylinder-qml')
-rw-r--r--examples/qt3d/cylinder-qml/main.qml15
1 files changed, 9 insertions, 6 deletions
diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml
index 2eda44a26..82d535e83 100644
--- a/examples/qt3d/cylinder-qml/main.qml
+++ b/examples/qt3d/cylinder-qml/main.qml
@@ -76,17 +76,20 @@ Entity {
Transform {
id: transform
- Scale { scale3D: Qt.vector3d(1.5, 1.5, 1.5) }
- 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.scale(1.5);
+ return m;
}
}
Material {
id: material
- effect : Effect {
- }
+ effect: Effect {}
}
Entity {