Commit 6b916b79 authored by Tomi Korpipää's avatar Tomi Korpipää

Fix kria presentation structure

parent 6597e7a2
......@@ -2,43 +2,43 @@
<qresource prefix="/">
<file alias="main.qml">qml/main.qml</file>
<file alias="SimuData.qml">qml/SimuData.qml</file>
<file>presentation/Car/maps/outUV_normals.png</file>
<file>presentation/Car/maps/Seats_diffuse.jpg</file>
<file>presentation/Car/maps/Seats_normal.jpg</file>
<file>presentation/Car/maps/Wheel_normal.jpg</file>
<file>presentation/Car/maps/Wheel_specular.jpg</file>
<file>presentation/Car/meshes/body.mesh</file>
<file>presentation/Car/meshes/Car.mesh</file>
<file>presentation/Car/meshes/Wheel_Back_Left.mesh</file>
<file>presentation/Car/meshes/Wheel_Back_Right.mesh</file>
<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/contentPresentation.uip</file>
<file>presentation/mainPresentation.uia</file>
<file>presentation/mainPresentation.uip</file>
<file>qml/fonts/TitilliumWeb-SemiBold.ttf</file>
<file>presentation/digitalSpeed.uip</file>
<file>presentation/digitalTacho.uip</file>
<file>presentation/fonts/TitilliumWeb-Regular.ttf</file>
<file>main.cpp</file>
<file>presentation/VignetteEffect.effect</file>
<file>presentation/speedBackground.uip</file>
<file>presentation/tachoBackground.uip</file>
<file>presentation/GaugeCenter/meshes/centerTacho.mesh</file>
<file>presentation/Gauges/maps/environment.jpg</file>
<file>presentation/Gauges/maps/gaugespeed_background.jpg</file>
<file>presentation/Gauges/maps/gaugespeed_kph.png</file>
<file>presentation/Gauges/maps/gaugespeed_mph.png</file>
<file>presentation/Gauges/maps/gaugetacho.png</file>
<file>presentation/Gauges/maps/map.jpg</file>
<file>presentation/Gauges/maps/SpeedCenter.jpg</file>
<file>presentation/Gauges/meshes/background.mesh</file>
<file>presentation/Gauges/meshes/edge.mesh</file>
<file>presentation/Needle/meshes/tachoNeedle.mesh</file>
<file>presentation/GaugeCenter/gaugecenter.import</file>
<file>presentation/Gauges/Gauges.import</file>
<file>presentation/Needle/needle.import</file>
<file alias="FpsDisplay.qml">qml/FpsDisplay.qml</file>
<file>presentation/effects/VignetteEffect.effect</file>
<file>presentation/meshes/Car/maps/outUV_normals.png</file>
<file>presentation/meshes/Car/maps/Seats_diffuse.jpg</file>
<file>presentation/meshes/Car/maps/Seats_normal.jpg</file>
<file>presentation/meshes/Car/maps/Wheel_normal.jpg</file>
<file>presentation/meshes/Car/maps/Wheel_specular.jpg</file>
<file>presentation/meshes/Car/meshes/body.mesh</file>
<file>presentation/meshes/Car/meshes/Car.mesh</file>
<file>presentation/meshes/Car/meshes/Wheel_Back_Left.mesh</file>
<file>presentation/meshes/Car/meshes/Wheel_Back_Right.mesh</file>
<file>presentation/meshes/Car/meshes/Wheel_Front_Left.mesh</file>
<file>presentation/meshes/Car/meshes/Wheel_Front_Right.mesh</file>
<file>presentation/meshes/Car/Car.import</file>
<file>presentation/meshes/GaugeCenter/meshes/centerTacho.mesh</file>
<file>presentation/meshes/GaugeCenter/gaugecenter.import</file>
<file>presentation/meshes/Gauges/maps/environment.jpg</file>
<file>presentation/meshes/Gauges/maps/gaugespeed_background.jpg</file>
<file>presentation/meshes/Gauges/maps/gaugespeed_kph.png</file>
<file>presentation/meshes/Gauges/maps/gaugespeed_mph.png</file>
<file>presentation/meshes/Gauges/maps/gaugetacho.png</file>
<file>presentation/meshes/Gauges/maps/map.jpg</file>
<file>presentation/meshes/Gauges/maps/SpeedCenter.jpg</file>
<file>presentation/meshes/Gauges/meshes/background.mesh</file>
<file>presentation/meshes/Gauges/meshes/edge.mesh</file>
<file>presentation/meshes/Gauges/Gauges.import</file>
<file>presentation/meshes/Needle/meshes/tachoNeedle.mesh</file>
<file>presentation/meshes/Needle/needle.import</file>
<file>presentation/presentations/contentPresentation.uip</file>
<file>presentation/presentations/digitalSpeed.uip</file>
<file>presentation/presentations/digitalTacho.uip</file>
<file>presentation/presentations/mainPresentation.uip</file>
<file>presentation/presentations/speedBackground.uip</file>
<file>presentation/presentations/tachoBackground.uip</file>
</qresource>
</RCC>
......@@ -10,12 +10,12 @@
<dataInput name="speedText" type="String"/>
<dataInput name="tachoText" type="String"/>
<dataInput name="displayColor" type="Vector3"/>
<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 id="SpeedBackground" src="speedBackground.uip"/>
<presentation id="TachoBackground" src="tachoBackground.uip"/>
<presentation id="mainPresentation" src="presentations/mainPresentation.uip"/>
<presentation id="contentPresentation" src="presentations/contentPresentation.uip"/>
<presentation id="digitalSpeed" src="presentations/digitalSpeed.uip"/>
<presentation id="digitalTacho" src="presentations/digitalTacho.uip"/>
<presentation id="SpeedBackground" src="presentations/speedBackground.uip"/>
<presentation id="TachoBackground" src="presentations/tachoBackground.uip"/>
<presentation-qml id="navigationStream" args="../qml/Navigation.qml"/>
</assets>
<statemachine ref="#logic">
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="4" >
<UIP version="5" >
<Project >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" preferKtx="False" >
<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
</ProjectSettings>
<Graph >
<Scene id="Scene" >
<Layer id="Layer" >
<Layer id="Layer" variants="" >
<Camera id="Camera" />
<Text id="speed" controlledproperty="speedText textstring" />
<Text id="kmh" controlledproperty="speedUnitSlide textstring" />
......@@ -15,7 +15,7 @@
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" background="SolidColor" />
<Add ref="#Layer" background="SolidColor" disabledepthprepass="True" disabledepthtest="True" />
<Add ref="#Camera" orthographic="True" />
<State id="Scene-Slide1" name="Slide1" >
<Add ref="#speed" name="speed" controlledproperty="$speedText textstring" font="TitilliumWeb-Regular" position="0 40 0" size="90" textstring="0" />
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="4" >
<UIP version="5" >
<Project >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" preferKtx="False" >
<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
</ProjectSettings>
<Graph >
<Scene id="Scene" >
<Layer id="Layer" >
<Layer id="Layer" variants="" >
<Camera id="Camera" />
<Text id="rpm" />
<Text id="tacho" controlledproperty="tachoText textstring" />
......@@ -15,7 +15,7 @@
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" background="SolidColor" />
<Add ref="#Layer" background="SolidColor" disabledepthprepass="True" disabledepthtest="True" />
<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="30" textstring="rpm x 1000" />
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="4" >
<UIP version="5" >
<Project >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="True" >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="True" preferKtx="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="Gauges/maps/gaugespeed_kph.png" hasTransparency="True" />
<ImageBuffer sourcepath="Gauges/maps/gaugespeed_mph.png" hasTransparency="True" />
<ImageBuffer sourcepath="../meshes/Gauges/maps/gaugespeed_kph.png" hasTransparency="True" />
<ImageBuffer sourcepath="../meshes/Gauges/maps/gaugespeed_mph.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" controlledproperty="$speedUnitSlide @slide" >
<Layer id="Layer" >
<Layer id="Layer" variants="" >
<Camera id="Camera" />
<Model id="speed_mph_new" >
<Material id="Material" >
......@@ -34,18 +34,18 @@
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" name="SpeedTextures" aosoftness="49.5" background="Transparent" width="100" />
<Add ref="#Layer" name="SpeedTextures" aosoftness="49.5" background="Transparent" disabledepthprepass="True" disabledepthtest="False" width="100" />
<Add ref="#Camera" orthographic="True" />
<Add ref="#speed_mph_new" name="speed_mph" opacity="100" scale="5.12 5.12 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="Gauges/maps/gaugespeed_mph.png" />
<Add ref="#Material_diffusemap" sourcepath="../meshes/Gauges/maps/gaugespeed_mph.png" />
<Add ref="#speed_new" name="speed_kph" opacity="100" scale="5.12 5.12 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="Gauges/maps/gaugespeed_kph.png" />
<Add ref="#Material_001_diffusemap" sourcepath="../meshes/Gauges/maps/gaugespeed_kph.png" />
<Add ref="#gaugespeed_background" name="gaugespeed_background" controlledproperty="$colorSlide @slide" />
<State id="Scene-kph" name="kph" playmode="Stop at end" >
<Set ref="#Layer" endtime="1000" />
......@@ -77,7 +77,7 @@
<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="Gauges/maps/gaugespeed_background.jpg" />
<Add ref="#Material_002_diffusemap" sourcepath="../meshes/Gauges/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" >
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="4" >
<UIP version="5" >
<Project >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" preferKtx="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="Gauges/maps/gaugetacho.png" hasTransparency="True" />
<ImageBuffer sourcepath="../meshes/Gauges/maps/gaugetacho.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" >
<Layer id="Layer" >
<Layer id="Layer" variants="" >
<Camera id="Camera" />
<Model id="speed_mph_new" >
<Material id="Material" >
......@@ -28,13 +28,13 @@
</Graph>
<Logic >
<State name="Master Slide" component="#Scene" >
<Add ref="#Layer" name="TachoTextures" background="Transparent" />
<Add ref="#Layer" name="TachoTextures" background="Transparent" disabledepthprepass="True" disabledepthtest="False" />
<Add ref="#Camera" orthographic="True" />
<Add ref="#speed_mph_new" name="tacho" opacity="100" scale="5.12 5.12 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="Gauges/maps/gaugetacho.png" />
<Add ref="#Material_diffusemap" sourcepath="../meshes/Gauges/maps/gaugetacho.png" />
<Add ref="#gaugespeed_background" name="gaugetacho_background" controlledproperty="$colorSlide @slide" />
<State id="Scene-Tacho" name="Tacho" playmode="Stop at end" >
<Set ref="#Layer" endtime="1000" />
......@@ -52,7 +52,7 @@
<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="Gauges/maps/gaugespeed_background.jpg" />
<Add ref="#Material_002_diffusemap" sourcepath="../meshes/Gauges/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" >
......
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