Merge branch '5.9' into 5.10

Conflicts:
	src/render/backend/cameralens.cpp
	src/render/backend/cameralens_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/updatelevelofdetailjob.cpp

Change-Id: I5433dde8ace462d11f037742d45f555c87235ffe

1 files changed, 14 insertions, 10 deletions

diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml
index c8db4c0a9..ea013c0b0 100644
--- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml
+++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml
@@ -62,6 +62,7 @@ Entity {
 
     property vector3d viewCenter: Qt.vector3d(0.0, 0.0, 0.0)
     property vector3d position: Qt.vector3d(0.0, 0.0, 1.0)
+    property vector3d upVector: Qt.vector3d(0.0, 1.0, 0.0)
 
     readonly property real _fov2: Math.tan(fieldOfView * Math.PI / 180 * 0.5)
     readonly property real top: nearPlane * _fov2
@@ -94,23 +95,26 @@ Entity {
 
         matrix: {
             var m = Qt.matrix4x4();
-            m.lookAt(root.position, root.viewCenter, Qt.vector3d(0.0, 1.0, 0.0));
-            return m;
+            m.translate(root.position)
+            var zAxis = root.position.minus(root.viewCenter).normalized()
+            var xAxis = root.upVector.crossProduct(zAxis).normalized();
+            var yAxis = zAxis.crossProduct(xAxis);
+            var r = Qt.matrix4x4(xAxis.x, yAxis.x, zAxis.x, 0,
+                                 xAxis.y, yAxis.y, zAxis.y, 0,
+                                 xAxis.z, yAxis.z, zAxis.z, 0,
+                                 0, 0, 0, 1)
+            return m.times(r);
         }
     }
 
+    components: [ eyeTransform ]
+
     property Entity leftCamera: Entity {
-        components: [
-            leftEyeLens,
-            eyeTransform
-        ]
+        components: [ leftEyeLens ]
     }
 
     property Entity rightCamera: Entity {
         id: rightCameraEntity
-        components: [
-            rightEyeLens,
-            eyeTransform
-        ]
+        components: [ rightEyeLens ]
     }
 }