From 081026022ab49d59df2724ef07feae7a21c86155 Mon Sep 17 00:00:00 2001
From: Wolfgang Beck <wolfgang.beck@nokia.com>
Date: Mon, 27 Feb 2012 09:38:15 +1000
Subject: Rescale cubhouse example

Change-Id: I366777d7788a55b5a6fcad194d5833a19a6cf4b3
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
---
 examples/sensors/cubehouse/Cubehouse.qml |  2 +-
 examples/sensors/cubehouse/Room.qml      | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'examples')

diff --git a/examples/sensors/cubehouse/Cubehouse.qml b/examples/sensors/cubehouse/Cubehouse.qml
index e315c67..1db7209 100644
--- a/examples/sensors/cubehouse/Cubehouse.qml
+++ b/examples/sensors/cubehouse/Cubehouse.qml
@@ -61,7 +61,7 @@ Item {
         renderMode: "DirectRender"
         fillColor: "darkblue"
         objectName: "cube viewport"
-        camera: Camera { eye: Qt.vector3d(0, 3, 1.6 * room.scale )}
+        camera: Camera { eye: Qt.vector3d(0, 3, 1.6 * room.scale - 4)}
 
         Room{
             id: room
diff --git a/examples/sensors/cubehouse/Room.qml b/examples/sensors/cubehouse/Room.qml
index 3d16da1..fd83998 100644
--- a/examples/sensors/cubehouse/Room.qml
+++ b/examples/sensors/cubehouse/Room.qml
@@ -50,6 +50,7 @@ Item3D{
     property bool xspin: false
     property int yrot: 0
     property int xrot: 0
+    property double distanceCorrection: 3.7
 
     transform: [
         Rotation3D {
@@ -106,7 +107,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -frontWall.scale, 0)
+                translate: Qt.vector3d(0, -frontWall.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: 90
@@ -131,7 +132,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -ground.scale, 0)
+                translate: Qt.vector3d(0, -ground.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: 90
@@ -156,7 +157,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -leftWall.scale, 0)
+                translate: Qt.vector3d(0, -leftWall.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: 0
@@ -181,7 +182,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -rightWall.scale, 0)
+                translate: Qt.vector3d(0, -rightWall.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: 180
@@ -206,7 +207,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -roof.scale, 0)
+                translate: Qt.vector3d(0, -roof.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: 90
@@ -231,7 +232,7 @@ Item3D{
         }
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -backWall.scale, 0)
+                translate: Qt.vector3d(0, -backWall.scale + room.distanceCorrection, 0)
             },
             Rotation3D {
                 angle: -90
@@ -254,16 +255,16 @@ Item3D{
 
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0.0, 0.8 - 0.85, 0.0)
+                translate: Qt.vector3d(0.0, 0.0, 0.0)
             }
         ]
     }
 
     Table {
-        scale: 0.045
+        scale: 0.025
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0, -5, 0)
+                translate: Qt.vector3d(0, -7 + room.distanceCorrection, 0)
             }
         ]
     }
@@ -278,7 +279,7 @@ Item3D{
 
         transform: [
             Translation3D {
-                translate: Qt.vector3d(0.0, -0.85, 0.0)
+                translate: Qt.vector3d(0.0, -4.50 + room.distanceCorrection, 0.0)
             }
         ]
     }
-- 
cgit v1.2.1