summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2019-01-11 16:32:25 +0100
committerChristian Strømme <christian.stromme@qt.io>2019-01-28 10:56:35 +0000
commit0b5485a3751291a80d96d38103168e9e8b20f899 (patch)
tree57eb087847889cfd695c63b124f2332b7fce54e0 /tests
parentbbf69f613e0be819871b859ca900149d93f1fa8c (diff)
Add functionality to disable individual tracks
This is needed to avoid evaluating tracks on the master slide that's been disabled by a property change on the child slide. Fixes: QT3DS-2331 Change-Id: I0da7f293ecf6690b56da6ab3f61235b2458cf824 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/scenes/unlinked/overridetrack.uip38
1 files changed, 38 insertions, 0 deletions
diff --git a/tests/scenes/unlinked/overridetrack.uip b/tests/scenes/unlinked/overridetrack.uip
new file mode 100644
index 0000000..b6c6366
--- /dev/null
+++ b/tests/scenes/unlinked/overridetrack.uip
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="600" 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>
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" endtime="3000" />
+ <Add ref="#Camera" endtime="3000" />
+ <Add ref="#Light" endtime="3000" />
+ <Add ref="#Cone" name="Cone" endtime="3000" position="-400 0 0" sourcepath="#Cone" >
+ <AnimationTrack property="position.x" type="EaseInOut" >0 -400 100 100 3 400 100 100</AnimationTrack>
+ <AnimationTrack property="position.y" type="EaseInOut" >0 0 100 100 3 0 100 100</AnimationTrack>
+ <AnimationTrack property="position.z" type="EaseInOut" >0 0 100 100 3 0 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Set ref="#Layer" endtime="3000" />
+ <Set ref="#Camera" endtime="3000" />
+ <Set ref="#Light" endtime="3000" />
+ <Set ref="#Cone" endtime="3000" position="0 0 0" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>