diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2018-11-06 13:46:48 +0100 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@qt.io> | 2018-11-07 11:28:35 +0000 |
| commit | d8a37e66b3a12c0a839e65b93314f0077ff30b3c (patch) | |
| tree | 93e4071ff1229f27b01c18d088d0ee16d66ea107 /tests | |
| parent | 6d5c9b2be5c9c6cd0d407148bb84e81b37d58fc5 (diff) | |
Fix unlinked properties not being applied when there are no tracks
Notifying property changes was delayed until the track starts, but
if there's no tracks this will never happen, so instead we now
delay the calls until the slide animator (always present) is first
called, which happens even if the slide is initially paused.
Task-number: QT3DS-2596
Change-Id: I3fd49977b90ac370680446ecbfc7b3301130de34
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/slideplayer/unlinked/unlinkedNoTracks.uip | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/tests/scenes/slideplayer/unlinked/unlinkedNoTracks.uip b/tests/scenes/slideplayer/unlinked/unlinkedNoTracks.uip new file mode 100644 index 0000000..4b4d2c5 --- /dev/null +++ b/tests/scenes/slideplayer/unlinked/unlinkedNoTracks.uip @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<UIP version="4" > + <Project > + <ProjectSettings author="" company="" presentationWidth="1920" presentationHeight="1080" maintainAspect="False" > + <CustomColors count="16" >#ffffff #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="Cone" > + <Material id="Default" name="Default" /> + </Model> + <Component id="Component" > + <Model id="Cone_001" > + <Material id="Default_001" name="Default" /> + </Model> + </Component> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" /> + <Add ref="#Camera" /> + <Add ref="#Light" /> + <Add ref="#Cone" name="Cone" rotation="0 0 0" scale="1 3 1" sourcepath="#Cone" /> + <Add ref="#Default" diffuse="1 1 1" /> + <State id="Scene-Slide1" name="Slide1" playmode="Play Through To..." > + <Set ref="#Layer" endtime="2000" /> + <Set ref="#Camera" endtime="2000" /> + <Set ref="#Light" endtime="2000" /> + <Set ref="#Cone" endtime="2000" rotation="0 0 90" /> + <Set ref="#Default" diffuse="0 0 1" /> + <Add ref="#Component" name="Component" endtime="2000" /> + </State> + <State id="Scene-Slide2" name="Slide2" playmode="Play Through To..." playthroughto="Previous" > + <Set ref="#Layer" endtime="2000" /> + <Set ref="#Camera" endtime="2000" /> + <Set ref="#Light" endtime="2000" /> + <Set ref="#Cone" endtime="2000" rotation="-90 0 0" /> + <Set ref="#Default" diffuse="1 0 0" /> + </State> + </State> + <State name="Master Slide" component="#Component" > + <Add ref="#Cone_001" name="Cone" endtime="1000" position="0 -100 0" rotation="0 0 -90" scale="1 3 1" sourcepath="#Cone" /> + <Add ref="#Default_001" diffuse="1 1 1" /> + <State id="Component-Slide1" name="Slide1" playmode="Play Through To..." > + <Set ref="#Cone_001" endtime="800" rotation="0 0 90" /> + <Set ref="#Default_001" diffuse="1 0 0" /> + </State> + <State id="Component-Slide2" name="Slide2" initialplaystate="Play" playmode="Play Through To..." playthroughto="Previous" > + <Set ref="#Cone_001" endtime="800" rotation="0 0 -90" /> + <Set ref="#Default_001" diffuse="0.631373 1 0.0392157" /> + </State> + </State> + </Logic> + </Project> +</UIP> |