diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2018-09-06 12:51:33 +0200 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2018-09-07 06:52:31 +0000 |
| commit | 7160a80a91b52035fd222bca84bf5ed7a4d442d5 (patch) | |
| tree | 76109b51ff29a7dc885391091e74f72d5e8e2503 /tests | |
| parent | 7151fe87009e1f863b053ebd65c2bf46abf8df6f (diff) | |
Don't use dynamic values when entering the first slide
When entering the first slide there's no previous values available,
so the initial default value was used. Instead of applying these
values we should just skip updating the dynamic values when there's
no previous slide.
Task-number: QT3DS-2209
Change-Id: I5b8d184c3c27d37758259a0585948a7be9580aff
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe.uip | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe.uip b/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe.uip new file mode 100644 index 0000000..94145e9 --- /dev/null +++ b/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe.uip @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<UIP version="4" > + <Project > + <ProjectSettings author="" company="" presentationWidth="1024" presentationHeight="1024" maintainAspect="False" > + <CustomColors count="16" >#7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> + </ProjectSettings> + <Graph > + <Scene id="Scene" > + <Layer id="Layer" > + <Model id="Sphere" > + <Material id="Default_002" name="Default" /> + </Model> + <Camera id="Camera" /> + <Light id="Light" /> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" name="Content" /> + <Add ref="#Sphere" name="Sphere" position="0 0 0" sourcepath="#Sphere" /> + <Add ref="#Default_002" /> + <Add ref="#Camera" /> + <Add ref="#Light" /> + <State id="Scene-Slide1" name="Slide1" playthroughto="Next" > + <Set ref="#Scene" > + <Action id="Scene-Action" eyeball="True" triggerObject="#Scene" event="onPressureDown" targetObject="#Scene" handler="Next Slide" /> + </Set> + <Set ref="#Layer" endtime="2000" /> + <Set ref="#Sphere" endtime="2000" position="-245.732 0 0" > + <AnimationTrack property="position.x" type="EaseInOut" dynamic="True" >0 -245.732 100 100 2.00005 -245.732 100 100</AnimationTrack> + <AnimationTrack property="position.y" type="EaseInOut" dynamic="True" >0 0 100 100 2.00005 0 100 100</AnimationTrack> + <AnimationTrack property="position.z" type="EaseInOut" dynamic="True" >0 0 100 100 2.00005 0 100 100</AnimationTrack> + </Set> + <Set ref="#Camera" endtime="2000" /> + <Set ref="#Light" endtime="2000" /> + </State> + <State id="Scene-Slide2" name="Slide2" initialplaystate="Play" playmode="Stop at end" playthroughto="Previous" > + <Set ref="#Scene" > + <Action id="Scene-Action_001" eyeball="True" triggerObject="#Scene" event="onPressureDown" targetObject="#Scene" handler="Previous Slide" /> + </Set> + <Set ref="#Layer" endtime="2000" /> + <Set ref="#Sphere" endtime="2000" position="257.636 0 0" > + <AnimationTrack property="position.x" type="EaseInOut" dynamic="True" >0 257.636 100 100 2.00005 257.636 100 100</AnimationTrack> + <AnimationTrack property="position.y" type="EaseInOut" dynamic="True" >0 0 100 100 2.00005 0 100 100</AnimationTrack> + <AnimationTrack property="position.z" type="EaseInOut" dynamic="True" >0 0 100 100 2.00005 0 100 100</AnimationTrack> + </Set> + <Set ref="#Camera" endtime="2000" /> + <Set ref="#Light" endtime="2000" /> + </State> + </State> + </Logic> + </Project> +</UIP> |