diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-11 11:29:15 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-20 16:34:14 +0000 |
commit | ba3e89e4b609d19b0607d2cb1cdf13b83f6cd984 (patch) | |
tree | 017a00ab9308fc635e59bc050c00a32207079587 /examples/qt3d/transforms-qml | |
parent | 3d1727dc60e9c9a72160e785243a7be7a68fc60e (diff) |
Adapt examples to use no args form of Qt.matrix4x4()
Change-Id: If289d74601e2244d4175ba6b1ea3eb95df0bd50b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/transforms-qml')
-rw-r--r-- | examples/qt3d/transforms-qml/TemporaryCamera.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/transforms-qml/TrefoilKnot.qml | 7 | ||||
-rw-r--r-- | examples/qt3d/transforms-qml/main.qml | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/examples/qt3d/transforms-qml/TemporaryCamera.qml b/examples/qt3d/transforms-qml/TemporaryCamera.qml index 6c2862ee7..9a55662a5 100644 --- a/examples/qt3d/transforms-qml/TemporaryCamera.qml +++ b/examples/qt3d/transforms-qml/TemporaryCamera.qml @@ -50,10 +50,7 @@ Entity { id: transform matrix: { - var m = Qt.matrix4x4(1,0,0,0, - 0,1,0,0, - 0,0,1,0, - 0,0,0,1); + var m = Qt.matrix4x4(); m.lookAt( root.pos, root.viewCenter, root.up ); return m; } diff --git a/examples/qt3d/transforms-qml/TrefoilKnot.qml b/examples/qt3d/transforms-qml/TrefoilKnot.qml index 7152c6af8..10028ded0 100644 --- a/examples/qt3d/transforms-qml/TrefoilKnot.qml +++ b/examples/qt3d/transforms-qml/TrefoilKnot.qml @@ -52,12 +52,7 @@ Entity { id: transform matrix: { - // TODO: Adapt QtObject::method_matrix4x4() in qqmlbuiltinfunctions.cpp to - // work with 0 arguments such that it creates an identity matrix - var m = Qt.matrix4x4(1,0,0,0, - 0,1,0,0, - 0,0,1,0, - 0,0,0,1); + var m = Qt.matrix4x4(); m.translate( root.translation ); m.rotate( root.theta, Qt.vector3d( 1.0, 0.0, 0.0 ) ); m.rotate( root.phi, Qt.vector3d( 0.0, 1.0, 0.0 ) ); diff --git a/examples/qt3d/transforms-qml/main.qml b/examples/qt3d/transforms-qml/main.qml index acb264351..332905f65 100644 --- a/examples/qt3d/transforms-qml/main.qml +++ b/examples/qt3d/transforms-qml/main.qml @@ -68,7 +68,7 @@ Entity { id: trefoil translation: Qt.vector3d( 0.0, 20.0, 0.0 ) - scale: Qt.vector3d(4, 4, 4) + scale: 4 meshSource: "assets/obj/trefoil.obj" material: PhongMaterial { @@ -79,7 +79,7 @@ Entity { id: ball translation: Qt.vector3d( 0.0, 5.0, 0.0 ) - scale: Qt.vector3d(0.2, 0.2, 0.2) + scale: 0.2 meshSource: "assets/obj/ball.obj" material: PhongMaterial { |