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

Fix jumpy third slide in CoffeeMaker

parent 5fc8b940
......@@ -222,33 +222,12 @@
<Add ref="#Table3_001_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\maps\CoffeeEnvironment.hdr" />
<Add ref="#BaseCabin1_001" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#Group_Animated_001" endtime="5000" eyeball="False" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#inCup_Coffee_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" artistedited="False" >0.791667 0.0350145 100 100 1.25 0.0350145 100 100 2.20833 0.0350145 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" artistedited="False" >0.791667 0.0350147 100 100 1.25 0.0350146 100 100 2.20833 0.0350144 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" artistedited="False" >0.791667 -2.53259 100 100 1.25 -2.9409 100 100 2.20833 -3.94604 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" artistedited="False" >0.791667 0.936815 100 100 1.25 1.13464 100 100 2.20833 1.46861 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" artistedited="False" >0.791667 0.936815 100 100 1.25 1.13464 100 100 2.20833 1.46861 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" artistedited="False" >0.791667 0.936815 100 100 1.25 1.13464 100 100 2.20833 1.46861 100 100</AnimationTrack>
</Add>
<Add ref="#inCup_Coffee_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#Coffee1_002" importfile=".\coffeeAnimated\coffeeAnimated.import" specularreflection="#Coffee1_002_specularreflection" speculartint="0.160784 0.160784 0.160784" />
<Add ref="#Coffee1_002_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\maps\CoffeeEnvironment.hdr" />
<Add ref="#fromMachine_Coffee_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" artistedited="False" >0.0416667 0.5 100 100 0.291667 0.5 100 100 1 0.5 100 100 1.95833 0.5 100 100 2.33333 0.5 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" artistedited="False" >0.0416667 1.04192e-08 100 100 0.291667 1.04192e-08 100 100 1 1.04192e-08 100 100 1.95833 1.04192e-08 100 100 2.33333 5.6618e-07 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.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>
</Add>
<Add ref="#fromMachine_Coffee_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#Coffee1_003" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#fromMachine_Milk_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" artistedited="False" >1.33333 -0.49754 100 100 1.625 -0.49754 100 100 2 -0.49754 100 100 2.29167 -0.49754 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" artistedited="False" >1.33333 0.0487237 100 100 1.625 0.0487237 100 100 2 0.0487237 100 100 2.29167 0.0487243 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.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>
</Add>
<Add ref="#fromMachine_Milk_001" endtime="5000" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#Milk1_001" importfile=".\coffeeAnimated\coffeeAnimated.import" />
</State>
<State id="Scene-makeCoffee" name="makeCoffee" playmode="Play Through To..." playthroughto="#Scene-CoffeeReady" >
......@@ -299,12 +278,12 @@
</Add>
<Add ref="#Coffee1_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\maps\CoffeeEnvironment.hdr" />
<Add ref="#fromMachine_Coffee" endtime="4000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" artistedited="False" >0.0416667 0.5 100 100 0.291667 0.5 100 100 1 0.5 100 100 1.95833 0.5 100 100 2.33333 0.5 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" artistedited="False" >0.0416667 1.04192e-08 100 100 0.291667 1.04192e-08 100 100 1 1.04192e-08 100 100 1.95833 1.04192e-08 100 100 2.33333 5.6618e-07 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.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 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="position.x" type="EaseInOut" >0 0.5 100 100 0.291667 0.5 100 100 1 0.5 100 100 1.95833 0.5 100 100 2.33333 0.5 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 1.04192e-08 100 100 0.291667 1.04192e-08 100 100 1 1.04192e-08 100 100 1.95833 1.04192e-08 100 100 2.33333 5.6618e-07 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -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" >0 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" >0 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" >0 1 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 ref="#Coffee1_001" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#fromMachine_Milk" endtime="4000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
......@@ -350,37 +329,12 @@
<Add ref="#Table3_002_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\maps\CoffeeEnvironment.hdr" />
<Add ref="#BaseCabin1_002" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#Group_Animated_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#inCup_Coffee_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0.0350145 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 0.0350144 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -3.94604 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" >0 1.46861 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" >0 1.46861 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 1.46861 100 100</AnimationTrack>
</Add>
<Add ref="#Coffee1_004" importfile=".\coffeeAnimated\coffeeAnimated.import" specularreflection="#Coffee1_004_specularreflection" speculartint="0.160784 0.160784 0.160784" >
<AnimationTrack property="diffuse.x" type="EaseInOut" >0 0.827451 100 100</AnimationTrack>
<AnimationTrack property="diffuse.y" type="EaseInOut" >0 0.478431 100 100</AnimationTrack>
<AnimationTrack property="diffuse.z" type="EaseInOut" >0 0.219608 100 100</AnimationTrack>
</Add>
<Add ref="#inCup_Coffee_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" position="0.035 0.035 -3.946" scale="1.469 1.469 1.469" />
<Add ref="#Coffee1_004" diffuse="0.827451 0.478431 0.219608" importfile=".\coffeeAnimated\coffeeAnimated.import" specularreflection="#Coffee1_004_specularreflection" speculartint="0.160784 0.160784 0.160784" />
<Add ref="#Coffee1_004_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\maps\CoffeeEnvironment.hdr" />
<Add ref="#fromMachine_Coffee_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0.5 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 5.6618e-07 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -3.26608 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" >0 0.997213 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" >0 0.997213 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 0.527402 100 100</AnimationTrack>
</Add>
<Add ref="#fromMachine_Coffee_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" position="0.5 0 -3.266" scale="0.997 0.997 0.997" />
<Add ref="#Coffee1_005" importfile=".\coffeeAnimated\coffeeAnimated.import" />
<Add ref="#fromMachine_Milk_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 -0.49754 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 0.0487243 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 -3.22301 100 100</AnimationTrack>
<AnimationTrack property="scale.x" type="EaseInOut" >0 1.04872 100 100</AnimationTrack>
<AnimationTrack property="scale.y" type="EaseInOut" >0 1.04872 100 100</AnimationTrack>
<AnimationTrack property="scale.z" type="EaseInOut" >0 0.168512 100 100</AnimationTrack>
</Add>
<Add ref="#fromMachine_Milk_002" endtime="3000" importfile=".\coffeeAnimated\coffeeAnimated.import" position="-0.498 0.049 -3.223" scale="1.049 1.049 0.169" />
<Add ref="#Milk1_002" importfile=".\coffeeAnimated\coffeeAnimated.import" />
</State>
</State>
......
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