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

Clean up folder structure in Kria Cluster

parent caf31dad
......@@ -14,17 +14,6 @@
<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/map.jpg</file>
<file>presentation/Gaugesvol1/maps/SpeedCenter.jpg</file>
<file>presentation/Gaugesvol1/meshes/background.mesh</file>
<file>presentation/Gaugesvol1/meshes/background_0001.mesh</file>
<file>presentation/Gaugesvol1/meshes/centerSpeed.mesh</file>
<file>presentation/Gaugesvol1/meshes/centerTacho.mesh</file>
<file>presentation/Gaugesvol1/meshes/edge.mesh</file>
<file>presentation/Gaugesvol1/meshes/edge_0001.mesh</file>
<file>presentation/Gaugesvol1/meshes/speedNeedle.mesh</file>
<file>presentation/Gaugesvol1/meshes/tachoNeedle.mesh</file>
<file>presentation/Gaugesvol1/Gaugesvol1.import</file>
<file>presentation/contentPresentation.uip</file>
<file>presentation/mainPresentation.uia</file>
<file>presentation/mainPresentation.uip</file>
......@@ -33,19 +22,30 @@
<file>presentation/digitalTacho.uip</file>
<file>presentation/fonts/TitilliumWeb-Regular.ttf</file>
<file>main.cpp</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/environment.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>
<file>presentation/GaugeCenter/meshes/centerTacho.mesh</file>
<file>presentation/GaugeCenter/center_new8.import</file>
<file>presentation/GaugeEdge/meshes/edge_1.mesh</file>
<file>presentation/GaugeEdge/edge_new.import</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/background_0001.mesh</file>
<file>presentation/Gauges/meshes/centerSpeed.mesh</file>
<file>presentation/Gauges/meshes/centerTacho.mesh</file>
<file>presentation/Gauges/meshes/edge.mesh</file>
<file>presentation/Gauges/meshes/edge_0001.mesh</file>
<file>presentation/Gauges/meshes/speedNeedle.mesh</file>
<file>presentation/Gauges/meshes/tachoNeedle.mesh</file>
<file>presentation/Gauges/Gaugesvol1.import</file>
</qresource>
</RCC>
......@@ -71,7 +71,7 @@
<Add ref="#Seats_diffusemap" sourcepath=".\Car\maps\Seats_diffuse.jpg" />
<Add ref="#Seats_normalmap" sourcepath=".\Car\maps\Seats_normal.jpg" />
<Add ref="#Glass" fresnelPower="10" importfile=".\Car\Car.import" opacity="59.2593" specularamount="3" specularreflection="#Glass_specularreflection" specularroughness="0.06094" speculartint="0.388235 0.388235 0.388235" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gaugesvol1/maps/environment.jpg" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gauges/maps/environment.jpg" />
<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" />
......@@ -89,7 +89,7 @@
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
</Add>
<Add ref="#Wheel" bumpamount="1" diffuse="0.164706 0.164706 0.164706" importfile=".\Car\Car.import" normalmap="#Wheel_normalmap" specularamount="2" specularmap="#Wheel_specularmap" specularreflection="#Wheel_specularreflection" specularroughness="0.21079" speculartint="0.592157 0.592157 0.592157" />
<Add ref="#Wheel_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gaugesvol1/maps/environment.jpg" />
<Add ref="#Wheel_specularreflection" mappingmode="Environmental Mapping" sourcepath="Gauges/maps/environment.jpg" />
<Add ref="#Wheel_specularmap" sourcepath=".\Car\maps\Wheel_specular.jpg" />
<Add ref="#Wheel_normalmap" sourcepath="./Car/maps/Wheel_normal.jpg" />
<Add ref="#Wheel_Front_Left" importfile=".\Car\Car.import" >
......
......@@ -5,8 +5,8 @@
<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" />
<ImageBuffer sourcepath="Gauges/maps/gaugespeed_kph.png" hasTransparency="True" />
<ImageBuffer sourcepath="Gauges/maps/gaugespeed_mph.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" controlledproperty="speedUnitSlide @slide" >
......@@ -40,12 +40,12 @@
<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="#Material_diffusemap" sourcepath="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="Gaugesvol1/maps/gaugespeed_kph.png" />
<Add ref="#Material_001_diffusemap" sourcepath="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="Gaugesvol1/maps/gaugespeed_background.jpg" />
<Add ref="#Material_002_diffusemap" sourcepath="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" >
......
......@@ -5,7 +5,7 @@
<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" />
<ImageBuffer sourcepath="Gauges/maps/gaugetacho.png" hasTransparency="True" />
</BufferData>
<Graph >
<Scene id="Scene" >
......@@ -34,7 +34,7 @@
<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="#Material_diffusemap" sourcepath="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="Gaugesvol1/maps/gaugespeed_background.jpg" />
<Add ref="#Material_002_diffusemap" sourcepath="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" >
......
......@@ -169,9 +169,9 @@ Item {
onFrameUpdate: {
direction = !direction;
if (direction)
studio3D.x += 0.5;
studio3D.x += 0.1;
else
studio3D.x -= 0.5;
studio3D.x -= 0.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