Update UIP version and meshes

8e8142cb · Tomi Korpipää · 7c762311 · 8e8142cb · 8e8142cb · 8e8142cb
Commit 8e8142cb authored May 29, 2018 by Tomi Korpipää
56 changed files
--- a/CoffeeMaker/presentation/CoffeeMaker.uip
+++ b/CoffeeMaker/presentation/CoffeeMaker.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="1600" presentationHeight="900" maintainAspect="False" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/Cup.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/Cup.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/Machine2.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/Machine2.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/MachineBottomPart.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/MachineBottomPart.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/Table2.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/Table2.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/WallTiles.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/WallTiles.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/fromMachine_Coffee.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/fromMachine_Coffee.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/fromMachine_Milk.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/fromMachine_Milk.mesh
--- a/CoffeeMaker/presentation/coffeeAnimated/meshes/inCup_Coffee.mesh
+++ b/CoffeeMaker/presentation/coffeeAnimated/meshes/inCup_Coffee.mesh
--- a/HomeAutomation/uip/houseStudio.uip
+++ b/HomeAutomation/uip/houseStudio.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="1280" presentationHeight="900" maintainAspect="False" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh
--- a/HomeAutomation/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh
+++ b/HomeAutomation/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh
--- a/HomeAutomation/uip/models/House/meshes/Ground.mesh
+++ b/HomeAutomation/uip/models/House/meshes/Ground.mesh
--- a/HomeAutomation/uip/models/House/meshes/House.mesh
+++ b/HomeAutomation/uip/models/House/meshes/House.mesh
--- a/HomeAutomation/uip/models/House/meshes/Roof.mesh
+++ b/HomeAutomation/uip/models/House/meshes/Roof.mesh
--- a/HomeAutomation/uip/models/House/meshes/Windows.mesh
+++ b/HomeAutomation/uip/models/House/meshes/Windows.mesh
--- a/HomeAutomation/uip/models/RoomLights/meshes/BathroomLightmap.mesh
+++ b/HomeAutomation/uip/models/RoomLights/meshes/BathroomLightmap.mesh
--- a/HomeAutomation/uip/models/RoomLights/meshes/BedroomLightmap.mesh
+++ b/HomeAutomation/uip/models/RoomLights/meshes/BedroomLightmap.mesh
--- a/HomeAutomation/uip/models/RoomLights/meshes/EntranceLightmap.mesh
+++ b/HomeAutomation/uip/models/RoomLights/meshes/EntranceLightmap.mesh
--- a/HomeAutomation/uip/models/RoomLights/meshes/LivingroomLightMap.mesh
+++ b/HomeAutomation/uip/models/RoomLights/meshes/LivingroomLightMap.mesh
--- a/HomeAutomation/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh
+++ b/HomeAutomation/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh
--- a/clusterTemplate/Car/meshes/Car.mesh
+++ b/clusterTemplate/Car/meshes/Car.mesh
--- a/clusterTemplate/Car/meshes/Wheel_Back_Left.mesh
+++ b/clusterTemplate/Car/meshes/Wheel_Back_Left.mesh
--- a/clusterTemplate/Car/meshes/Wheel_Back_Right.mesh
+++ b/clusterTemplate/Car/meshes/Wheel_Back_Right.mesh
--- a/clusterTemplate/Car/meshes/Wheel_Front_Left.mesh
+++ b/clusterTemplate/Car/meshes/Wheel_Front_Left.mesh
--- a/clusterTemplate/Car/meshes/Wheel_Front_Right.mesh
+++ b/clusterTemplate/Car/meshes/Wheel_Front_Right.mesh
--- a/clusterTemplate/Car/meshes/body.mesh
+++ b/clusterTemplate/Car/meshes/body.mesh
--- a/clusterTemplate/clusterTemplate.uip
+++ b/clusterTemplate/clusterTemplate.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="1280" presentationHeight="480" maintainAspect="False" >
 			<CustomColors count="16" >#7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
@@ -15,7 +15,7 @@
 			<Effect id="VignetteEffect" name="VignetteEffect" sourcepath="effects/VignetteEffect.effect" />
 		</Classes>
 		<Graph >
-			<Scene id="Scene" controlledproperty="slide @slide" >
+			<Scene id="Scene" controlledproperty="$slide @slide" >
 				<Layer id="ClusterText" >
 					<Camera id="Camera_003" />
 					<Group id="Tellltales" >
@@ -212,7 +212,7 @@
 				<Add ref="#Camera_003" fov="8.16" orthographic="True" position="0 0 -435" />
 				<Add ref="#Tellltales" name="Tellltales" />
 				<Add ref="#TurnSignals" name="TurnSignals" />
-				<Add ref="#DateAndTime" name="DateAndTime" controlledproperty="dateAndTime textstring" font="TitilliumWeb-Regular" position="0 193 0" scale="0.2 0.2 0.2" size="120" textstring="Date and Time" />
+				<Add ref="#DateAndTime" name="DateAndTime" controlledproperty="$dateAndTime textstring" font="TitilliumWeb-Regular" position="0 193 0" scale="0.2 0.2 0.2" size="120" textstring="Date and Time" />
 				<Add ref="#Cluster3D2" name="Cluster3D" aodither="False" multisampleaa="4x" probe2fade="1" probebright="231" probefov="169.26" probehorizon="-1" progressiveaa="None" temporalaa="False" />
 				<Add ref="#Camera_002" fov="8.16" position="0 0 -435" />
 				<Add ref="#Cluster_001" name="Cluster" position="0 0 0" />
