summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/sensors/cubehouse/Cubehouse.qml2
-rw-r--r--examples/sensors/cubehouse/Room.qml21
2 files changed, 12 insertions, 11 deletions
diff --git a/examples/sensors/cubehouse/Cubehouse.qml b/examples/sensors/cubehouse/Cubehouse.qml
index e315c672..1db7209b 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 3d16da19..fd83998a 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)
}
]
}