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

Update kria cluster presentation

Support for changing speed units added. Re-organized for Studio 1.1 API.
Note: 1.1 API not taken into use yet in this commit.
parent d2319ca5
......@@ -17,7 +17,6 @@
<file>presentation/Gaugesvol1/maps/map.jpg</file>
<file>presentation/Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr</file>
<file>presentation/Gaugesvol1/maps/SpeedCenter.jpg</file>
<file>presentation/Gaugesvol1/maps/speedNormal.jpg</file>
<file>presentation/Gaugesvol1/meshes/background.mesh</file>
<file>presentation/Gaugesvol1/meshes/background_0001.mesh</file>
<file>presentation/Gaugesvol1/meshes/centerSpeed.mesh</file>
......@@ -45,11 +44,15 @@
<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>
<file>presentation/Gaugesvol1/maps/gaugespeed_background.jpg</file>
<file>presentation/Gaugesvol1/maps/gaugespeed_kph.png</file>
<file>presentation/Gaugesvol1/maps/gaugespeed_mph.png</file>
<file>presentation/Gaugesvol1/maps/gaugetacho.png</file>
<file>presentation/speedBackground.uip</file>
<file>presentation/tachoBackground.uip</file>
</qresource>
</RCC>
......@@ -24,10 +24,7 @@
<Image id="Glass_specularreflection" />
</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" >
<Image id="Interior_diffusemap" />
<Image id="Interior_normalmap" />
</Material>
<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_normalmap" />
......@@ -77,9 +74,7 @@
<Add ref="#Glass" fresnelPower="10" 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="./Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.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" diffusemap="#Interior_diffusemap" importfile=".\Car\Car.import" normalmap="#Interior_normalmap" />
<Add ref="#Interior_diffusemap" sourcepath="Car/maps/Seats_diffuse.jpg" />
<Add ref="#Interior_normalmap" sourcepath="Car/maps/Seats_normal.jpg" />
<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.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" />
......
......@@ -5,6 +5,8 @@
<presentation id="contentPresentation" src="contentPresentation.uip"/>
<presentation id="digitalSpeed" src="digitalSpeed.uip"/>
<presentation id="digitalTacho" src="digitalTacho.uip"/>
<presentation id="SpeedBackground" src="speedBackground.uip"/>
<presentation id="TachoBackground" src="tachoBackground.uip"/>
<presentation-qml id="navigationStream" args="../qml/Navigation.qml"/>
</assets>
<statemachine ref="#logic">
......
......@@ -32,7 +32,6 @@
<Model id="background" name="background" importid="background" orientation="Right Handed" position="0 1.15119 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\background.mesh#1" >
<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" />
</Material>
</Model>
<Component id="tachoNeedle" >
......@@ -60,7 +59,6 @@
<Model id="background_001" name="background" importid="background_0001" orientation="Right Handed" position="0 1.15119 -0" rotation="0 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Gaugesvol1\meshes\background_0001.mesh#1" >
<Material id="speedmat" name="speedmat" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="speedmat" opacity="100" specularamount="0" >
<Image id="speedmat_diffusemap" />
<Image id="speedmat_normalmap" />
<Image id="speedmat_specularreflection" />
<Image id="speedmat_specularmap" />
</Material>
......@@ -81,8 +79,8 @@
</Model>
</Group>
</Group>
<Light id="Light_002" />
<Image id="Layer_lightprobe" />
<Light id="Light_002" />
</Layer>
<Layer id="Map" >
<Camera id="Camera_002" />
......@@ -132,9 +130,8 @@
<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" 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="#tachomat" bumpamount="1" diffusemap="#tachomat_diffusemap" emissivecolor="0 0 0" fresnelPower="1" importfile=".\Gaugesvol1\Gaugesvol1.import" 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" subpresentation="TachoBackground" />
<Add ref="#tachoNeedle" name="tachoNeedle" endtime="1000" opacity="100" position="0 1 0" >
<AnimationTrack property="opacity" type="EaseInOut" >0 100 0 0</AnimationTrack>
</Add>
......@@ -193,9 +190,8 @@
<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="#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_new.jpg" />
<Add ref="#speedmat_normalmap" sourcepath=".\Gaugesvol1\maps\speedNormal.jpg" />
<Add ref="#speedmat" bumpamount="1" diffusemap="#speedmat_diffusemap" importfile=".\Gaugesvol1\Gaugesvol1.import" shaderlighting="Pixel" specularamount="0.15" specularmap="#speedmat_specularmap" specularreflection="#speedmat_specularreflection" specularroughness="0.001" />
<Add ref="#speedmat_diffusemap" sourcepath="Gaugesvol1/maps/speed_new.jpg" subpresentation="SpeedBackground" />
<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" sourcepath="edge_new_001/meshes/edge_1.mesh" >
......@@ -231,8 +227,8 @@
<AnimationTrack property="positionv" type="EaseInOut" >0 0 0 0</AnimationTrack>
<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="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="#Layer_lightprobe" mappingmode="Light Probe" sourcepath="Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr" />
<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" />
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="3" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1024" presentationHeight="1024" maintainAspect="False" >
<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
</ProjectSettings>
<BufferData >
<ImageBuffer sourcepath="Gaugesvol1/maps/gaugespeed_kph.png" hasTransparency="True" />
<ImageBuffer sourcepath="Gaugesvol1/maps/gaugespeed_mph.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" >
<Layer id="Layer" >
<Camera id="Camera" />
<Model id="speed_mph_new" >
<Material id="Material" >
<Image id="Material_diffusemap" />
</Material>
</Model>
<Model id="speed_new" >
<Material id="Material_001" >
<Image id="Material_001_diffusemap" />
</Material>
</Model>
<Component id="gaugespeed_background" >
<Model id="gaugespeed_background_001" >
<Material id="Material_002" >
<Image id="Material_002_diffusemap" />
</Material>
</Model>
</Component>
</Layer>
</Scene>
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" name="SpeedTextures" />
<Add ref="#Camera" orthographic="True" />
<Add ref="#speed_mph_new" name="speed_mph" opacity="100" scale="10.24 10.24 1" sourcepath="#Rectangle" >
<AnimationTrack property="opacity" type="EaseInOut" >0 100 0 0</AnimationTrack>
</Add>
<Add ref="#Material" diffusemap="#Material_diffusemap" shaderlighting="None" />
<Add ref="#Material_diffusemap" sourcepath="Gaugesvol1/maps/gaugespeed_mph.png" />
<Add ref="#speed_new" name="speed_kph" opacity="100" scale="10.24 10.24 1" sourcepath="#Rectangle" >
<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/gaugespeed_kph.png" />
<Add ref="#gaugespeed_background" name="gaugespeed_background" />
<State id="Scene-Kph" name="Kph" playmode="Stop at end" >
<Set ref="#Layer" endtime="1000" />
<Set ref="#Camera" endtime="1000" />
<Set ref="#speed_mph_new" endtime="1000" opacity="100" >
<AnimationTrack property="opacity" type="EaseInOut" dynamic="True" >0 100 0 0 1 0 0 0</AnimationTrack>
</Set>
<Set ref="#speed_new" endtime="1000" opacity="100" >
<AnimationTrack property="opacity" type="EaseInOut" dynamic="True" >0 0 0 0 1 100 0 0</AnimationTrack>
</Set>
<Set ref="#gaugespeed_background" endtime="1000" />
</State>
<State id="Scene-Mph" name="Mph" initialplaystate="Play" playmode="Stop at end" playthroughto="#Scene-Kph" >
<Set ref="#Layer" endtime="1000" />
<Set ref="#Camera" endtime="1000" />
<Set ref="#speed_mph_new" endtime="1000" opacity="100" >
<AnimationTrack property="opacity" type="EaseInOut" dynamic="True" >0 0 0 0 1 100 0 0</AnimationTrack>
</Set>
<Set ref="#speed_new" endtime="1000" opacity="100" >
<AnimationTrack property="opacity" type="EaseInOut" dynamic="True" >0 100 0 0 1 0 0 0</AnimationTrack>
</Set>
<Set ref="#gaugespeed_background" endtime="1000" />
</State>
</State>
<State name="Master Slide" component="#gaugespeed_background" >
<Add ref="#gaugespeed_background_001" name="gaugespeed_background" endtime="1000" scale="10.24 10.24 1" sourcepath="#Rectangle" />
<Add ref="#Material_002" diffuse="1 1 1" diffusemap="#Material_002_diffusemap" shaderlighting="None" >
<AnimationTrack property="diffuse.x" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#Material_002_diffusemap" sourcepath="Gaugesvol1/maps/gaugespeed_background.jpg" />
<State id="gaugespeed_background-red" name="red" >
<Set ref="#gaugespeed_background_001" endtime="1000" />
<Set ref="#Material_002" diffuse="1 1 1" >
<AnimationTrack property="diffuse.x" type="EaseInOut" dynamic="True" >0 0 0 0 1 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" dynamic="True" >0 0 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" dynamic="True" >0 1 0 0 1 0 0 0</AnimationTrack>
</Set>
</State>
<State id="gaugespeed_background-blue" name="blue" playthroughto="Previous" >
<Set ref="#gaugespeed_background_001" endtime="1000" />
<Set ref="#Material_002" diffuse="1 1 1" >
<AnimationTrack property="diffuse.x" type="EaseInOut" dynamic="True" >0 1 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" dynamic="True" >0 0 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" dynamic="True" >0 0 0 0 1 1 0 0</AnimationTrack>
</Set>
</State>
</State>
</Logic>
</Project>
</UIP>
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="3" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1024" presentationHeight="1024" maintainAspect="False" >
<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
</ProjectSettings>
<BufferData >
<ImageBuffer sourcepath="Gaugesvol1/maps/gaugetacho.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" >
<Layer id="Layer" >
<Camera id="Camera" />
<Model id="speed_mph_new" >
<Material id="Material" >
<Image id="Material_diffusemap" />
</Material>
</Model>
<Component id="gaugespeed_background" >
<Model id="gaugespeed_background_001" >
<Material id="Material_002" >
<Image id="Material_002_diffusemap" />
</Material>
</Model>
</Component>
</Layer>
</Scene>
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" name="TachoTextures" />
<Add ref="#Camera" orthographic="True" />
<Add ref="#speed_mph_new" name="tacho" opacity="100" scale="10.24 10.24 1" sourcepath="#Rectangle" >
<AnimationTrack property="opacity" type="EaseInOut" >0 100 0 0</AnimationTrack>
</Add>
<Add ref="#Material" diffusemap="#Material_diffusemap" shaderlighting="None" />
<Add ref="#Material_diffusemap" sourcepath="Gaugesvol1/maps/gaugetacho.png" />
<Add ref="#gaugespeed_background" name="gaugetacho_background" />
<State id="Scene-Tacho" name="Tacho" playmode="Stop at end" >
<Set ref="#Layer" endtime="1000" />
<Set ref="#Camera" endtime="1000" />
<Set ref="#speed_mph_new" endtime="1000" opacity="100" >
<AnimationTrack property="opacity" type="EaseInOut" dynamic="True" />
</Set>
<Set ref="#gaugespeed_background" endtime="1000" />
</State>
</State>
<State name="Master Slide" component="#gaugespeed_background" >
<Add ref="#gaugespeed_background_001" name="gaugetacho_background" endtime="1000" scale="10.24 10.24 1" sourcepath="#Rectangle" />
<Add ref="#Material_002" diffuse="1 1 1" diffusemap="#Material_002_diffusemap" shaderlighting="None" >
<AnimationTrack property="diffuse.x" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" >0 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" >0 1 0 0</AnimationTrack>
</Add>
<Add ref="#Material_002_diffusemap" sourcepath="Gaugesvol1/maps/gaugespeed_background.jpg" />
<State id="gaugetacho_background-red" name="red" playthroughto="Next" >
<Set ref="#gaugespeed_background_001" endtime="1000" />
<Set ref="#Material_002" diffuse="1 1 1" >
<AnimationTrack property="diffuse.x" type="EaseInOut" dynamic="True" >0 0 0 0 1 1 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" dynamic="True" >0 0 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" dynamic="True" >0 1 0 0 1 0 0 0</AnimationTrack>
</Set>
</State>
<State id="gaugetacho_background-blue" name="blue" playthroughto="Previous" >
<Set ref="#gaugespeed_background_001" endtime="1000" />
<Set ref="#Material_002" diffuse="1 1 1" >
<AnimationTrack property="diffuse.x" type="EaseInOut" dynamic="True" >0 1 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" dynamic="True" >0 0 0 0 1 0 0 0</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" dynamic="True" >0 0 0 0 1 1 0 0</AnimationTrack>
</Set>
</State>
</State>
</Logic>
</Project>
</UIP>
......@@ -55,10 +55,10 @@ ListModel {
name: qsTr("Kph")
itemOpacity: 1.0
}
/* ListElement {
ListElement {
name: qsTr("Mph")
itemOpacity: 1.0
} */
}
ListElement {
name: qsTr("Back")
itemOpacity: 0.5
......
......@@ -134,14 +134,19 @@ Item {
elementPath: "contentPresentation:Scene.Layer.Car.Car.body.lambert2"
}
Element {
SceneElement {
id: speedometerUnit
elementPath: "SpeedBackground:Scene"
}
SceneElement {
id: speedometerColor
elementPath: "Scene.Gauges_Layer.Gauges.Group_Speed.background.speedmat.diffusemap"
elementPath: "SpeedBackground:Scene.SpeedTextures.gaugespeed_background"
}
Element {
id: tachoometerColor
elementPath: "Scene.Gauges_Layer.Gauges.Group_Tacho.background.tachomat.diffusemap"
SceneElement {
id: tachometerColor
elementPath: "TachoBackground:Scene.TachoTextures.gaugetacho_background"
}
SubPresentationSettings {
......@@ -184,17 +189,25 @@ Item {
carBodyMaterial.setAttribute("diffuse.r", 0.855);
carBodyMaterial.setAttribute("diffuse.g", 0.14);
carBodyMaterial.setAttribute("diffuse.b", 0.144);
speedometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/speed_new.jpg");
tachoometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/tacho_new.jpg");
speedometerColor.goToSlide("Scene", "red")
tachometerColor.goToSlide("Scene", "red")
} else {
carBodyMaterial.setAttribute("diffuse.r", 0.08);
carBodyMaterial.setAttribute("diffuse.g", 0.08);
carBodyMaterial.setAttribute("diffuse.b", 1.0);
speedometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/speed_new_blue.jpg");
tachoometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/tacho_new_blue.jpg");
speedometerColor.goToSlide("Scene", "blue")
tachometerColor.goToSlide("Scene", "blue")
}
}
onUseMetricChanged: {
console.log("onUseMetricChanged: " + useMetric);
if (useMetric)
speedometerUnit.goToSlide("Scene", "Kph");
else
speedometerUnit.goToSlide("Scene", "Mph");
}
Keys.onRightPressed: {
menuSelect(true);
}
......
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