Skip to content
Snippets Groups Projects
Commit b83f5c87 authored by Tomi Korpipää's avatar Tomi Korpipää
Browse files

Add mountains, fix car hovering in the distance

parent ed3aea9e
No related branches found
No related tags found
No related merge requests found
......@@ -172,7 +172,7 @@ Item {
scale: Qt.vector3d(6, 6, 6)
position.x: leftLane
position.z: zPos
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0)
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0) + (zPos <= -750 ? (zPos + 750) / 10 : 0)
matOpacity: carFade
}
......@@ -182,7 +182,7 @@ Item {
scale: Qt.vector3d(6, 6, 6)
position.x: rightLane
position.z: zPos
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0)
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0) + (zPos <= -750 ? (zPos + 750) / 10 : 0)
}
LowPolySUVGray {
......@@ -191,7 +191,7 @@ Item {
scale: Qt.vector3d(6, 6, 6)
position.x: leftLane
position.z: zPos
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0)
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0) + (zPos <= -750 ? (zPos + 750) / 10 : 0)
matOpacity: carFade
}
......@@ -201,9 +201,26 @@ Item {
scale: Qt.vector3d(6, 6, 6)
position.x: midLane
position.z: zPos
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0)
position.y: -50 - (zPos > -250 ? (zPos + 250) / 5 : 0) + (zPos <= -750 ? (zPos + 750) / 10 : 0)
}
}
Model {
scale.z: 1
scale.y: 3
scale.x: 12
position.y: 800
position.z: 375
source: "#Rectangle"
materials: [
DefaultMaterial {
diffuseMap: Texture {
source: "qrc:/Images/Mountains_001.ktx"
}
lighting: DefaultMaterial.NoLighting
}
]
}
}
Timeline {
......
File added
......@@ -35,7 +35,6 @@ Window {
// Line image bottom margin (image sequence is different size than the final image)
property int linesBottomMargin: -75
property int linesSideMargin: 0
FontLoader {
id: customfont
......@@ -159,7 +158,6 @@ Window {
Image {
anchors.right: parent.horizontalCenter
anchors.bottom: bottomLeftFrame.top
anchors.rightMargin: linesSideMargin
anchors.bottomMargin: linesBottomMargin
mirror: !adasview.isRunning
source: lineImageLeft
......@@ -184,7 +182,6 @@ Window {
Image {
anchors.left: parent.horizontalCenter
anchors.bottom: bottomRightFrame.top
anchors.leftMargin: linesSideMargin
anchors.bottomMargin: linesBottomMargin
mirror: adasview.isRunning
source: lineImageRight
......@@ -372,7 +369,6 @@ Window {
lineImageLeft = "qrc:/Images/LineGroup_Left_matted.ktx";
lineImageRight = "qrc:/Images/LineGroup_Right_matted.ktx";
linesBottomMargin = 0;
linesSideMargin = 20;
adasview.isRunning = true;
}
}
......@@ -408,7 +404,6 @@ Window {
}
function restartDemo() {
linesSideMargin = 0;
linesBottomMargin = -75;
warningIconOpacity = 1.0;
adasview.isRunning = false;
......
......@@ -149,5 +149,6 @@
<file>maps/maskcenter.ktx</file>
<file>maps/maskleft.ktx</file>
<file>maps/maskright.ktx</file>
<file>Images/Mountains_001.ktx</file>
</qresource>
</RCC>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment