Skip to content
Snippets Groups Projects
Commit d2319ca5 authored by Kaj Grönholm's avatar Kaj Grönholm
Browse files

CoffeeMaker: Don't show milk too early 

Task-number: QT3DS-1049
parent 6bd35911
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CoffeeMaker/presentation/CoffeeMaker.uip
+ 2
− 2
View file @ d2319ca5
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<AnimationTrack property="position.z" type="EaseInOut" artistedited="False" >0.0416667 -6.67731 100 100 0.291667 -6.67731 100 100 1 -6.67731 100 100 1.95833 -6.67731 100 100 2.33333 -3.26608 100 100</AnimationTrack> <AnimationTrack property="position.z" type="EaseInOut" artistedited="False" >0.0416667 -6.67731 100 100 0.291667 -6.67731 100 100 1 -6.67731 100 100 1.95833 -6.67731 100 100 2.33333 -3.26608 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" artistedited="False" >0.0416667 0.997213 100 100 0.291667 0.997213 100 100 1 0.997213 100 100 1.95833 0.997213 100 100 2.33333 0.997213 100 100</AnimationTrack> <AnimationTrack property="scale.x" type="EaseInOut" artistedited="False" >0.0416667 0.997213 100 100 0.291667 0.997213 100 100 1 0.997213 100 100 1.95833 0.997213 100 100 2.33333 0.997213 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" artistedited="False" >0.0416667 0.997213 100 100 0.291667 0.997213 100 100 1 0.997213 100 100 1.95833 0.997213 100 100 2.33333 0.997213 100 100</AnimationTrack> <AnimationTrack property="scale.y" type="EaseInOut" artistedited="False" >0.0416667 0.997213 100 100 0.291667 0.997213 100 100 1 0.997213 100 100 1.95833 0.997213 100 100 2.33333 0.997213 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" artistedited="False" >0.0416667 1.08304 100 100 0.291667 1.08304 100 100 1 5.56623 100 100 1.95833 5.56623 100 100 2.33333 0.527402 100 100</AnimationTrack> <AnimationTrack property="scale.z" type="EaseInOut" artistedited="False" >0.0416667 1.0 100 100 0.291667 1.08304 100 100 1 5.56623 100 100 1.95833 5.56623 100 100 2.33333 0.527402 100 100</AnimationTrack>
</Add> </Add>
<Add ref="#Coffee1_001" importfile=".\coffeeAnimated\coffeeAnimated.import" /> <Add ref="#Coffee1_001" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#fromMachine_Milk" endtime="4000" importfile=".\coffeeAnimated\coffeeAnimated.import" > <Add ref="#fromMachine_Milk" endtime="4000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<AnimationTrack property="position.z" type="EaseInOut" artistedited="False" >1.33333 -6.72604 100 100 1.625 -6.72604 100 100 2 -6.72604 100 100 2.29167 -3.22301 100 100</AnimationTrack> <AnimationTrack property="position.z" type="EaseInOut" artistedited="False" >1.33333 -6.72604 100 100 1.625 -6.72604 100 100 2 -6.72604 100 100 2.29167 -3.22301 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" artistedited="False" >1.33333 1.04872 100 100 1.625 1.04872 100 100 2 1.04872 100 100 2.29167 1.04872 100 100</AnimationTrack> <AnimationTrack property="scale.x" type="EaseInOut" artistedited="False" >1.33333 1.04872 100 100 1.625 1.04872 100 100 2 1.04872 100 100 2.29167 1.04872 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" artistedited="False" >1.33333 1.04872 100 100 1.625 1.04872 100 100 2 1.04872 100 100 2.29167 1.04872 100 100</AnimationTrack> <AnimationTrack property="scale.y" type="EaseInOut" artistedited="False" >1.33333 1.04872 100 100 1.625 1.04872 100 100 2 1.04872 100 100 2.29167 1.04872 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" artistedited="False" >1.33333 1.1622 100 100 1.625 6.00539 100 100 2 6.00539 100 100 2.29167 0.168512 100 100</AnimationTrack> <AnimationTrack property="scale.z" type="EaseInOut" artistedited="False" >1.33333 1.05 100 100 1.625 6.00539 100 100 2 6.00539 100 100 2.29167 0.168512 100 100</AnimationTrack>
</Add> </Add>
<Add ref="#Milk1" importfile=".\coffeeAnimated\coffeeAnimated.import" /> <Add ref="#Milk1" importfile=".\coffeeAnimated\coffeeAnimated.import" />
</State> </State>
......
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