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

Signed-off-by: Tomi Korpipaa <tomi.korpipaa@qt.io>

parent 43cf7843
......@@ -14,17 +14,10 @@
<file>presentation/Car/meshes/Wheel_Front_Left.mesh</file>
<file>presentation/Car/meshes/Wheel_Front_Right.mesh</file>
<file>presentation/Car/Car.import</file>
<file>presentation/Gaugesvol1/maps/gauge.psd</file>
<file>presentation/Gaugesvol1/maps/gaugespeed.psd</file>
<file>presentation/Gaugesvol1/maps/Gradient.psd</file>
<file>presentation/Gaugesvol1/maps/map.jpg</file>
<file>presentation/Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr</file>
<file>presentation/Gaugesvol1/maps/speed.jpg</file>
<file>presentation/Gaugesvol1/maps/SpeedCenter.jpg</file>
<file>presentation/Gaugesvol1/maps/speedNormal.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho.jpg</file>
<file>presentation/Gaugesvol1/maps/tachoNormal.jpg</file>
<file>presentation/Gaugesvol1/maps/topEdge_opacity.png</file>
<file>presentation/Gaugesvol1/meshes/background.mesh</file>
<file>presentation/Gaugesvol1/meshes/background_0001.mesh</file>
<file>presentation/Gaugesvol1/meshes/centerSpeed.mesh</file>
......@@ -43,6 +36,20 @@
<file>presentation/digitalTacho.uip</file>
<file>presentation/fonts/TitilliumWeb-Regular.ttf</file>
<file>main.cpp</file>
<file>presentation/effects/VignetteEffect.effect</file>
<file>presentation/center_new8_003/maps/SpeedCenter.jpg</file>
<file>presentation/center_new8_003/meshes/centerTacho.mesh</file>
<file>presentation/center_new8_003/center_new8.import</file>
<file>presentation/edge_new_001/meshes/edge_1.mesh</file>
<file>presentation/edge_new_001/edge_new.import</file>
<file>presentation/Gaugesvol1/maps/carInterior.hdr</file>
<file>presentation/Gaugesvol1/maps/environment.hdr</file>
<file>presentation/Gaugesvol1/maps/environment.jpg</file>
<file>presentation/Gaugesvol1/maps/speed_new.jpg</file>
<file>presentation/Gaugesvol1/maps/speed_new_blue.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho_new.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho_new_blue.jpg</file>
<file>presentation/Tachoneedle_001/meshes/tachoNeedle.mesh</file>
<file>presentation/Tachoneedle_001/Tachoneedle.import</file>
<file>presentation/VignetteEffect.effect</file>
</qresource>
</RCC>
This image diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="tachoNeedle" name="tachoNeedle" orientation="Right Handed" position="-12 0 -1.15119" rotation="90 9.54166e-15 137.683" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\tachoNeedle.mesh#1" >
<Material id="Needle" name="Needle" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\Tachoneedle.fbx" ImageDir="Images" MeshDir="Meshes" >
<Mesh >
<Source >tachoNeedle</Source>
<Dest >meshes\tachoNeedle.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="centerTacho" name="centerTacho" orientation="Right Handed" position="-12 6.12323e-17 -1" rotation="90 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\centerTacho.mesh#1" >
<Material id="DarkBase" name="DarkBase" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
<Material id="GaugeCenterContent" name="GaugeCenterContent" blendmode="Normal" diffuse="1 1 1" diffusemap="GaugeCenterContent_diffusemap" emissivepower="0" opacity="100" specularamount="0" >
<Image id="GaugeCenterContent_diffusemap" name="GaugeCenterContent_diffusemap" sourcepath="maps\SpeedCenter.jpg" />
</Material>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\center_new8.1.fbx" ImageDir="Images" MeshDir="Meshes" >
<Image >
<Source >center_new8.1.fbm\SpeedCenter.jpg</Source>
<Dest >maps\SpeedCenter.jpg</Dest>
</Image>
<Mesh >
<Source >centerTacho</Source>
<Dest >meshes\centerTacho.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
......@@ -22,13 +22,14 @@
</Material>
<Material id="Glass" name="Glass" blendmode="Normal" diffuse="0.424168 0.530641 0.64" emissivepower="0" importid="Glass" opacity="100" specularamount="0" specularroughness="9.60784" >
<Image id="Glass_specularreflection" />
<Image id="Glass_iblprobe" />
</Material>
<Material id="CarBottom" name="CarBottom" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" importid="CarBottom" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Interior" name="Interior" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" importid="Interior" opacity="100" specularamount="0" specularroughness="9.60784" />
<Model id="body" name="body" importid="body" orientation="Right Handed" position="0 0 -0" rotation="1.51661e-21 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Car\meshes\body.mesh#2" >
<Material id="lambert2" name="lambert2" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="lambert2" opacity="100" specularamount="0" >
<Image id="lambert2_specularreflection" />
<Image id="lambert2_normalmap" />
<Image id="lambert2_specularreflection" />
</Material>
</Model>
<Model id="Wheel_Back_Left" name="Wheel_Back_Left" importid="Wheel_Back_Left" orientation="Right Handed" position="86.6948 114.27 -34.7378" rotation="90 -1.34352e-13 180" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\Car\meshes\Wheel_Back_Left.mesh#2" >
......@@ -59,6 +60,9 @@
<Add ref="#Light" rotation="39 0 0" />
<Add ref="#Car" name="Car" importfile=".\Car\Car.import" position="0 -24.7187 194" rotation="0 40 0" sourcepath=".\Car\Car.import" />
<Add ref="#Car_001" importfile=".\Car\Car.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0 100 100 2.971 -0.586441 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 0 100 100 2.971 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 3 100 100 2.971 -4.86288 100 100 8 3 100 100</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 -90 0 0 8 -90 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 -0 0 0 8 360 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
......@@ -68,14 +72,15 @@
<Add ref="#Seats" diffuse="1 1 1" diffusemap="#Seats_diffusemap" importfile=".\Car\Car.import" normalmap="#Seats_normalmap" />
<Add ref="#Seats_diffusemap" sourcepath=".\Car\maps\Seats_diffuse.jpg" />
<Add ref="#Seats_normalmap" sourcepath=".\Car\maps\Seats_normal.jpg" />
<Add ref="#Glass" importfile=".\Car\Car.import" opacity="57.9439" specularamount="3" specularreflection="#Glass_specularreflection" specularroughness="0.28775" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Glass" fresnelPower="10" iblprobe="#Glass_iblprobe" importfile=".\Car\Car.import" opacity="59.2593" specularamount="5" specularreflection="#Glass_specularreflection" specularroughness="0.58375" speculartint="0.388235 0.388235 0.388235" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Glass_iblprobe" mappingmode="IBL Override" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/maps/OpenfootageNet_LADEFENSE-512.hdr" />
<Add ref="#CarBottom" diffuse="0.101961 0.101961 0.101961" importfile=".\Car\Car.import" shaderlighting="None" />
<Add ref="#Interior" diffuse="0.0901961 0.0901961 0.0901961" importfile=".\Car\Car.import" />
<Add ref="#body" importfile=".\Car\Car.import" />
<Add ref="#lambert2" bumpamount="1" diffuse="0.776471 0 0" importfile=".\Car\Car.import" normalmap="#lambert2_normalmap" opacity="100" specularreflection="#lambert2_specularreflection" />
<Add ref="#lambert2_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#lambert2" bumpamount="1" diffuse="0.870588 0 0" fresnelPower="5" importfile=".\Car\Car.import" normalmap="#lambert2_normalmap" opacity="100" specularamount="2" specularmodel="Default" specularreflection="#lambert2_specularreflection" specularroughness="0.001" speculartint="0.298039 0.298039 0.298039" />
<Add ref="#lambert2_normalmap" sourcepath=".\Car\maps\outUV_normals.png" />
<Add ref="#lambert2_specularreflection" mappingmode="Environmental Mapping" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/maps/OpenfootageNet_LADEFENSE-1024.hdr" />
<Add ref="#Wheel_Back_Left" importfile=".\Car\Car.import" scale="90 38.141 38.141" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 720 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 -0 0 0</AnimationTrack>
......@@ -90,17 +95,17 @@
<Add ref="#Wheel" bumpamount="1" diffuse="0.164706 0.164706 0.164706" importfile=".\Car\Car.import" normalmap="#Wheel_normalmap" specularamount="5" specularmap="#Wheel_specularmap" specularreflection="#Wheel_specularreflection" specularroughness="0.001" />
<Add ref="#Wheel_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Wheel_specularmap" sourcepath=".\Car\maps\Wheel_specular.jpg" />
<Add ref="#Wheel_normalmap" sourcepath="Car/maps/Wheel_normal.jpg" />
<Add ref="#Wheel_normalmap" sourcepath="C:/dev/QWS17_Cluster/QWS17_Cluster/3DStudioProject/Car/maps/Wheel_normal.jpg" />
<Add ref="#Wheel_Front_Left" importfile=".\Car\Car.import" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 720 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 -0 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 180 0 0 8 180 0 0</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 820 100 100 4 0 100 100 8 820 100 100</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 4 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 190 100 100 4 190 100 100 8 190 100 100</AnimationTrack>
</Add>
<Add ref="#Wheel_002" name="Wheel" referencedmaterial="#Wheel" />
<Add ref="#Wheel_Front_Right" importfile=".\Car\Car.import" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 0 0 0 8 720 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 8 720 100 100</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 8 30 100 100</AnimationTrack>
</Add>
<Add ref="#Wheel_003" name="Wheel" referencedmaterial="#Wheel" />
<State id="Scene-carRotate" name="carRotate" playmode="Looping" >
......
......@@ -18,7 +18,7 @@
<Add ref="#Layer" />
<Add ref="#Camera" orthographic="True" />
<State id="Scene-Slide1" name="Slide1" >
<Add ref="#speed" name="speed" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0" />
<Add ref="#speed" name="speed" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0" />
<Add ref="#kmh" name="kmh" font="TitilliumWeb-Regular" position="0 -40 0" size="20" textstring="kph" />
</State>
</State>
......
......@@ -19,7 +19,7 @@
<Add ref="#Camera" orthographic="True" />
<State id="Scene-Slide1" name="Slide1" >
<Add ref="#rpm" name="rpm" font="TitilliumWeb-Regular" position="0 -40 0" rotation="0 0 0" size="20" textstring="rpm x 1000" />
<Add ref="#tacho" name="tacho" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0.0" />
<Add ref="#tacho" name="tacho" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0.0" />
</State>
</State>
</Logic>
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="edge_1" name="edge_1" orientation="Right Handed" position="-12 7.04898e-17 -1.15119" rotation="90 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\edge_1.mesh#1" >
<Material id="lambert8" name="lambert8" blendmode="Normal" diffuse="1 1 1" diffusemap="lambert8_diffusemap" emissivepower="0" opacity="100" specularamount="0" >
<Image id="lambert8_diffusemap" name="lambert8_diffusemap" sourcepath="maps\Gradient.psd" />
</Material>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\edge_new.fbx" ImageDir="Images" MeshDir="Meshes" >
<Image >
<Source >edge_new.fbm\Gradient.psd</Source>
<Dest >maps\Gradient.psd</Dest>
</Image>
<Mesh >
<Source >edge_1</Source>
<Dest >meshes\edge_1.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
<?xml version="1.0" encoding="UTF-8" ?>
<application xmlns="http://qt.io/qt3dstudio/uia">
<application>
<assets initial="mainPresentation">
<presentation id="mainPresentation" src="mainPresentation.uip"/>
<presentation id="contentPresentation" src="contentPresentation.uip"/>
<presentation id="digitalSpeed" src="digitalSpeed.uip"/>
<presentation id="digitalTacho" src="digitalTacho.uip"/>
<presentation-qml id="navigationStream"/>
</assets>
<statemachine ref="#logic">
<visual-states>
......
......@@ -8,7 +8,7 @@
<ImageBuffer sourcepath="maps/line.png" hasTransparency="True" />
</BufferData>
<Classes >
<Effect id="VignetteEffect" name="VignetteEffect" sourcepath="effects\VignetteEffect.effect" />
<Effect id="VignetteEffect" name="VignetteEffect" sourcepath=".\VignetteEffect.effect" />
</Classes>
<Graph >
<Scene id="Scene" backgroundcolor="0 0 0" >
......@@ -33,8 +33,6 @@
<Material id="tachomat" name="tachomat" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="tachomat" opacity="100" specularamount="0" >
<Image id="tachomat_diffusemap" />
<Image id="tachomat_normalmap" />
<Image id="tachomat_specularreflection" />
<Image id="tachomat_specularmap" />
</Material>
</Model>
<Component id="tachoNeedle" >
......@@ -43,15 +41,18 @@
</Model>
</Component>
<Model id="centerTacho" name="centerTacho" importid="centerTacho" orientation="Right Handed" position="0 1 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\centerTacho.mesh#1" >
<Material id="DarkBase" name="DarkBase" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="DarkBase" opacity="100" specularamount="0" />
<Material id="DarkBase" name="DarkBase" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="DarkBase" opacity="100" specularamount="0" >
<Image id="DarkBase_iblprobe" />
<Image id="DarkBase_specularreflection" />
</Material>
<Material id="GaugeCenterContent" name="GaugeCenterContent" blendmode="Normal" diffuse="1 1 1" diffusemap="#GaugeCenterContent_diffusemap" emissivepower="0" importid="GaugeCenterContent" opacity="100" specularamount="0" >
<Image id="GaugeCenterContent_diffusemap" name="GaugeCenterContent_diffusemap" importid="GaugeCenterContent_diffusemap" sourcepath=".\Gaugesvol1\maps\SpeedCenter.jpg" />
</Material>
</Model>
<Model id="edge" name="edge" importid="edge" orientation="Right Handed" position="0 1.15119 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\edge.mesh#1" >
<Material id="lambert8" >
<Material id="lambert8" name="lambert8" >
<Image id="lambert8_specularreflection" />
<Image id="lambert8_specularmap" />
<Image id="lambert8_iblprobe" />
</Material>
</Model>
</Group>
......@@ -65,15 +66,15 @@
</Material>
</Model>
<Model id="edge_001" name="edge" importid="edge_0001" orientation="Right Handed" position="0 1.15119 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\edge_0001.mesh#1" >
<ReferencedMaterial id="lambert8_001" referencedmaterial="#lambert8" />
<ReferencedMaterial id="lambert8_001" name="lambert8" referencedmaterial="#lambert8" />
</Model>
<Component id="speedNeedle" >
<Model id="speedNeedle_001" name="speedNeedle" importid="speedNeedle" orientation="Right Handed" position="0 1.15119 -0" rotation="180 42.3171 180" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\speedNeedle.mesh#1" >
<ReferencedMaterial id="Needle_001" />
<ReferencedMaterial id="Needle_001" name="Needle" />
</Model>
</Component>
<Model id="centerSpeed" name="centerSpeed" importid="centerSpeed" orientation="Right Handed" position="0 1 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\centerSpeed.mesh#1" >
<ReferencedMaterial id="DarkBase_001" />
<ReferencedMaterial id="DarkBase_001" name="DarkBase" />
<Material id="GaugeCenterContent_001" name="GaugeCenterContent" blendmode="Normal" diffuse="1 1 1" diffusemap="#GaugeCenterContent_001_diffusemap" emissivepower="0" importid="GaugeCenterContent_0001" opacity="100" specularamount="0" >
<Image id="GaugeCenterContent_001_diffusemap" name="GaugeCenterContent_0001_diffusemap" importid="GaugeCenterContent_0001_diffusemap" sourcepath=".\Gaugesvol1\maps\SpeedCenter.jpg" />
</Material>
......@@ -131,15 +132,13 @@
<AnimationTrack property="scale.y" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#tachomat" bumpamount="1" diffusemap="#tachomat_diffusemap" importfile=".\Gaugesvol1\Gaugesvol1.import" normalmap="#tachomat_normalmap" shaderlighting="Pixel" specularamount="0.15" specularmap="#tachomat_specularmap" specularreflection="#tachomat_specularreflection" specularroughness="0.001" />
<Add ref="#tachomat_diffusemap" sourcepath=".\Gaugesvol1\maps\tacho.jpg" />
<Add ref="#tachomat_normalmap" sourcepath=".\Gaugesvol1\maps\tachoNormal.jpg" />
<Add ref="#tachomat_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#tachomat_specularmap" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#tachomat" bumpamount="1" diffusemap="#tachomat_diffusemap" emissivecolor="0 0 0" fresnelPower="1" importfile=".\Gaugesvol1\Gaugesvol1.import" normalmap="#tachomat_normalmap" shaderlighting="Pixel" specularamount="0.2" specularmodel="Default" specularroughness="0.001" speculartint="0.0627451 0.0627451 0.0627451" />
<Add ref="#tachomat_diffusemap" sourcepath="Gaugesvol1/maps/tacho_new.jpg" />
<Add ref="#tachomat_normalmap" sourcepath="Gaugesvol1/maps/speedNormal.jpg" />
<Add ref="#tachoNeedle" name="tachoNeedle" endtime="1000" opacity="100" position="0 1 0" >
<AnimationTrack property="opacity" type="EaseInOut" >0 100 0 0</AnimationTrack>
</Add>
<Add ref="#centerTacho" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1 -0" rotation="0 -0 0" >
<Add ref="#centerTacho" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1 -0" rotation="0 -0 0" sourcepath="center_new8_003/meshes/centerTacho.mesh" >
<AnimationTrack property="position.x" type="EaseInOut" />
<AnimationTrack property="position.y" type="EaseInOut" />
<AnimationTrack property="position.z" type="EaseInOut" />
......@@ -147,17 +146,19 @@
<AnimationTrack property="rotation.y" type="EaseInOut" />
<AnimationTrack property="rotation.z" type="EaseInOut" />
</Add>
<Add ref="#DarkBase" diffuse="0.0509804 0.0509804 0.0509804" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="0" shaderlighting="Pixel" specularamount="3" specularroughness="0.113037" speculartint="0.105882 0.105882 0.105882" >
<AnimationTrack property="opacity" type="EaseInOut" >0.5 100 0 0 1 0 0 0</AnimationTrack>
<Add ref="#DarkBase" blendmode="Normal" bumpamount="0" diffuse="0.203922 0.203922 0.223529" emissivecolor="0 0 0" fresnelPower="1" iblprobe="#DarkBase_iblprobe" importfile=".\Gaugesvol1\Gaugesvol1.import" ior="0.157407" opacity="0" shaderlighting="Pixel" specularamount="3" specularmodel="Default" specularreflection="#DarkBase_specularreflection" specularroughness="0.0935" speculartint="0.160784 0.160784 0.215686" >
<AnimationTrack property="opacity" type="EaseInOut" >0.5 100 0 0 1 100 100 100</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0.52 3 0 0</AnimationTrack>
</Add>
<Add ref="#DarkBase_iblprobe" mappingmode="UV Mapping" sourcepath="Gaugesvol1/maps/carInterior.hdr" />
<Add ref="#DarkBase_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gaugesvol1/maps/environment.hdr" />
<Add ref="#GaugeCenterContent" importfile=".\Gaugesvol1\Gaugesvol1.import" shaderlighting="None" />
<Add ref="#GaugeCenterContent_diffusemap" importfile=".\Gaugesvol1\Gaugesvol1.import" positionu="0" positionv="0" rotationuv="0" subpresentation="digitalTacho" >
<AnimationTrack property="positionu" type="EaseInOut" >0 0 0 0</AnimationTrack>
<AnimationTrack property="positionv" type="EaseInOut" >0 0 0 0</AnimationTrack>
<AnimationTrack property="rotationuv" type="EaseInOut" >0 0 0 0</AnimationTrack>
</Add>
<Add ref="#edge" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" >
<Add ref="#edge" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="98" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" sourcepath="edge_new_001/meshes/edge_1.mesh" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0 0 0</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 1.15119 0 0</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -0 0 0</AnimationTrack>
......@@ -168,13 +169,13 @@
<AnimationTrack property="scale.y" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#lambert8" name="lambert8" diffuse="0.0392157 0.0392157 0.0392157" opacity="100" specularamount="0.5" specularmap="#lambert8_specularmap" specularreflection="#lambert8_specularreflection" >
<Add ref="#lambert8" name="lambert8" diffuse="0.0392157 0.0392157 0.0392157" emissivecolor="0 0 0" iblprobe="#lambert8_iblprobe" opacity="100" specularamount="1" specularmodel="Default" specularreflection="#lambert8_specularreflection" specularroughness="0.0195" speculartint="0.0784314 0.0784314 0.0901961" >
<AnimationTrack property="diffuse.x" type="EaseInOut" >0 0.0392157 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" >0 0.0392157 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" >0 0.0392157 0 0</AnimationTrack>
</Add>
<Add ref="#lambert8_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#lambert8_specularmap" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#lambert8_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gaugesvol1/maps/environment.jpg" />
<Add ref="#lambert8_iblprobe" mappingmode="IBL Override" sourcepath="Gaugesvol1/maps/environment.hdr" />
<Add ref="#Group_Speed" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="15 0 0" rotation="90 -23 0" >
<AnimationTrack property="position.x" type="EaseInOut" >0 15 0 0</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 0 0 0</AnimationTrack>
......@@ -193,11 +194,11 @@
<AnimationTrack property="scale.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#speedmat" bumpamount="1" diffusemap="#speedmat_diffusemap" importfile=".\Gaugesvol1\Gaugesvol1.import" normalmap="#speedmat_normalmap" shaderlighting="Pixel" specularamount="0.15" specularmap="#speedmat_specularmap" specularreflection="#speedmat_specularreflection" specularroughness="0.001" />
<Add ref="#speedmat_diffusemap" sourcepath=".\Gaugesvol1\maps\speed.jpg" />
<Add ref="#speedmat_diffusemap" sourcepath="Gaugesvol1/maps/speed_new.jpg" />
<Add ref="#speedmat_normalmap" sourcepath=".\Gaugesvol1\maps\speedNormal.jpg" />
<Add ref="#speedmat_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#speedmat_specularmap" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#edge_001" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" >
<Add ref="#edge_001" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" sourcepath="edge_new_001/meshes/edge_1.mesh" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0 0 0</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 1.15119 0 0</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -0 0 0</AnimationTrack>
......@@ -215,7 +216,7 @@
<AnimationTrack property="scale.y" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#centerSpeed" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" position="0 1 -0" rotation="0 -0 0" >
<Add ref="#centerSpeed" endtime="1000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="100" position="0 1 -0" rotation="0 -0 0" sourcepath="center_new8_003/meshes/centerTacho.mesh" >
<AnimationTrack property="position.x" type="EaseInOut" />
<AnimationTrack property="position.y" type="EaseInOut" />
<AnimationTrack property="position.z" type="EaseInOut" />
......@@ -231,7 +232,7 @@
<AnimationTrack property="rotationuv" type="EaseInOut" >0 0 0 0</AnimationTrack>
</Add>
<Add ref="#Layer_lightprobe" mappingmode="Light Probe" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Light_002" name="Light" brightness="785" castshadow="True" endtime="1000" expfade="0" lightspecular="0.509804 0.509804 0.509804" lighttype="Point" linearfade="0" position="0 48 -110" scale="4 1 1" shdwbias="0.0243902" shdwfactor="100" shdwfilter="7.43902" shdwmapfar="1497" shdwmapres="9" />
<Add ref="#Light_002" name="Light" brightness="250" castshadow="True" endtime="1000" expfade="0" lightambient="0.427451 0.427451 0.427451" lightdiffuse="0.901961 0.901961 0.901961" lightspecular="0.113725 0.109804 0.14902" lighttype="Point" linearfade="9.25926" position="0 48 -110" scale="4 1 1" shdwbias="0.032" shdwfactor="79.8333" shdwfilter="4.66667" shdwmapfar="1500" shdwmapres="10" />
<Add ref="#Map" name="Content_Layer" height="70" left="15" top="17" width="72" />
<Add ref="#Camera_002" orthographic="True" />
<Add ref="#Car" name="Car" />
......@@ -239,7 +240,7 @@
<AnimationTrack property="opacity" type="EaseInOut" >0 100 0 0</AnimationTrack>
</Add>
<Add ref="#Material_001" diffusemap="#Material_001_diffusemap" shaderlighting="None" />
<Add ref="#Material_001_diffusemap" sourcepath=".\Gaugesvol1\maps\map.jpg" subpresentation="navigationStream" />
<Add ref="#Material_001_diffusemap" sourcepath=".\Gaugesvol1\maps\map.jpg" />
<Add ref="#VignetteEffect_001" name="VignetteEffect" vig_color="0 0 0" vig_radius="1.01626" vig_strenght="15" />
<State id="Scene-2D" name="2D" playmode="Play Through To..." >
<Set ref="#2DLayer" endtime="1000" />
......@@ -267,7 +268,7 @@
</Set>
<Set ref="#centerTacho" endtime="1000" />
<Set ref="#DarkBase" opacity="100" specularamount="3" >
<AnimationTrack property="specularamount" type="EaseInOut" >0.52 0 0 0</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0 5 100 100 0.52 5 100 100</AnimationTrack>
</Set>
<Set ref="#GaugeCenterContent_diffusemap" positionu="0" positionv="0" rotationuv="0" />
<Set ref="#edge" endtime="1000" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" >
......@@ -361,7 +362,7 @@
</Set>
<Set ref="#centerTacho" endtime="2000" />
<Set ref="#DarkBase" opacity="100" specularamount="3" >
<AnimationTrack property="specularamount" type="EaseInOut" >0.52 0 0 0 2 3 0 0</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0 5 100 100 0.388 5 100 100 2 5 100 100</AnimationTrack>
</Set>
<Set ref="#GaugeCenterContent_diffusemap" positionu="0" positionv="0" rotationuv="0" />
<Set ref="#edge" endtime="2000" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" >
......@@ -455,7 +456,7 @@
</Set>
<Set ref="#centerTacho" endtime="2000" />
<Set ref="#DarkBase" opacity="100" specularamount="3" >
<AnimationTrack property="specularamount" type="EaseInOut" >0.52 3 0 0</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0 5 100 100 0.52 5 100 100</AnimationTrack>
</Set>
<Set ref="#GaugeCenterContent_diffusemap" positionu="0" positionv="0" rotationuv="0" >
<AnimationTrack property="positionu" type="EaseInOut" >0 0 0 0</AnimationTrack>
......@@ -556,7 +557,7 @@
</Set>
<Set ref="#centerTacho" endtime="1000" />
<Set ref="#DarkBase" opacity="100" specularamount="3" >
<AnimationTrack property="specularamount" type="EaseInOut" >0 3 0 0 0.68 0 0 0</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0 5 100 100 0.226 2.00294 100 100 0.68 0 0 0</AnimationTrack>
</Set>
<Set ref="#GaugeCenterContent_diffusemap" positionu="0" positionv="0" rotationuv="0" />
<Set ref="#edge" endtime="1000" position="0 1.15119 -0" rotation="0 -0 0" scale="1 1 1" >
......@@ -744,7 +745,7 @@
</Set>
<Set ref="#centerTacho" endtime="1000" />
<Set ref="#DarkBase" opacity="100" specularamount="3" >
<AnimationTrack property="specularamount" type="EaseInOut" >0.5 0 0 0 0.52 0 0 0 1 3 0 0</AnimationTrack>
<AnimationTrack property="specularamount" type="EaseInOut" >0.5 0 0 0 0.52 0 0 0 1 5 100 100</AnimationTrack>
</Set>
<Set ref="#GaugeCenterContent_diffusemap" positionu="0" positionv="0" rotationuv="0" >
<AnimationTrack property="positionu" type="EaseInOut" >0 0 0 0</AnimationTrack>
......@@ -818,7 +819,7 @@
</State>
</State>
<State name="Master Slide" component="#tachoNeedle" >
<Add ref="#tachoNeedle_001" endtime="2000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="100" rotation="180 41.317 180" scale="1 1 1" >
<Add ref="#tachoNeedle_001" endtime="2000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="100" rotation="180 41.317 180" scale="1 1 1" sourcepath="Tachoneedle_001/meshes/tachoNeedle.mesh" >
<AnimationTrack property="opacity" type="EaseInOut" />
<AnimationTrack property="rotation.x" type="EaseInOut" >0 180 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 41.317 0 0</AnimationTrack>
......@@ -827,7 +828,7 @@
<AnimationTrack property="scale.y" type="EaseInOut" />
<AnimationTrack property="scale.z" type="EaseInOut" />
</Add>
<Add ref="#Needle" diffuse="1 0 0" fresnelPower="-5" importfile=".\Gaugesvol1\Gaugesvol1.import" shaderlighting="Pixel" specularamount="1" specularroughness="0.234411" />
<Add ref="#Needle" diffuse="0.607843 0.396078 0" emissivecolor="0 0 0" fresnelPower="0" importfile=".\Gaugesvol1\Gaugesvol1.import" ior="0.361111" shaderlighting="Pixel" specularamount="0.6" specularmodel="Default" specularroughness="0.001" speculartint="0.341176 0.239216 0.0235294" />
<State id="tachoNeedle-Slide1" name="Slide1" initialplaystate="Pause" playmode="PingPong" >
<Set ref="#tachoNeedle_001" rotation="180 41.317 180" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 169 0 0 10 169 0 0</AnimationTrack>
......@@ -837,7 +838,7 @@
</State>
</State>
<State name="Master Slide" component="#speedNeedle" >
<Add ref="#speedNeedle_001" endtime="2000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="100" rotation="180 42.3171 180" scale="1 1 1" >
<Add ref="#speedNeedle_001" endtime="2000" importfile=".\Gaugesvol1\Gaugesvol1.import" opacity="100" rotation="180 42.3171 180" scale="1 1 1" sourcepath="Tachoneedle_001/meshes/tachoNeedle.mesh" >
<AnimationTrack property="opacity" type="EaseInOut" />
<AnimationTrack property="rotation.x" type="EaseInOut" >0 180 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 42.3171 0 0</AnimationTrack>
......
......@@ -222,52 +222,52 @@ SettingsContainerForm {
}
Component {
id: settingsListDelegate
Item {
width: listview.width
height: 100
Text {
id: itemText
text: name
visible: name !== qsTr("Back")
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Image {
id: backIcon
source: menuBackSrc
visible: name === qsTr("Back")
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
id: checkMark
text: "\u2713"
visible: getCheckVisibility(itemText.text)
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.right: itemText.left
anchors.rightMargin: 20
}
MouseArea {
anchors.fill: parent
onClicked: {
if (selectedMenuIndex !== index) {
selectedMenuIndex = index;
highlightTimer.start();
} else {
selectedMenuIndex = index;
handleMenu();
}
}
}
}
id: settingsListDelegate
Item {
width: listview.width
height: 100
Text {
id: itemText
text: name
visible: name !== qsTr("Back")
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Image {
id: backIcon
source: menuBackSrc
visible: name === qsTr("Back")
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
id: checkMark
text: "\u2713"
visible: getCheckVisibility(itemText.text)
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.right: itemText.left
anchors.rightMargin: 20
}
MouseArea {
anchors.fill: parent
onClicked: {
if (selectedMenuIndex !== index) {
selectedMenuIndex = index;
highlightTimer.start();
} else {