@@ -229,7 +229,7 @@
 				<Add ref="#qt_gauge_ring_2" importfile="models/Ring_2/Ring_2.import" locked="False" />
 				<Add ref="#Default_white" diffuse="0.0980392 0.0980392 0.0980392" importfile="models/Ring_2/Ring_2.import" locked="False" specularamount="1" specularreflection="#Default_white_specularreflection" />
 				<Add ref="#Default_white_specularreflection" locked="False" mappingmode="Environmental Mapping" sourcepath="maps/OpenfootageNET_garage-512.hdr" />
-				<Add ref="#GaugeNeedle" name="GaugeNeedle" controlledproperty="speed @timeline" position="0 -2.5 0" />
+				<Add ref="#GaugeNeedle" name="GaugeNeedle" controlledproperty="$speed @timeline" position="0 -2.5 0" />
 				<Add ref="#GaugeTickmarks" name="GaugeTickmarks" />
 				<Add ref="#tickmark_260" name="tickmark_260" importfile="models/tickmark_260/tickmark_260.import" sourcepath="models/tickmark_260/tickmark_260.import" />
 				<Add ref="#qt_gauge_tickmarks_260" importfile="models/tickmark_260/tickmark_260.import" />
@@ -249,7 +249,7 @@
 				<Add ref="#qt_gauge_ring_2_001" importfile="models/Ring_2/Ring_2.import" />
 				<Add ref="#Default_white_002" diffuse="0.0980392 0.0980392 0.0980392" importfile="models/Ring_2/Ring_2.import" specularamount="1" specularreflection="#Default_white_002_specularreflection" />
 				<Add ref="#Default_white_002_specularreflection" mappingmode="Environmental Mapping" sourcepath="maps/OpenfootageNET_garage-512.hdr" />
-				<Add ref="#GaugeNeedle_002" name="GaugeNeedle" controlledproperty="rpm @timeline" position="0 0.5 0" />
+				<Add ref="#GaugeNeedle_002" name="GaugeNeedle" controlledproperty="$rpm @timeline" position="0 0.5 0" />
 				<Add ref="#GaugeTickmarks_001" name="GaugeTickmarks" />
 				<Add ref="#tickmark_8_small" name="tickmark_8_small" importfile="models/tickmark_8_small/tickmark_8_small.import" scale="1.3 1.3 1.3" sourcepath="models/tickmark_8_small/tickmark_8_small.import" />
 				<Add ref="#qt_gauge_tickmarks_8_small" importfile="models/tickmark_8_small/tickmark_8_small.import" />

--- a/clusterTemplate/models/Ring_2/meshes/qt_gauge_ring_2.mesh
+++ b/clusterTemplate/models/Ring_2/meshes/qt_gauge_ring_2.mesh
--- a/clusterTemplate/models/needle_2/meshes/qt_gauge_needles_2.mesh
+++ b/clusterTemplate/models/needle_2/meshes/qt_gauge_needles_2.mesh
--- a/clusterTemplate/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh
+++ b/clusterTemplate/models/roundbg_1/meshes/qt_gauge_background_round_1.mesh
--- a/clusterTemplate/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh
+++ b/clusterTemplate/models/tickmark_260/meshes/qt_gauge_tickmarks_260.mesh
--- a/clusterTemplate/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh
+++ b/clusterTemplate/models/tickmark_8_small/meshes/qt_gauge_tickmarks_8_small.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/Car.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/Car.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Back_Left.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Back_Left.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Back_Right.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Back_Right.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Front_Left.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Front_Left.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Front_Right.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/Wheel_Front_Right.mesh
--- a/kria-cluster-3d-demo/presentation/Car/meshes/body.mesh
+++ b/kria-cluster-3d-demo/presentation/Car/meshes/body.mesh
--- a/kria-cluster-3d-demo/presentation/GaugeCenter/meshes/centerTacho.mesh
+++ b/kria-cluster-3d-demo/presentation/GaugeCenter/meshes/centerTacho.mesh
--- a/kria-cluster-3d-demo/presentation/Gauges/meshes/background.mesh
+++ b/kria-cluster-3d-demo/presentation/Gauges/meshes/background.mesh
--- a/kria-cluster-3d-demo/presentation/Gauges/meshes/edge.mesh
+++ b/kria-cluster-3d-demo/presentation/Gauges/meshes/edge.mesh
--- a/kria-cluster-3d-demo/presentation/Needle/meshes/tachoNeedle.mesh
+++ b/kria-cluster-3d-demo/presentation/Needle/meshes/tachoNeedle.mesh
--- a/kria-cluster-3d-demo/presentation/contentPresentation.uip
+++ b/kria-cluster-3d-demo/presentation/contentPresentation.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<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>

--- a/kria-cluster-3d-demo/presentation/digitalSpeed.uip
+++ b/kria-cluster-3d-demo/presentation/digitalSpeed.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/kria-cluster-3d-demo/presentation/digitalTacho.uip
+++ b/kria-cluster-3d-demo/presentation/digitalTacho.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/kria-cluster-3d-demo/presentation/mainPresentation.uip
+++ b/kria-cluster-3d-demo/presentation/mainPresentation.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="1920" presentationHeight="720" maintainAspect="True" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/kria-cluster-3d-demo/presentation/speedBackground.uip
+++ b/kria-cluster-3d-demo/presentation/speedBackground.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="True" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>

--- a/kria-cluster-3d-demo/presentation/tachoBackground.uip
+++ b/kria-cluster-3d-demo/presentation/tachoBackground.uip
 <?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
+<UIP version="4" >
 	<Project >
 		<ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" maintainAspect="False" >
 			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>