summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2018-08-14 11:12:28 +0200
committerChristian Stromme <christian.stromme@qt.io>2018-08-14 14:09:38 +0000
commitf9facdf889dd4d040aa2a48d177c728c626813b8 (patch)
treefa207e88ee286bdff97a091882e5e48bad7b8b0c /tests
parent18fa95d903efed7ef00fc3ca707365af8954fe8f (diff)
Don't restart components on the master slide when changing slides
Components on the master slide should not be restarted when changing slides. Task-number: QT3DS-2052 Change-Id: I986e0ad713b7f979d6899a8ef80032d93e371656 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/scenes/slideplayer/components/README.txt2
-rw-r--r--tests/scenes/slideplayer/components/component001.uip98
2 files changed, 100 insertions, 0 deletions
diff --git a/tests/scenes/slideplayer/components/README.txt b/tests/scenes/slideplayer/components/README.txt
new file mode 100644
index 0000000..5892c6a
--- /dev/null
+++ b/tests/scenes/slideplayer/components/README.txt
@@ -0,0 +1,2 @@
+- component001.uip
+ Checks that components on the master slide keeps playing when changing slides (QT3DS-2052)
diff --git a/tests/scenes/slideplayer/components/component001.uip b/tests/scenes/slideplayer/components/component001.uip
new file mode 100644
index 0000000..312155e
--- /dev/null
+++ b/tests/scenes/slideplayer/components/component001.uip
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3" >
+ <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" />
+ <Component id="Component" >
+ <Model id="Cube" >
+ <Material id="Default" name="Default" />
+ </Model>
+ </Component>
+ <Text id="Text" />
+ <Text id="Text2" />
+ <Component id="CubeComponentSlide1" >
+ <Model id="Cube_001" >
+ <Material id="Default_001" name="Default" />
+ </Model>
+ </Component>
+ <Component id="Cube2" >
+ <Model id="Cube2_001" >
+ <Material id="Default_002" name="Default" />
+ </Model>
+ </Component>
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" endtime="4000" />
+ <Add ref="#Camera" endtime="4000" />
+ <Add ref="#Light" endtime="4000" />
+ <Add ref="#Component" name="ComponentOnMasterSlide" endtime="4000" />
+ <State id="Scene-Slide1" name="Slide1" playmode="Play Through To..." >
+ <Set ref="#Layer" endtime="1000" />
+ <Set ref="#Camera" endtime="1000" />
+ <Set ref="#Light" endtime="1000" />
+ <Set ref="#Component" endtime="1000" />
+ <Add ref="#Text" name="Text" endtime="1000" font="TitilliumWeb-Regular" position="0 200 0" size="36" textstring="Slide 1" />
+ <Add ref="#CubeComponentSlide1" name="CubeComponentSlide1" endtime="1000" />
+ </State>
+ <State id="Scene-Slide2" name="Slide2" initialplaystate="Play" playmode="Stop at end" playthroughto="Previous" >
+ <Set ref="#Layer" endtime="1000" />
+ <Set ref="#Camera" endtime="1000" />
+ <Set ref="#Light" endtime="1000" />
+ <Set ref="#Component" endtime="1000" />
+ <Add ref="#Text2" name="Text2" endtime="1000" font="TitilliumWeb-Regular" position="0 200 0" size="36" textstring="Slide 2" />
+ <Add ref="#Cube2" name="CubeComponentSlide2" endtime="1000" />
+ </State>
+ </State>
+ <State name="Master Slide" component="#Component" >
+ <State id="ComponentOnMasterSlide-Slide1" name="Slide1" playmode="PingPong" >
+ <Add ref="#Cube" name="Cube" endtime="4000" position="-200 0 0" rotation="180 0 0" sourcepath="#Cube" >
+ <AnimationTrack property="position.x" type="EaseInOut" >0 -200 100 100 4 200 100 100</AnimationTrack>
+ <AnimationTrack property="position.y" type="EaseInOut" >0 0 100 100 4 0 100 100</AnimationTrack>
+ <AnimationTrack property="position.z" type="EaseInOut" >0 0 100 100 4 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 4 180 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 4 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 4 0 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default" />
+ </State>
+ </State>
+ <State name="Master Slide" component="#CubeComponentSlide1" >
+ <Add ref="#Cube_001" name="Cube" endtime="1000" position="-200 0 0" rotation="180 0 0" sourcepath="#Cube" >
+ <AnimationTrack property="position.x" type="EaseInOut" >0 -200 100 100 1 200 100 100</AnimationTrack>
+ <AnimationTrack property="position.y" type="EaseInOut" >0 -150 100 100 1 -150 100 100</AnimationTrack>
+ <AnimationTrack property="position.z" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 1 180 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default_001" />
+ <State id="CubeComponentSlide1-Slide1" name="Slide1" >
+ <Set ref="#Cube_001" endtime="1000" />
+ </State>
+ </State>
+ <State name="Master Slide" component="#Cube2" >
+ <Add ref="#Cube2_001" name="Cube2" endtime="1000" position="-200 0 0" rotation="180 0 0" sourcepath="#Cube" >
+ <AnimationTrack property="position.x" type="EaseInOut" >0 -200 100 100 1 200 100 100</AnimationTrack>
+ <AnimationTrack property="position.y" type="EaseInOut" >0 -150 100 100 1 -150 100 100</AnimationTrack>
+ <AnimationTrack property="position.z" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 1 180 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 1 0 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default_002" />
+ <State id="CubeComponentSlide2-Slide1" name="Slide1" >
+ <Set ref="#Cube2_001" endtime="1000" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>