Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 13 insertions, 1 deletions

diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml
index a686e29bd..2eb9abd1a 100644
--- a/examples/qt3d/controls/Logo.qml
+++ b/examples/qt3d/controls/Logo.qml
@@ -56,6 +56,18 @@ import Qt3D.Extras 2.0
 Entity {
     id: sceneRoot
 
+    readonly property double cameraZ: camera.position.z
+
+    function viewAll() {
+        camera.viewAll()
+    }
+    function viewLogo() {
+        camera.viewEntity(logoEntity)
+    }
+    function setPositionZ(z) {
+        camera.position = Qt.vector3d( 0.0, 0.0, z )
+    }
+
     Camera {
         id: camera
         projectionType: CameraLens.PerspectiveProjection
@@ -63,7 +75,7 @@ Entity {
         aspectRatio: 4/3
         nearPlane : 0.1
         farPlane : 1000.0
-        position: Qt.vector3d( 0.0, 0.0, viewCenter_z.value )
+        position: Qt.vector3d( 0.0, 0.0, 7.5 )
         upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
         viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 )
     }