diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-10-31 14:53:28 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-10-31 14:50:50 +0000 |
| commit | c9f9043a0081c1fab1b94858fda16099fc7d6b48 (patch) | |
| tree | 7e72efda430871300d90e1e407e63bb73f4e3556 /tests | |
| parent | bfc2ac100ef3908eae812975dbd60deb4a09c289 (diff) | |
Fix dynamic keyframe regression
Adding the dummy first/last keyframes should be postponed until after
the first keyframe is updated by the dynamic keyframe logic.
Add also the test scene from the report: clicking the rectangle should
only start moving after 2 seconds (assuming you click fast enough after
opening the scene)
Task-number: QT3DS-2577
Change-Id: If768179c8aafd541798af21d397e1e93164354db
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe2.uip | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe2.uip b/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe2.uip new file mode 100644 index 0000000..764ac43 --- /dev/null +++ b/tests/scenes/slideplayer/dynamickeyframes/DynamicKeyframe2.uip @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<UIP version="4" > + <Project > + <ProjectSettings author="" company="" presentationWidth="512" presentationHeight="512" 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" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Rectangle" > + <Material id="Default" name="Default" /> + </Model> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" /> + <Add ref="#Camera" /> + <Add ref="#Light" /> + <Add ref="#Rectangle" name="Rectangle" position="-270.639 0 0" sourcepath="#Rectangle" /> + <Add ref="#Default" /> + <State id="Scene-Left" name="Left" > + <Set ref="#Scene" > + <Action id="Scene-Action" eyeball="True" triggerObject="#Rectangle" event="onPressureDown" targetObject="#Scene" handler="Go to Slide" > + <HandlerArgument name="Slide" type="String" argtype="Slide" value="Right" /> + </Action> + </Set> + <Set ref="#Layer" endtime="4000" /> + <Set ref="#Camera" endtime="4000" /> + <Set ref="#Light" endtime="4000" /> + <Set ref="#Rectangle" endtime="4000" position="-270.639 0 0" > + <AnimationTrack property="position.x" type="EaseInOut" dynamic="True" >2 -270.639 0 0 4 -270.639 0 0</AnimationTrack> + <AnimationTrack property="position.y" type="EaseInOut" dynamic="True" >2 0 0 0 4 0 0 0</AnimationTrack> + <AnimationTrack property="position.z" type="EaseInOut" dynamic="True" >2 0 0 0 4 0 0 0</AnimationTrack> + </Set> + </State> + <State id="Scene-Right" name="Right" initialplaystate="Play" playmode="Stop at end" playthroughto="Previous" > + <Set ref="#Layer" endtime="3999" /> + <Set ref="#Camera" endtime="3999" /> + <Set ref="#Light" endtime="3999" /> + <Set ref="#Rectangle" endtime="3999" position="242.225 0 0" > + <AnimationTrack property="position.x" type="EaseInOut" dynamic="True" >2 242.225 0 0 3.999 242.225 0 0</AnimationTrack> + <AnimationTrack property="position.y" type="EaseInOut" dynamic="True" >2 0 0 0 3.999 0 0 0</AnimationTrack> + <AnimationTrack property="position.z" type="EaseInOut" dynamic="True" >2 0 0 0 3.999 0 0 0</AnimationTrack> + <Action id="Rectangle-Action" eyeball="True" triggerObject="#Rectangle" event="onPressureDown" targetObject="#Scene" handler="Go to Slide" > + <HandlerArgument name="Slide" type="String" argtype="Slide" value="Left" /> + </Action> + </Set> + </State> + </State> + </Logic> + </Project> +</UIP> |