diff --git a/LowEndCluster/LowEndCluster.pro b/LowEndCluster/LowEndCluster.pro
index a517b750792bd9989842a4f81273fccc3774abb7..5930e0a297242b32f062cf45185744d6d804cb9a 100644
--- a/LowEndCluster/LowEndCluster.pro
+++ b/LowEndCluster/LowEndCluster.pro
@@ -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
diff --git a/LowEndCluster/Presentation/Presentation.uia b/LowEndCluster/Presentation/Presentation.uia
index f1926fe2da0e46499c133c337bdc71b59e0dcc9e..97483e6049e5b84dd482aeba3025b17b14d47cd6 100644
--- a/LowEndCluster/Presentation/Presentation.uia
+++ b/LowEndCluster/Presentation/Presentation.uia
@@ -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>
diff --git a/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef b/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef
index 38fb6761c5fcc1c2b8545d026e55fe60065a923a..74931d307bc477c9d2673c68f1cf730a7596b94f 100644
--- a/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef
+++ b/LowEndCluster/Presentation/materials/Plane_Diffuse_Default.materialdef
@@ -1,28 +1,28 @@
<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
diff --git a/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef b/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef
index ddeae085cd275f6caf26c827708e97102b894161..9356cac6d30de3e7a73538b4fd8b5ad4f258abd4 100644
--- a/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef
+++ b/LowEndCluster/Presentation/materials/lowpolyCoupe.materialdef
@@ -1,28 +1,28 @@
<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
diff --git a/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef b/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef
index 02fa2862a5c141a7741541cdf1d197fd83374e57..0dad25107f2476cec5106d2a7b25e62386711afc 100644
--- a/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef
+++ b/LowEndCluster/Presentation/materials/lowpolyCoupeRed.materialdef
@@ -1,28 +1,28 @@
<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
diff --git a/LowEndCluster/Presentation/presentations/Presentation.uip b/LowEndCluster/Presentation/presentations/Presentation.uip
index 83279ff4b0eaa620f37e2e54f7ddcc6e15ec3ca7..df04fd4cbd2a4496642f374c17860d7111b13a4f 100644
--- a/LowEndCluster/Presentation/presentations/Presentation.uip
+++ b/LowEndCluster/Presentation/presentations/Presentation.uip
@@ -1,35 +1,35 @@
<?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" >
- <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 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" >
<Image id="materials/lowpolyCoupeRed_diffusemap" />
@@ -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,26 +51,26 @@
<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="#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="#lowpolyCoupe_001" name="lowpolyCoupe" endtime="44000" referencedmaterial="#materials/lowpolyCoupe" sourcepath="../materials/lowpolyCoupe.materialdef" />
+ <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" 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" />
</Add>
- <Add ref="#lowpolyCoupeRed" name="lowpolyCoupeRed" endtime="12000" referencedmaterial="#materials/lowpolyCoupeRed" sourcepath="../materials/lowpolyCoupeRed.materialdef" />
+ <Add ref="#lowpolyCoupeRed" name="lowpolyCoupeRed" endtime="12000" referencedmaterial="#materials/lowpolyCoupeRed" sourcepath="../materials/lowpolyCoupeRed.materialdef" />
<State id="Car-Top" name="Top" playmode="Looping" >
<Set ref="#Car_001" endtime="18790" position="1.99085e-05 0 -227.727" >
<AnimationTrack property="position.x" type="EaseInOut" dynamic="True" >0 1.99085e-05 0 0 2.00005 1.99085e-05 0 0 3.104 -223.962 0 0 4.708 -223.962 0 0 6.96605 1.99085e-05 0 0 9.01 1.99085e-05 0 0 14.254 224.095 0 0 16.466 224.095
@@ -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,8 +103,8 @@
<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_diffusemap" controlledproperty="$roadSpeed positionv" importid="" positionu="0" scaleu="1" scalev="5" sourcepath="../maps/road.jpg" subpresentation="" tilingmodehorz="Tiled" tilingmodevert="Tiled" />
+ <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" />
</State>
diff --git a/LowEndCluster/arrow.jpg b/LowEndCluster/arrow.jpg
deleted file mode 100644
index 1e44132ec1549d52c1273d2e0f79d5000d76b3b7..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/arrow.jpg and /dev/null differ
diff --git a/LowEndCluster/arrow.png b/LowEndCluster/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..399a8745d1c63f77836c85241d3b598bddcfd0d4
Binary files /dev/null and b/LowEndCluster/arrow.png differ
diff --git a/LowEndCluster/barcenter.jpg b/LowEndCluster/barcenter.jpg
deleted file mode 100644
index 3ab2e14ee7a94b9bd54cb19a1fb3a59e1a9c17d2..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/barcenter.jpg and /dev/null differ
diff --git a/LowEndCluster/barcenter.png b/LowEndCluster/barcenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..56efc509420966c05bbf0c47e2da9b086cc4210f
Binary files /dev/null and b/LowEndCluster/barcenter.png differ
diff --git a/LowEndCluster/barside.jpg b/LowEndCluster/barside.jpg
deleted file mode 100644
index 1639acfb94e55b9882e5f36c12096ca7f119152d..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/barside.jpg and /dev/null differ
diff --git a/LowEndCluster/barside.png b/LowEndCluster/barside.png
new file mode 100644
index 0000000000000000000000000000000000000000..631ead1066f29ba44eb854e136519127ca2f75c4
Binary files /dev/null and b/LowEndCluster/barside.png differ
diff --git a/LowEndCluster/fuel.jpg b/LowEndCluster/fuel.jpg
deleted file mode 100644
index 01da444c84a548d587eaaf3e5c2570c6ce243e71..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/fuel.jpg and /dev/null differ
diff --git a/LowEndCluster/fuel.png b/LowEndCluster/fuel.png
new file mode 100644
index 0000000000000000000000000000000000000000..82920934980aadff47b3ba8406a55ac4e2b992e7
Binary files /dev/null and b/LowEndCluster/fuel.png differ
diff --git a/LowEndCluster/light.jpg b/LowEndCluster/light.jpg
deleted file mode 100644
index 9bb9890b56c0af3bad8c627acb250240b4410ea7..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/light.jpg and /dev/null differ
diff --git a/LowEndCluster/light.png b/LowEndCluster/light.png
new file mode 100644
index 0000000000000000000000000000000000000000..aba74fdc18dbddcf208dccd602498d94bef27d08
Binary files /dev/null and b/LowEndCluster/light.png differ
diff --git a/LowEndCluster/main.qml b/LowEndCluster/main.qml
index a3f13c0790fde849da6d5d9e3ecbe546925b8728..66d72fac4f6455901a734a83ac03859d3758df6e 100644
--- a/LowEndCluster/main.qml
+++ b/LowEndCluster/main.qml
@@ -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,417 +77,418 @@ Window {
source: "qrc:/TitilliumWeb-Italic.ttf"
}
- // 3D Presentation
- Studio3D {
- id: adasview
- anchors.top: topbar.bottom
- anchors.horizontalCenter: topbar.horizontalCenter
- width: 620
- height: 290
+ Rectangle {
+ anchors.top: parent.top
+ anchors.left: parent.left
+ width: 1280
+ height: 480
+ color: "black"
- ViewerSettings {
- scaleMode: ViewerSettings.ScaleModeFit
- }
+ // 3D Presentation
+ Studio3D {
+ id: adasview
+ anchors.top: topbar.bottom
+ anchors.horizontalCenter: topbar.horizontalCenter
+ width: 620
+ height: 290
- Presentation {
- source: "qrc:/Presentation/Presentation.uia"
- SceneElement {
- id: carComponent
- elementPath: "Scene.Layer.Car"
+ ViewerSettings {
+ scaleMode: ViewerSettings.ScaleModeFit
}
- DataInput {
- id: carPosition
- name: "carSlide"
- value: "Top"
- }
+ Presentation {
+ source: "qrc:/Presentation/Presentation.uia"
+ SceneElement {
+ id: carComponent
+ elementPath: "Scene.Layer.Car"
+ }
+
+ DataInput {
+ id: carPosition
+ name: "carSlide"
+ value: "Top"
+ }
- DataInput {
- id: roadPosition
- name: "roadSpeed"
- value: roadSpeed
+ DataInput {
+ id: roadPosition
+ name: "roadSpeed"
+ value: roadSpeed
+ }
}
}
- }
- Image {
- id: rpmgauge
- source: "qrc:/rpmgauge.jpg"
- anchors.top: parent.top
- anchors.left: parent.left
- anchors.leftMargin: 16 + gaugeoffset
- anchors.topMargin: 16
-
- Rectangle {
- id: rpmneedle
- width: 90
- height: 413
- anchors.centerIn: rpmgauge
- color: "transparent"
- rotation: rpmrotation
- Rectangle {
- id: rpmTrails
+ Image {
+ id: rpmgauge
+ source: "qrc:/rpmgauge.png"
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.leftMargin: 16 + gaugeoffset
+ anchors.topMargin: 16
+
+ Item {
+ id: rpmneedle
width: 90
height: 413
- opacity: rpmTrailOpacity
- anchors.centerIn: parent
- color: "transparent"
-
- Image {
- id: rpmneedleTrailBackward
- visible: !rpmForward
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenterOffset: 20
- anchors.verticalCenterOffset: -90
- source: "qrc:/needleTrail.png"
+ anchors.centerIn: rpmgauge
+ rotation: rpmrotation
+ Item {
+ id: rpmTrails
+ width: 90
+ height: 413
+ opacity: rpmTrailOpacity
+ anchors.centerIn: parent
+
+ Image {
+ id: rpmneedleTrailBackward
+ visible: !rpmForward
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenterOffset: 20
+ anchors.verticalCenterOffset: -90
+ source: "qrc:/needleTrail.png"
+ }
+ Image {
+ id: rpmneedleTrailForward
+ visible: rpmForward
+ mirror: true
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenterOffset: -20
+ anchors.verticalCenterOffset: -90
+ source: "qrc:/needleTrail.png"
+ }
}
+
Image {
- id: rpmneedleTrailForward
- visible: rpmForward
- mirror: true
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenterOffset: -20
- anchors.verticalCenterOffset: -90
- source: "qrc:/needleTrail.png"
+ id: rpmgneedlegraphic
+ source: "qrc:/needle.png"
+ anchors.bottom: rpmneedle.Center
}
}
-
- Image {
- id: rpmgneedlegraphic
- source: "qrc:/needle.png"
- anchors.bottom: rpmneedle.Center
- }
}
- }
- Image {
- id: speedgauge
- source: "qrc:/speeedgauge.jpg"
- anchors.top: parent.top
- anchors.right: parent.right
- anchors.rightMargin: 16 + gaugeoffset
- anchors.topMargin: 16
-
- Rectangle {
- id: speedneedle
- width: 90
- height: 413
- anchors.centerIn: speedgauge
- color: "transparent"
- rotation: speedrotation
- Rectangle {
- id: speedTrails
+ Image {
+ id: speedgauge
+ source: "qrc:/speeedgauge.png"
+ anchors.top: parent.top
+ anchors.right: parent.right
+ anchors.rightMargin: 16 + gaugeoffset
+ anchors.topMargin: 16
+
+ Item {
+ id: speedneedle
width: 90
height: 413
- opacity: speedTrailOpacity
- anchors.centerIn: parent
- color: "transparent"
-
- Image {
- id: speedneedleTrailBackward
- visible: !speedForward
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenterOffset: 20
- anchors.verticalCenterOffset: -90
- source: "qrc:/needleTrail.png"
+ anchors.centerIn: speedgauge
+ rotation: speedrotation
+ Rectangle {
+ id: speedTrails
+ width: 90
+ height: 413
+ opacity: speedTrailOpacity
+ anchors.centerIn: parent
+ color: "transparent"
+
+ Image {
+ id: speedneedleTrailBackward
+ visible: !speedForward
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenterOffset: 20
+ anchors.verticalCenterOffset: -90
+ source: "qrc:/needleTrail.png"
+ }
+ Image {
+ id: speedneedleTrailForward
+ visible: speedForward
+ mirror: true
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenterOffset: -20
+ anchors.verticalCenterOffset: -90
+ source: "qrc:/needleTrail.png"
+ }
}
+
Image {
- id: speedneedleTrailForward
- visible: speedForward
- mirror: true
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenterOffset: -20
- anchors.verticalCenterOffset: -90
- source: "qrc:/needleTrail.png"
+ id: speedneedlegraphic
+ source: "qrc:/needle.png"
+ anchors.bottom: speedneedle.Center
}
}
+ }
+ Item {
+ id: bottombar
+ height: 95
+ width: 559 - bottombarwidth
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.bottom: parent.bottom
Image {
- id: speedneedlegraphic
- source: "qrc:/needle.png"
- anchors.bottom: speedneedle.Center
+ id: bottombarcenterpart
+ source: "qrc:/barcenter.png"
+ anchors.centerIn: bottombar
+ width: 263-bottombarwidth
+ }
+ Image {
+ id: bottombarleftside
+ source: "qrc:/barside.png"
+ anchors.right: bottombarcenterpart.left
+ anchors.verticalCenter: bottombar.verticalCenter
+ }
+ Image {
+ id: bottombarrightside
+ source: "qrc:/barside.png"
+ anchors.left: bottombarcenterpart.right
+ anchors.verticalCenter: bottombar.verticalCenter
+ mirror: true
+ }
+ Image {
+ id: leftarrow
+ visible: leftblinker
+ source: "qrc:/arrow.png"
+ anchors.right: bottombarcenterpart.left
+ anchors.verticalCenter: bottombar.verticalCenter
+ anchors.verticalCenterOffset: 3
+ }
+ Image {
+ id: rightarrow
+ visible: rightblinker
+ source: "qrc:/arrow.png"
+ anchors.left: bottombarcenterpart.right
+ anchors.verticalCenter: bottombar.verticalCenter
+ anchors.verticalCenterOffset: 3
+ mirror: true
+ }
+ Image {
+ id: telltaleLight
+ visible: lightlow
+ source: "qrc:/light.png"
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 3
+ }
+ Image {
+ id: telltaleParkbrake
+ visible: parkbrake
+ source: "qrc:/parkbrake.png"
+ anchors.right: telltaleLight.left
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.rightMargin: 10
+ anchors.verticalCenterOffset: 3
+ }
+ Image {
+ id: telltaleSeatbelt
+ visible: seatbelt
+ source: "qrc:/seatbelt.png"
+ anchors.left: telltaleLight.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 10
+ anchors.verticalCenterOffset: 3
}
}
- }
- Rectangle {
- id: bottombar
- height: 95
- width: 559 - bottombarwidth
- color: "black"
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
-
- Image {
- id: bottombarcenterpart
- source: "qrc:/barcenter.jpg"
- anchors.centerIn: bottombar
- width: 263-bottombarwidth
- }
- Image {
- id: bottombarleftside
- source: "qrc:/barside.jpg"
- anchors.right: bottombarcenterpart.left
- anchors.verticalCenter: bottombar.verticalCenter
- }
- Image {
- id: bottombarrightside
- source: "qrc:/barside.jpg"
- anchors.left: bottombarcenterpart.right
- anchors.verticalCenter: bottombar.verticalCenter
- mirror: true
- }
- Image {
- id: leftarrow
- visible: leftblinker
- source: "qrc:/arrow.jpg"
- anchors.right: bottombarcenterpart.left
- anchors.verticalCenter: bottombar.verticalCenter
- anchors.verticalCenterOffset: 3
- }
- Image {
- id: rightarrow
- visible: rightblinker
- source: "qrc:/arrow.jpg"
- anchors.left: bottombarcenterpart.right
- anchors.verticalCenter: bottombar.verticalCenter
- anchors.verticalCenterOffset: 3
- mirror: true
- }
- Image {
- id: telltaleLight
- visible: lightlow
- source: "qrc:/light.jpg"
+ Item {
+ id: topbar
+ height: 95
+ width: 500 - topbarwidth
anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 3
- }
- Image {
- id: telltaleParkbrake
- visible: parkbrake
- source: "qrc:/parkbrake.jpg"
- anchors.right: telltaleLight.left
- anchors.verticalCenter: parent.verticalCenter
- anchors.rightMargin: 10
- anchors.verticalCenterOffset: 3
- }
- Image {
- id: telltaleSeatbelt
- visible: seatbelt
- source: "qrc:/seatbelt.jpg"
- anchors.left: telltaleLight.right
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 10
- anchors.verticalCenterOffset: 3
- }
- }
- Rectangle {
- 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"
- anchors.centerIn: topbar
- width: 204-topbarwidth
- }
- Image {
- id: topbarleftside
- source: "qrc:/barside.jpg"
- anchors.right: topbarcenterpart.left
- anchors.verticalCenter: topbar.verticalCenter
- }
- Image {
- id: topbarrightside
- source: "qrc:/barside.jpg"
- anchors.left: topbarcenterpart.right
- anchors.verticalCenter: topbar.verticalCenter
- mirror: true
- }
- Text {
- id: clock
- text: "11:34"
- anchors.verticalCenter: topbar.verticalCenter
- anchors.left: topbarrightside.left
- anchors.verticalCenterOffset: 10
- anchors.horizontalCenterOffset: 10
- color: "white"
- rotation: 180
- font.family: customfont.name
- font.pixelSize: 30
- }
- Text {
- id: outdoortemp
- text: "21°C"
- anchors.verticalCenter: topbar.verticalCenter
- anchors.right: topbarleftside.right
- anchors.verticalCenterOffset: 10
- anchors.horizontalCenterOffset: 15
- color: "white"
- font.family: customfont.name
- font.pixelSize: 30
- rotation: 180
- }
- Text {
- id: sport
- text: "CRUISE MODE"
- anchors.verticalCenter: topbar.verticalCenter
- anchors.horizontalCenter: topbar.horizontalCenter
- anchors.verticalCenterOffset: 10+toptextoffset
- color: "white"
- font.family: customfont.name
- font.pixelSize: 35
+ anchors.top: parent.top
rotation: 180
+
+ Image {
+ id: topbarcenterpart
+ source: "qrc:/barcenter.png"
+ anchors.centerIn: topbar
+ width: 204-topbarwidth
+ }
+ Image {
+ id: topbarleftside
+ source: "qrc:/barside.png"
+ anchors.right: topbarcenterpart.left
+ anchors.verticalCenter: topbar.verticalCenter
+ }
+ Image {
+ id: topbarrightside
+ source: "qrc:/barside.png"
+ anchors.left: topbarcenterpart.right
+ anchors.verticalCenter: topbar.verticalCenter
+ mirror: true
+ }
+ Text {
+ id: clock
+ text: "11:34"
+ anchors.verticalCenter: topbar.verticalCenter
+ anchors.left: topbarrightside.left
+ anchors.verticalCenterOffset: 10
+ anchors.horizontalCenterOffset: 10
+ color: "white"
+ rotation: 180
+ font.family: customfont.name
+ font.pixelSize: 30
+ }
+ Text {
+ id: outdoortemp
+ text: "21°C"
+ anchors.verticalCenter: topbar.verticalCenter
+ anchors.right: topbarleftside.right
+ anchors.verticalCenterOffset: 10
+ anchors.horizontalCenterOffset: 15
+ color: "white"
+ font.family: customfont.name
+ font.pixelSize: 30
+ rotation: 180
+ }
+ Text {
+ id: sport
+ text: "CRUISE MODE"
+ anchors.verticalCenter: topbar.verticalCenter
+ anchors.horizontalCenter: topbar.horizontalCenter
+ anchors.verticalCenterOffset: 10+toptextoffset
+ color: "white"
+ font.family: customfont.name
+ font.pixelSize: 35
+ rotation: 180
+ }
}
- }
- Item {
- id: gasolineContainer
- height: 4
- width: 230
- anchors.horizontalCenter: speedgauge.horizontalCenter
- anchors.verticalCenter: bottombar.verticalCenter
- anchors.verticalCenterOffset: 20
- anchors.horizontalCenterOffset: 65
-
- Rectangle {
- id: gasolineSliderBg
- width: gasoline * 2.3
- color: "#434343"
- anchors.fill: parent
- anchors.centerIn: parent
- }
- Rectangle {
- id: gasolineSlider
+ Item {
+ id: gasolineContainer
height: 4
- width: gasoline * 2.3
- color: "#3366cc"
- anchors.left: gasolineContainer.left
- anchors.verticalCenter: gasolineContainer.verticalCenter
- }
- Text {
- id: gasolineFull
- text: "F"
- anchors.verticalCenter: gasolineSlider.verticalCenter
- anchors.left: gasolineContainer.right
- anchors.leftMargin: 10
- color: "white"
- font.pixelSize: 22
- }
- Text {
- id: gasolineEmpty
- text: "E"
- anchors.verticalCenter: gasolineSlider.verticalCenter
- anchors.right: gasolineContainer.left
- anchors.rightMargin: 10
- color: "white"
- font.pixelSize: 22
- }
- Image {
- id: gasolineIcon
- source: "qrc:/fuel.jpg"
- anchors.horizontalCenter: gasolineContainer.horizontalCenter
- anchors.verticalCenter: gasolineContainer.verticalCenter
- anchors.horizontalCenterOffset: -165
- }
- }
- Item {
- id: engineTempContainer
- height: 10
- width: 240
- anchors.horizontalCenter: rpmgauge.horizontalCenter
- anchors.verticalCenter: bottombar.verticalCenter
- anchors.verticalCenterOffset: 20
- anchors.horizontalCenterOffset: -65
+ width: 230
+ anchors.horizontalCenter: speedgauge.horizontalCenter
+ anchors.verticalCenter: bottombar.verticalCenter
+ anchors.verticalCenterOffset: 20
+ anchors.horizontalCenterOffset: 65
- Image {
- id: tempFill
- source: "qrc:/tempFill.jpg"
- anchors.centerIn: parent
+ Rectangle {
+ id: gasolineSliderBg
+ width: gasoline * 2.3
+ color: "#434343"
+ anchors.fill: parent
+ anchors.centerIn: parent
+ }
+ Rectangle {
+ id: gasolineSlider
+ height: 4
+ width: gasoline * 2.3
+ color: "#3366cc"
+ anchors.left: gasolineContainer.left
+ anchors.verticalCenter: gasolineContainer.verticalCenter
+ }
+ Text {
+ id: gasolineFull
+ text: "F"
+ anchors.verticalCenter: gasolineSlider.verticalCenter
+ anchors.left: gasolineContainer.right
+ anchors.leftMargin: 10
+ color: "white"
+ font.pixelSize: 22
+ }
+ Text {
+ id: gasolineEmpty
+ text: "E"
+ anchors.verticalCenter: gasolineSlider.verticalCenter
+ anchors.right: gasolineContainer.left
+ anchors.rightMargin: 10
+ color: "white"
+ font.pixelSize: 22
+ }
+ Image {
+ id: gasolineIcon
+ source: "qrc:/fuel.png"
+ anchors.horizontalCenter: gasolineContainer.horizontalCenter
+ anchors.verticalCenter: gasolineContainer.verticalCenter
+ anchors.horizontalCenterOffset: -165
+ }
}
- Rectangle {
- id: tempSlider
+ Item {
+ id: engineTempContainer
height: 10
- width: gasoline * 2.3
- color: "black"
- anchors.right: tempFill.right
- anchors.verticalCenter: tempFill.verticalCenter
- }
- Text {
- id: tempMax
- text: "H"
- anchors.verticalCenter: engineTempContainer.verticalCenter
- anchors.left: engineTempContainer.right
- color: "white"
- font.pixelSize: 22
- }
- Text {
- id: tempMin
- text: "C"
- anchors.verticalCenter: engineTempContainer.verticalCenter
- anchors.right: engineTempContainer.left
- color: "white"
- font.pixelSize: 22
- }
- Image {
- id: tempIcon
- source: "qrc:/temp.jpg"
- anchors.horizontalCenter: engineTempContainer.horizontalCenter
- anchors.verticalCenter: engineTempContainer.verticalCenter
- anchors.horizontalCenterOffset: 165
- }
- }
- Rectangle {
- id: rightring
- width: 260
- height: 260
- color: "black"
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 70 + ringoffset
- anchors.rightMargin: 40 + (ringoffset / 2)
+ width: 240
+ anchors.horizontalCenter: rpmgauge.horizontalCenter
+ anchors.verticalCenter: bottombar.verticalCenter
+ anchors.verticalCenterOffset: 20
+ anchors.horizontalCenterOffset: -65
- Image {
- id: ringcraphicright
- source: "qrc:/smallring.jpg"
- anchors.centerIn: rightring
- }
- Text {
- id: digitalspeed
- text: speed.toFixed();
- anchors.centerIn: parent
- color: "white"
- font.family: customfont.name
- font.pixelSize: 100
+ Image {
+ id: tempFill
+ source: "qrc:/tempFill.png"
+ anchors.centerIn: parent
+ }
+ Rectangle {
+ id: tempSlider
+ height: 10
+ width: gasoline * 2.3
+ color: "black"
+ anchors.right: tempFill.right
+ anchors.verticalCenter: tempFill.verticalCenter
+ }
+ Text {
+ id: tempMax
+ text: "H"
+ anchors.verticalCenter: engineTempContainer.verticalCenter
+ anchors.left: engineTempContainer.right
+ color: "white"
+ font.pixelSize: 22
+ }
+ Text {
+ id: tempMin
+ text: "C"
+ anchors.verticalCenter: engineTempContainer.verticalCenter
+ anchors.right: engineTempContainer.left
+ color: "white"
+ font.pixelSize: 22
+ }
+ Image {
+ id: tempIcon
+ source: "qrc:/temp.png"
+ anchors.horizontalCenter: engineTempContainer.horizontalCenter
+ anchors.verticalCenter: engineTempContainer.verticalCenter
+ anchors.horizontalCenterOffset: 165
+ }
}
- }
- Rectangle {
- id: leftring
- width: 260
- height: 260
- color: "black"
- anchors.left: parent.left
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 70 + ringoffset
- anchors.leftMargin: 40 + (ringoffset / 2)
+ Item {
+ id: rightring
+ width: 260
+ height: 260
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 70 + ringoffset
+ anchors.rightMargin: 40 + (ringoffset / 2)
- Image {
- id: leftringgraphic
- source: "qrc:/smallring.jpg"
- anchors.centerIn: leftring
+ Image {
+ id: ringcraphicright
+ source: "qrc:/smallring.png"
+ anchors.centerIn: rightring
+ }
+ Text {
+ id: digitalspeed
+ text: speed.toFixed();
+ anchors.centerIn: parent
+ color: "white"
+ font.family: customfont.name
+ font.pixelSize: 100
+ }
}
- Text {
- id: gearindicator
- text: gear
- anchors.centerIn: parent
- color: "white"
- font.family: customfont.name
- font.pixelSize: 130
+ Item {
+ id: leftring
+ width: 260
+ height: 260
+ anchors.left: parent.left
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 70 + ringoffset
+ anchors.leftMargin: 40 + (ringoffset / 2)
+
+ Image {
+ id: leftringgraphic
+ source: "qrc:/smallring.png"
+ anchors.centerIn: leftring
+ }
+ Text {
+ id: gearindicator
+ text: gear
+ anchors.centerIn: parent
+ color: "white"
+ font.family: customfont.name
+ font.pixelSize: 130
+ }
}
}
diff --git a/LowEndCluster/parkbrake.jpg b/LowEndCluster/parkbrake.jpg
deleted file mode 100644
index 6c7ecafced8318c7d2e6a6d731649a95a4d9b79f..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/parkbrake.jpg and /dev/null differ
diff --git a/LowEndCluster/parkbrake.png b/LowEndCluster/parkbrake.png
new file mode 100644
index 0000000000000000000000000000000000000000..820085fc9adc90812fe5129fedd09c8da221ba0e
Binary files /dev/null and b/LowEndCluster/parkbrake.png differ
diff --git a/LowEndCluster/qml.qrc b/LowEndCluster/qml.qrc
index ce9f9111ddd6efbb4ac59c6744cc1a50dcc422b9..ceab97b145d3f8d314f70128cd429c84aed1d095 100644
--- a/LowEndCluster/qml.qrc
+++ b/LowEndCluster/qml.qrc
@@ -1,11 +1,7 @@
<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>
diff --git a/LowEndCluster/rpmgauge.jpg b/LowEndCluster/rpmgauge.jpg
deleted file mode 100644
index 89e7e570f3d2edef451aee37dae0c014b6d71886..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/rpmgauge.jpg and /dev/null differ
diff --git a/LowEndCluster/rpmgauge.png b/LowEndCluster/rpmgauge.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4b12cbb3f66206f96d5f3d63e307d7af5e99417
Binary files /dev/null and b/LowEndCluster/rpmgauge.png differ
diff --git a/LowEndCluster/seatbelt.jpg b/LowEndCluster/seatbelt.jpg
deleted file mode 100644
index 805d428f7b9f66924daa69202eb7a9230d9323fc..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/seatbelt.jpg and /dev/null differ
diff --git a/LowEndCluster/seatbelt.png b/LowEndCluster/seatbelt.png
new file mode 100644
index 0000000000000000000000000000000000000000..466cd3ed56fff688cda97ba2b8725c3a75eafc77
Binary files /dev/null and b/LowEndCluster/seatbelt.png differ
diff --git a/LowEndCluster/smallring.jpg b/LowEndCluster/smallring.jpg
deleted file mode 100644
index 630d6df8fcd4f308ce992add22f38a98099df018..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/smallring.jpg and /dev/null differ
diff --git a/LowEndCluster/smallring.png b/LowEndCluster/smallring.png
new file mode 100644
index 0000000000000000000000000000000000000000..b559d237edc927fd0a204f7387e88417442985fb
Binary files /dev/null and b/LowEndCluster/smallring.png differ
diff --git a/LowEndCluster/speeedgauge.jpg b/LowEndCluster/speeedgauge.jpg
deleted file mode 100644
index 4ef35f2359f97beb3c916456b9674a2afd7f8cb9..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/speeedgauge.jpg and /dev/null differ
diff --git a/LowEndCluster/speeedgauge.png b/LowEndCluster/speeedgauge.png
new file mode 100644
index 0000000000000000000000000000000000000000..65f62d92cda5d16bd209db7e76d737d97fab3378
Binary files /dev/null and b/LowEndCluster/speeedgauge.png differ
diff --git a/LowEndCluster/temp.jpg b/LowEndCluster/temp.jpg
deleted file mode 100644
index 74b881db9bf4d7f11ca585930b095e546f19592d..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/temp.jpg and /dev/null differ
diff --git a/LowEndCluster/temp.png b/LowEndCluster/temp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d88cbfd8bee8ce3c2d9d4dc4c152857eb5d4c93
Binary files /dev/null and b/LowEndCluster/temp.png differ
diff --git a/LowEndCluster/tempFill.jpg b/LowEndCluster/tempFill.jpg
deleted file mode 100644
index 3bd0ae59146c4e65011ba75b9e04d84bbdc112db..0000000000000000000000000000000000000000
Binary files a/LowEndCluster/tempFill.jpg and /dev/null differ
diff --git a/LowEndCluster/tempFill.png b/LowEndCluster/tempFill.png
new file mode 100644
index 0000000000000000000000000000000000000000..d968fc8f3037b47140fc6062740cefa676866621
Binary files /dev/null and b/LowEndCluster/tempFill.png differ