Commit fc3cf82e authored by Tomi Korpipää's avatar Tomi Korpipää

Update LowEndCluster to OpenGL runtime 2.4

parent c5364f8c
......@@ -27,3 +27,6 @@ QML_DESIGNER_IMPORT_PATH =
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
DISTFILES += \
SimulationData.qml
......@@ -5,13 +5,4 @@
<dataInput metadata="" name="carSlide" type="String"/>
<dataInput metadata="" name="roadSpeed" type="Float"/>
</assets>
<statemachine ref="#logic">
<visual-states>
<state ref="Initial">
<enter>
<goto-slide rel="next" element="main:Scene"/>
</enter>
</state>
</visual-states>
</statemachine>
</application>
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">0.8 0.8 0.8</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./maps/road.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">True</Property>
<Property name="sourcepath"></Property>
<Property name="importid">Plane_Diffuse_Default</Property>
<Property name="importfile">../models/road/road.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/Plane_Diffuse_Default]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./maps/road.jpg]]></Property>
<Property name="importid"></Property>
<Property name="importfile"></Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[Image]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">1 1 1</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">False</Property>
<Property name="sourcepath"></Property>
<Property name="importid">lowpolyCoupe</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/lowpolyCoupe]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.jpg]]></Property>
<Property name="importid">lowpolyCoupe_diffusemap</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[lowpolyCoupe_diffusemap]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
<MaterialData version="1.0">
<Property name="shaderlighting">None</Property>
<Property name="blendmode">Normal</Property>
<Property name="diffuse">1 1 1</Property>
<Property name="diffuse">1 1 1 1</Property>
<Property name="diffusemap"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg]]></Property>
<Property name="specularamount">0</Property>
<Property name="specularroughness">0</Property>
<Property name="opacity">100</Property>
<Property name="emissivecolor">1 1 1</Property>
<Property name="emissivecolor">1 1 1 1</Property>
<Property name="emissivepower">0</Property>
<Property name="bumpamount">0.5</Property>
<Property name="displaceamount">20</Property>
<Property name="translucentfalloff">1</Property>
<Property name="diffuselightwrap">0</Property>
<Property name="specularmodel">Default</Property>
<Property name="speculartint">1 1 1</Property>
<Property name="speculartint">1 1 1 1</Property>
<Property name="ior">1.5</Property>
<Property name="fresnelPower">0</Property>
<Property name="vertexcolors">False</Property>
<Property name="sourcepath"></Property>
<Property name="importid">lowpolyCoupe</Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Material</Property>
<Property name="name"><![CDATA[materials/lowpolyCoupeRed]]></Property>
<Property name="path"><![CDATA[C:/dev/lowendcluster/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef]]></Property>
<Property name="type">Material</Property>
<Property name="path"><![CDATA[/home/tomi/dev/qt3dstudio-demos/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef]]></Property>
<TextureData name="diffusemap">
<Property name="scaleu">1</Property>
<Property name="scalev">1</Property>
......@@ -38,7 +38,7 @@
<Property name="sourcepath"><![CDATA[./models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg]]></Property>
<Property name="importid"></Property>
<Property name="importfile">../models/lowPolyCar/lowPolyCar.import</Property>
<Property name="type">Image</Property>
<Property name="name"><![CDATA[Image]]></Property>
<Property name="type">Image</Property>
</TextureData>
</MaterialData>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="5" >
<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="620" presentationHeight="290" maintainAspect="False" preferKtx="False" >
<CustomColors count="16" >#4f456e #56416e #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
</ProjectSettings>
<Graph >
<Scene id="Scene" controlledproperty="" >
<Scene id="Scene" bgcolorenable="False" >
<Layer id="Layer" variants="" >
<Camera id="Camera" />
<Component id="Car" >
<Model id="Car_001" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<Component id="Car" variants="" >
<Model id="Car_001" variants="" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 0" rotation="0 0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<ReferencedMaterial id="lowpolyCoupeRed" />
</Model>
</Component>
<Component id="Plane" >
<Model id="Plane_001" name="Plane" importid="Plane" orientation="Right Handed" position="0 0 -0" rotation="-90 -0 0" rotationorder="XYZr" scale="100 100 100" sourcepath="../models/road/meshes/Plane.mesh" >
<Component id="Plane" variants="" >
<Model id="Plane_001" variants="" name="Plane" importid="Plane" orientation="Right Handed" position="0 0 0" rotation="-90 0 0" rotationorder="XYZr" scale="100 100 100" sourcepath="../models/road/meshes/Plane.mesh" >
<Material id="Plane_Diffuse_Default" name="Plane_Diffuse_Default" >
<Image id="Plane_Diffuse_Default_diffusemap" />
</Material>
</Model>
</Component>
<Model id="Car2" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<Model id="Car2" variants="" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 0" rotation="0 0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<ReferencedMaterial id="lowpolyCoupe" />
</Model>
<Model id="Car3" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<Model id="Car3" variants="" name="polySurface3" importid="polySurface3" orientation="Right Handed" position="0 0 0" rotation="0 0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="../models/lowPolyCar/meshes/polySurface3.mesh" >
<ReferencedMaterial id="lowpolyCoupe_001" />
</Model>
</Layer>
<Material id="__Container" >
<Material id="materials/lowpolyCoupe" name="lowpolyCoupe" blendmode="Normal" diffuse="1 1 1" diffusemap="#materials/lowpolyCoupe_diffusemap" emissivepower="0" importfile="../models/lowPolyCar/lowPolyCar.import" importid="lowpolyCoupe" opacity="100" specularamount="0" >
<Material id="materials/lowpolyCoupe" name="lowpolyCoupe" blendmode="Normal" diffuse="1 1 1 1" diffusemap="#materials/lowpolyCoupe_diffusemap" emissivepower="0" importfile="../models/lowPolyCar/lowPolyCar.import" importid="lowpolyCoupe" opacity="100" specularamount="0" >
<Image id="materials/lowpolyCoupe_diffusemap" name="lowpolyCoupe_diffusemap" importid="lowpolyCoupe_diffusemap" pivotu="0.5" pivotv="0.5" positionu="-0.5" positionv="-0.5" scaleu="1" scalev="1" sourcepath="../models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.psd" tilingmodehorz="Tiled" tilingmodevert="Tiled" />
</Material>
<Material id="materials/lowpolyCoupeRed" >
......@@ -39,8 +39,8 @@
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" background="SolidColor" backgroundcolor="0 0 0" disabledepthprepass="True" disabledepthtest="False" />
<Add ref="#Camera" clipfar="3500" position="0 546.454 -720.64" rotation="44.5 0 0" >
<Add ref="#Layer" background="SolidColor" backgroundcolor="0 0 0 1" disabledepthprepass="True" disabledepthtest="False" />
<Add ref="#Camera" position="0 546.454 -720.64" rotation="44.5 0 0" >
<AnimationTrack property="position.x" type="EaseInOut" >0.008 0 0 0 2.003 0 0 0 22 0 0 0 24 0 0 0 44 0 0 0</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0.008 258.454 0 0 2.003 811.454 0 0 22 811.454 0 0 24 258.454 0 0 44 258.454 0 0</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0.008 -720.64 0 0 2.003 -616.64 0 0 22 -616.64 0 0 24 -720.64 0 0 44 -720.64 0 0</AnimationTrack>
......@@ -51,21 +51,21 @@
<Add ref="#__Container" name="__Container" />
<Add ref="#materials/lowpolyCoupe" name="materials/lowpolyCoupe" importfile="../models/lowPolyCar/lowPolyCar.import" shaderlighting="None" />
<Add ref="#materials/lowpolyCoupe_diffusemap" importfile="../models/lowPolyCar/lowPolyCar.import" sourcepath="../models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse.jpg" subpresentation="" />
<Add ref="#materials/lowpolyCoupeRed" name="materials/lowpolyCoupeRed" blendmode="Normal" bumpamount="0.5" diffuse="1 1 1" diffuselightwrap="0" diffusemap="#materials/lowpolyCoupeRed_diffusemap" displaceamount="20" emissivecolor="1 1 1" emissivepower="0" fresnelPower="0" importfile="../models/lowPolyCar/lowPolyCar.import" importid="lowpolyCoupe" ior="1.5" opacity="100" shaderlighting="None" sourcepath="" specularamount="0" specularmodel="Default" specularroughness="0" speculartint="1 1 1" translucentfalloff="1" type="Material" vertexcolors="False" />
<Add ref="#materials/lowpolyCoupeRed" name="materials/lowpolyCoupeRed" blendmode="Normal" bumpamount="0.5" diffuse="1 1 1 1" diffuselightwrap="0" diffusemap="#materials/lowpolyCoupeRed_diffusemap" displaceamount="20" emissivecolor="1 1 1 1" emissivepower="0" fresnelPower="0" importfile="../models/lowPolyCar/lowPolyCar.import" importid="lowpolyCoupe" ior="1.5" opacity="100" shaderlighting="None" sourcepath="" specularamount="0" specularmodel="Default" specularroughness="0" speculartint="1 1 1 1" translucentfalloff="1" type="Material" vertexcolors="False" />
<Add ref="#materials/lowpolyCoupeRed_diffusemap" importfile="../models/lowPolyCar/lowPolyCar.import" importid="" sourcepath="../models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg" subpresentation="" />
<State id="Scene-Slide1" name="Slide1" playmode="Looping" >
<Set ref="#Layer" endtime="44000" />
<Set ref="#Camera" endtime="44000" />
<Add ref="#Car" name="Car" controlledproperty="$carSlide @slide" endtime="44000" position="0 0 -41" />
<Add ref="#Plane" name="Plane" endtime="44000" />
<Add ref="#Car2" name="Car2" endtime="44000" importfile="../models/lowPolyCar/lowPolyCar.import" position="223.317 0 352.63" rotation="0 180 0" />
<Add ref="#Car2" name="Car2" endtime="44000" importfile="../models/lowPolyCar/lowPolyCar.import" position="223.317 0 352.63" rotation="0 180 0" shadowcaster="False" />
<Add ref="#lowpolyCoupe" name="lowpolyCoupe" endtime="44000" referencedmaterial="#materials/lowpolyCoupe" sourcepath="../materials/lowpolyCoupe.materialdef" />
<Add ref="#Car3" name="Car3" endtime="44000" importfile="../models/lowPolyCar/lowPolyCar.import" position="-218.659 0 677.935" rotation="0 180 0" />
<Add ref="#Car3" name="Car3" endtime="44000" importfile="../models/lowPolyCar/lowPolyCar.import" position="-218.659 0 677.935" rotation="0 180 0" shadowcaster="False" />
<Add ref="#lowpolyCoupe_001" name="lowpolyCoupe" endtime="44000" referencedmaterial="#materials/lowpolyCoupe" sourcepath="../materials/lowpolyCoupe.materialdef" />
</State>
</State>
<State name="Master Slide" component="#Car" >
<Add ref="#Car_001" name="Car" endtime="12000" importfile="../models/lowPolyCar/lowPolyCar.import" position="1.99085e-05 0 -227.727" rotation="0 180 0" >
<Add ref="#Car_001" name="Car" endtime="12000" importfile="../models/lowPolyCar/lowPolyCar.import" position="1.99085e-05 0 -227.727" rotation="0 180 0" shadowcaster="False" >
<AnimationTrack property="position.x" type="EaseInOut" />
<AnimationTrack property="position.y" type="EaseInOut" />
<AnimationTrack property="position.z" type="EaseInOut" />
......@@ -92,7 +92,7 @@
</State>
</State>
<State name="Master Slide" component="#Plane" >
<Add ref="#Plane_001" endtime="24000" importfile="../models/road/road.import" position="1.326e-05 3.69591e-20 303.353" rotation="-90 -90 0" scale="216.21 337.5 337.5" sourcepath="../models/road/meshes/Plane.mesh" >
<Add ref="#Plane_001" endtime="24000" importfile="../models/road/road.import" position="1.326e-05 3.69591e-20 303.353" rotation="-90 -90 0" scale="216.21 337.5 337.5" shadowcaster="False" sourcepath="../models/road/meshes/Plane.mesh" >
<AnimationTrack property="position.x" type="EaseInOut" >0.008 6.03426e-05 0 0 1.395 1.99652e-05 0 0 2.003 1.326e-05 0 0 22.0021 1.326e-05 0 0 22.7 1.99652e-05 0 0 24 6.03426e-05 0 0 44 6.03426e-05 0 0</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0.008 3.47976e-19 0 0 1.395 9.58182e-20 0 0 2.003 3.69591e-20 0 0 22.0021 3.69591e-20 0 0 22.7 9.58182e-20 0 0 24 3.47976e-19 0 0 44 3.47976e-19 0 0</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0.008 1380.48 0 0 1.395 456.749 0 0 2.003 303.353 0 0 22.0021 303.353 0 0 22.7 456.749 0 0 24 1380.48 0 0 44 1380.48 0 0</AnimationTrack>
......@@ -103,7 +103,7 @@
<AnimationTrack property="scale.z" type="EaseInOut" >0.008 486.725 0 0 0.7 418.891 0 0 1.395 377.373 0 0 2.003 337.5 0 0 22.0021 337.5 0 0 22.7 377.373 0 0 23.366 418.891 0 0 24 486.725
0 0 44 486.725 0 0</AnimationTrack>
</Add>
<Add ref="#Plane_Diffuse_Default" name="Plane_Diffuse_Default" blendmode="Normal" bumpamount="0.5" diffuse="0.8 0.8 0.8" diffuselightwrap="0" diffusemap="#Plane_Diffuse_Default_diffusemap" displaceamount="20" emissivecolor="1 1 1" emissivepower="0" fresnelPower="0" importfile="../models/road/road.import" importid="Plane_Diffuse_Default" ior="1.5" opacity="100" shaderlighting="None" sourcepath="" specularamount="0" specularmodel="Default" specularroughness="0" speculartint="1 1 1" translucentfalloff="1" type="Material" vertexcolors="True" />
<Add ref="#Plane_Diffuse_Default" name="Plane_Diffuse_Default" blendmode="Normal" bumpamount="0.5" diffuse="0.8 0.8 0.8 1" diffuselightwrap="0" diffusemap="#Plane_Diffuse_Default_diffusemap" displaceamount="20" emissivecolor="1 1 1 1" emissivepower="0" fresnelPower="0" importfile="../models/road/road.import" importid="Plane_Diffuse_Default" ior="1.5" opacity="100" shaderlighting="None" sourcepath="../" specularamount="0" specularmodel="Default" specularroughness="0" speculartint="1 1 1 1" translucentfalloff="1" type="Material" vertexcolors="True" />
<Add ref="#Plane_Diffuse_Default_diffusemap" controlledproperty="$roadSpeed positionv" importid="" positionu="0" scaleu="1" scalev="5" sourcepath="../maps/road.jpg" subpresentation="" tilingmodehorz="Tiled" tilingmodevert="Tiled" />
<State id="Plane-Slide1" name="Slide1" playmode="Looping" >
<Set ref="#Plane_001" endtime="44000" />
......
......@@ -8,8 +8,7 @@ Window {
width: 1280
height: 480
title: qsTr("Low End Cluster")
color: "black"
//visibility: Window.FullScreen // Use this only if display size is 1280 x 480
visibility: Window.AutomaticVisibility // On target device, use this only if display size is 1280 x 480
property real speedrotation: sim.speedRotation
property real rpmrotation: sim.rpmRotation
......@@ -78,6 +77,13 @@ Window {
source: "qrc:/TitilliumWeb-Italic.ttf"
}
Rectangle {
anchors.top: parent.top
anchors.left: parent.left
width: 1280
height: 480
color: "black"
// 3D Presentation
Studio3D {
id: adasview
......@@ -112,26 +118,24 @@ Window {
}
Image {
id: rpmgauge
source: "qrc:/rpmgauge.jpg"
source: "qrc:/rpmgauge.png"
anchors.top: parent.top
anchors.left: parent.left
anchors.leftMargin: 16 + gaugeoffset
anchors.topMargin: 16
Rectangle {
Item {
id: rpmneedle
width: 90
height: 413
anchors.centerIn: rpmgauge
color: "transparent"
rotation: rpmrotation
Rectangle {
Item {
id: rpmTrails
width: 90
height: 413
opacity: rpmTrailOpacity
anchors.centerIn: parent
color: "transparent"
Image {
id: rpmneedleTrailBackward
......@@ -163,18 +167,17 @@ Window {
}
Image {
id: speedgauge
source: "qrc:/speeedgauge.jpg"
source: "qrc:/speeedgauge.png"
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: 16 + gaugeoffset
anchors.topMargin: 16
Rectangle {
Item {
id: speedneedle
width: 90
height: 413
anchors.centerIn: speedgauge
color: "transparent"
rotation: speedrotation
Rectangle {
id: speedTrails
......@@ -212,29 +215,28 @@ Window {
}
}
}
Rectangle {
Item {
id: bottombar
height: 95
width: 559 - bottombarwidth
color: "black"
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
Image {
id: bottombarcenterpart
source: "qrc:/barcenter.jpg"
source: "qrc:/barcenter.png"
anchors.centerIn: bottombar
width: 263-bottombarwidth
}
Image {
id: bottombarleftside
source: "qrc:/barside.jpg"
source: "qrc:/barside.png"
anchors.right: bottombarcenterpart.left
anchors.verticalCenter: bottombar.verticalCenter
}
Image {
id: bottombarrightside
source: "qrc:/barside.jpg"
source: "qrc:/barside.png"
anchors.left: bottombarcenterpart.right
anchors.verticalCenter: bottombar.verticalCenter
mirror: true
......@@ -242,7 +244,7 @@ Window {
Image {
id: leftarrow
visible: leftblinker
source: "qrc:/arrow.jpg"
source: "qrc:/arrow.png"
anchors.right: bottombarcenterpart.left
anchors.verticalCenter: bottombar.verticalCenter
anchors.verticalCenterOffset: 3
......@@ -250,7 +252,7 @@ Window {
Image {
id: rightarrow
visible: rightblinker
source: "qrc:/arrow.jpg"
source: "qrc:/arrow.png"
anchors.left: bottombarcenterpart.right
anchors.verticalCenter: bottombar.verticalCenter
anchors.verticalCenterOffset: 3
......@@ -259,7 +261,7 @@ Window {
Image {
id: telltaleLight
visible: lightlow
source: "qrc:/light.jpg"
source: "qrc:/light.png"
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 3
......@@ -267,7 +269,7 @@ Window {
Image {
id: telltaleParkbrake
visible: parkbrake
source: "qrc:/parkbrake.jpg"
source: "qrc:/parkbrake.png"
anchors.right: telltaleLight.left
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: 10
......@@ -276,37 +278,36 @@ Window {
Image {
id: telltaleSeatbelt
visible: seatbelt
source: "qrc:/seatbelt.jpg"
source: "qrc:/seatbelt.png"
anchors.left: telltaleLight.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 10
anchors.verticalCenterOffset: 3
}
}
Rectangle {
Item {
id: topbar
height: 95
width: 500 - topbarwidth
color: "black"
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
rotation: 180
Image {
id: topbarcenterpart
source: "qrc:/barcenter.jpg"
source: "qrc:/barcenter.png"
anchors.centerIn: topbar
width: 204-topbarwidth
}
Image {
id: topbarleftside
source: "qrc:/barside.jpg"
source: "qrc:/barside.png"
anchors.right: topbarcenterpart.left
anchors.verticalCenter: topbar.verticalCenter
}
Image {
id: topbarrightside
source: "qrc:/barside.jpg"
source: "qrc:/barside.png"
anchors.left: topbarcenterpart.right
anchors.verticalCenter: topbar.verticalCenter
mirror: true
......@@ -391,7 +392,7 @@ Window {
}
Image {
id: gasolineIcon
source: "qrc:/fuel.jpg"
source: "qrc:/fuel.png"
anchors.horizontalCenter: gasolineContainer.horizontalCenter
anchors.verticalCenter: gasolineContainer.verticalCenter
anchors.horizontalCenterOffset: -165
......@@ -408,7 +409,7 @@ Window {
Image {
id: tempFill
source: "qrc:/tempFill.jpg"
source: "qrc:/tempFill.png"
anchors.centerIn: parent
}
Rectangle {
......@@ -437,17 +438,16 @@ Window {
}
Image {
id: tempIcon
source: "qrc:/temp.jpg"
source: "qrc:/temp.png"
anchors.horizontalCenter: engineTempContainer.horizontalCenter
anchors.verticalCenter: engineTempContainer.verticalCenter
anchors.horizontalCenterOffset: 165
}
}
Rectangle {
Item {
id: rightring
width: 260
height: 260
color: "black"
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 70 + ringoffset
......@@ -455,7 +455,7 @@ Window {
Image {
id: ringcraphicright
source: "qrc:/smallring.jpg"
source: "qrc:/smallring.png"
anchors.centerIn: rightring
}
Text {
......@@ -467,11 +467,10 @@ Window {
font.pixelSize: 100
}
}
Rectangle {
Item {
id: leftring
width: 260
height: 260
color: "black"
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 70 + ringoffset
......@@ -479,7 +478,7 @@ Window {
Image {
id: leftringgraphic
source: "qrc:/smallring.jpg"
source: "qrc:/smallring.png"
anchors.centerIn: leftring
}
Text {
......@@ -491,6 +490,7 @@ Window {
font.pixelSize: 130
}
}
}
// Animations
......
<RCC>
<qresource prefix="/">
<file>main.qml</file>
<file>barcenter.jpg</file>
<file>barside.jpg</file>
<file>needle.png</file>
<file>rpmgauge.jpg</file>
<file>speeedgauge.jpg</file>
<file>Presentation/maps/road.jpg</file>
<file>Presentation/materials/lowpolyCoupe.materialdef</file>
<file>Presentation/materials/Plane_Diffuse_Default.materialdef</file>
......@@ -16,14 +12,6 @@
<file>Presentation/Presentation.uia</file>
<file>main.cpp</file>
<file>TitilliumWeb-Italic.ttf</file>
<file>smallring.jpg</file>
<file>fuel.jpg</file>
<file>temp.jpg</file>
<file>tempFill.jpg</file>
<file>arrow.jpg</file>
<file>light.jpg</file>
<file>parkbrake.jpg</file>
<file>seatbelt.jpg</file>
<file>Presentation/models/lowPolyCar/maps/Low_lowpolyCoupe_Diffuse_red.jpg</file>
<file>FpsDisplay.qml</file>
<file>needleTrail.png</file>
......@@ -32,5 +20,17 @@
<file>Presentation/presentations/Presentation.uip</file>
<file>Presentation/models/road/meshes/Plane.mesh</file>
<file>Presentation/models/road/road.import</file>
<file>arrow.png</file>
<file>barcenter.png</file>
<file>barside.png</file>
<file>fuel.png</file>
<file>light.png</file>
<file>parkbrake.png</file>
<file>rpmgauge.png</file>
<file>seatbelt.png</file>
<file>smallring.png</file>
<file>speeedgauge.png</file>
<file>temp.png</file>
<file>tempFill.png</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment