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 | |
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')
-rw-r--r-- | examples/qt3d/anaglyph-rendering/StereoCamera.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/anaglyph-rendering/main.qml | 10 | ||||
-rw-r--r-- | examples/qt3d/assimp/main.qml | 11 | ||||
-rw-r--r-- | examples/qt3d/controls/Logo.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/gltf/Wine.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/loader-qml/main.qml | 10 | ||||
-rw-r--r-- | examples/qt3d/materials/TrefoilKnot.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/multiviewport/SimpleCamera.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/planets-qml/SolarSystem.qml | 65 | ||||
-rw-r--r-- | examples/qt3d/shadow-map-qml/Toyplane.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/simple-qml/main.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/simple-shaders-qml/main.qml | 10 | ||||
-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 | ||||
-rw-r--r-- | examples/qt3d/wave/Wave.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/wireframe/TrefoilKnot.qml | 5 |
17 files changed, 38 insertions, 129 deletions
diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml index c6218aee6..9d2df1d0a 100644 --- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml +++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml @@ -79,10 +79,7 @@ Entity { id: eyeTransform 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.position, root.viewCenter, Qt.vector3d(0.0, 1.0, 0.0)); return m; } diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml index 73a6bc59d..c6185048c 100644 --- a/examples/qt3d/anaglyph-rendering/main.qml +++ b/examples/qt3d/anaglyph-rendering/main.qml @@ -91,10 +91,7 @@ Entity { property real userScale: 1.0 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.rotate(phi, Qt.vector3d(0.0, 1.0, 0.0)); m.rotate(theta, Qt.vector3d(1.0, 0.0, 0.0)); m.scale(userScale); @@ -150,10 +147,7 @@ Entity { property real rollAngle: 0.0 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(Qt.vector3d(Math.sin(stereoCamera.circleRotation * -2) * obstaclesRepeater.radius, 0.0, Math.cos(stereoCamera.circleRotation * -2) * obstaclesRepeater.radius)) diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index 5210d2041..02a3aca2a 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -111,7 +111,11 @@ Entity Entity { components: [ Transform { - Rotate {angle : 90; axis : Qt.vector3d(0, 1, 0)} + matrix: { + var m = Qt.matrix4x4(); + m.rotate(90, Qt.vector3d(0, 1, 0)); + return m; + } }, SceneLoader { id: sceneLoader @@ -163,10 +167,7 @@ Entity var constantTranslation = Qt.vector3d(origTranslation.x, origTranslation.y, origTranslation.z); t.matrix = Qt.binding(function() { - 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.rotate(suzanneAnim.userAngle, suzanneAnim.axis); m.translate(constantTranslation); m.rotate(90, Qt.vector3d(1, 0, 0)); diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index d4286ca7b..b3f082973 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -77,10 +77,7 @@ Entity { id: logoTransform 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.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)); diff --git a/examples/qt3d/gltf/Wine.qml b/examples/qt3d/gltf/Wine.qml index 7a1506ba5..676cffb77 100644 --- a/examples/qt3d/gltf/Wine.qml +++ b/examples/qt3d/gltf/Wine.qml @@ -49,10 +49,7 @@ Entity { components: [ 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.translate(root.position); m.rotate(root.angleX, Qt.vector3d(1, 0, 0)) m.rotate(root.angleY, Qt.vector3d(0, 1, 0)) diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml index b9dd2ca12..791acc600 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/examples/qt3d/loader-qml/main.qml @@ -82,10 +82,7 @@ Entity { Transform { id: torusTransform 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.rotate(45, Qt.vector3d(1, 0, 0)); m.scale(Qt.vector3d(1.5, 1, 0.5)); return m; @@ -118,10 +115,7 @@ Entity { id: revolutionTransform property real userAngle: 0.0 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.rotate(userAngle, Qt.vector3d(0, 1, 0)); m.translate(Qt.vector3d(20, 0, 0)); return m; diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml index 9440d7a85..26894f17c 100644 --- a/examples/qt3d/materials/TrefoilKnot.qml +++ b/examples/qt3d/materials/TrefoilKnot.qml @@ -53,10 +53,7 @@ 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); + var m = Qt.matrix4x4(); m.translate(Qt.vector3d(root.x, root.y, root.z)); m.rotate(phi, Qt.vector3d(0, 1, 0)); m.rotate(theta, Qt.vector3d(1, 0, 0)); diff --git a/examples/qt3d/multiviewport/SimpleCamera.qml b/examples/qt3d/multiviewport/SimpleCamera.qml index cb570eb7b..ee474eb77 100644 --- a/examples/qt3d/multiviewport/SimpleCamera.qml +++ b/examples/qt3d/multiviewport/SimpleCamera.qml @@ -50,10 +50,7 @@ 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); + var m = Qt.matrix4x4(); m.lookAt(root.position, root.viewCenter, root.upVector); return m; } diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index dc7437028..9f627aca2 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -496,10 +496,7 @@ Entity { property Transform transformSun: 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.translate(Qt.vector3d(sun.x, sun.y, sun.z)); m.rotate(sun.tilt, tiltAxis); m.rotate(sun.roll, rollAxis); @@ -536,10 +533,7 @@ Entity { property Transform transformMercury: 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.translate(Qt.vector3d(mercury.x, mercury.y, mercury.z)); m.rotate(mercury.tilt, tiltAxis); m.rotate(mercury.roll, rollAxis); @@ -572,10 +566,7 @@ Entity { property Transform transformVenus: 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.translate(Qt.vector3d(venus.x, venus.y, venus.z)); m.rotate(venus.tilt, tiltAxis); m.rotate(venus.roll, rollAxis); @@ -609,10 +600,7 @@ Entity { property Transform transformEarth: 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.translate(Qt.vector3d(earth.x, earth.y, earth.z)); m.rotate(earth.tilt, tiltAxis); m.rotate(earth.roll, rollAxis); @@ -646,10 +634,7 @@ Entity { property Transform transformEarthClouds: 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.translate(Qt.vector3d(earthClouds.x, earthClouds.y, earthClouds.z)); m.rotate(earthClouds.tilt, tiltAxis); m.rotate(earthClouds.roll / 1.2, rollAxis); @@ -682,10 +667,7 @@ Entity { property Transform transformMoon: 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.translate(Qt.vector3d(moon.x, moon.y, moon.z)); m.rotate(moon.tilt, tiltAxis); m.rotate(moon.roll, rollAxis); @@ -718,10 +700,7 @@ Entity { property Transform transformMars: 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.translate(Qt.vector3d(mars.x, mars.y, mars.z)); m.rotate(mars.tilt, tiltAxis); m.rotate(mars.roll, rollAxis); @@ -753,10 +732,7 @@ Entity { property Transform transformJupiter: 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.translate(Qt.vector3d(jupiter.x, jupiter.y, jupiter.z)); m.rotate(jupiter.tilt, tiltAxis); m.rotate(jupiter.roll, rollAxis); @@ -788,10 +764,7 @@ Entity { property Transform transformSaturn: 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.translate(Qt.vector3d(saturn.x, saturn.y, saturn.z)); m.rotate(saturn.tilt, tiltAxis); m.rotate(saturn.roll, rollAxis); @@ -825,10 +798,7 @@ Entity { property Transform transformSaturnRing: 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.translate(Qt.vector3d(saturn.x, saturn.y, saturn.z)); m.rotate(saturn.tilt, tiltAxis); m.rotate(saturn.roll / 10, rollAxis); @@ -860,10 +830,7 @@ Entity { property Transform transformUranus: 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.translate(Qt.vector3d(uranus.x, uranus.y, uranus.z)); m.rotate(uranus.tilt, tiltAxis); m.rotate(uranus.roll, rollAxis); @@ -897,10 +864,7 @@ Entity { property Transform transformUranusRing: 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.translate(Qt.vector3d(uranus.x, uranus.y, uranus.z)); m.rotate(uranus.tilt, tiltAxis); m.rotate(uranus.roll / 10, rollAxis); @@ -932,10 +896,7 @@ Entity { property Transform transformNeptune: 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.translate(Qt.vector3d(neptune.x, neptune.y, neptune.z)); m.rotate(neptune.tilt, tiltAxis); m.rotate(neptune.roll, rollAxis); diff --git a/examples/qt3d/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml index 1f883f2bb..56ca11886 100644 --- a/examples/qt3d/shadow-map-qml/Toyplane.qml +++ b/examples/qt3d/shadow-map-qml/Toyplane.qml @@ -59,10 +59,7 @@ Entity { QQ2.Behavior on rollAngle { QQ2.SpringAnimation { spring: 2; damping: 0.2} } 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(Qt.vector3d(Math.sin(angle * Math.PI / 180) * scaleFactor, altitude, Math.cos(angle * Math.PI / 180) * scaleFactor)); diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index 559aec1e8..0ee3ab2a8 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -105,10 +105,7 @@ Entity { id: sphereTransform property real userAngle: 0.0 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.rotate(userAngle, Qt.vector3d(0, 1, 0)); m.translate(Qt.vector3d(20, 0, 0)); return m; diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index 93f7d031c..08dbfbca3 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -79,10 +79,7 @@ Entity { 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); + var m = Qt.matrix4x4(); m.rotate(45, Qt.vector3d(1, 0, 0)); m.translate(Qt.vector3d(-2.0, 0.0, 0.0)); return m; @@ -163,10 +160,7 @@ Entity { 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); + var m = Qt.matrix4x4(); m.rotate(15, Qt.vector3d(1, 0, 0)); m.translate(Qt.vector3d(2.0, 0.0, 0.0)); return m; 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 { diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index 9bbb707a9..0ec12db10 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.qml @@ -60,10 +60,7 @@ 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); + var m = Qt.matrix4x4(); m.translate(Qt.vector3d(root.x, root.y, root.z)); m.rotate(root.phi, Qt.vector3d(0, 1, 0)); m.rotate(root.theta, Qt.vector3d(1, 0, 0)); diff --git a/examples/qt3d/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml index 4d51e067b..dbdae18dc 100644 --- a/examples/qt3d/wireframe/TrefoilKnot.qml +++ b/examples/qt3d/wireframe/TrefoilKnot.qml @@ -53,10 +53,7 @@ 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); + var m = Qt.matrix4x4(); m.translate(Qt.vector3d(root.x, root.y, root.z)); m.rotate(root.phi, Qt.vector3d(0, 1, 0)); m.rotate(root.theta, Qt.vector3d(1, 0, 0)); |