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>

1 files changed, 20 insertions, 13 deletions

diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml
index b0070db68..5431db8ea 100644
--- a/examples/qt3d/scene3d/AnimatedEntity.qml
+++ b/examples/qt3d/scene3d/AnimatedEntity.qml
@@ -92,10 +92,14 @@ Entity {
 
     Transform {
         id: torusTransform
-        Scale { scale3D: Qt.vector3d(1.5, 1, 0.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(Qt.vector3d(1.5, 1, 0.5));
+            return m;
         }
     }
 
@@ -111,18 +115,21 @@ Entity {
 
     Transform {
         id: sphereTransform
-        Translate {
-            translation: Qt.vector3d(20, 0, 0)
-        }
-
-        Rotate {
-            id: sphereRotation
-            axis: Qt.vector3d(0, 1, 0)
+        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);
+            m.translate(Qt.vector3d(20, 0, 0));
+            m.rotate(userAngle, Qt.vector3d(0, 1, 0))
+            return m;
         }
     }
+
     QQ2.NumberAnimation {
-        target: sphereRotation
-        property: "angle"
+        target: sphereTransform
+        property: "userAngle"
         duration: 10000
         from: 0
         to: 360