summaryrefslogtreecommitdiffstats
path: root/tests/scenes
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-08-30 10:17:24 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-09-03 11:04:47 +0000
commitde2dbd12457f32fb6f4f78eb0a758366a607463b (patch)
treeed89c3425396a92565bbbde7d275884ca63321dd /tests/scenes
parentb002d4e6a877efe7384b798af9d574aef3282e98 (diff)
Handle Layer.sourcepath changes
...but only for layers that start out as subpresentations. Changing back and forth between "normal" and subpresentation layers is not supported. Change-Id: Id160f3efee12bd7b1a950635e738a47bc9d890b6 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'tests/scenes')
-rw-r--r--tests/scenes/subpres_deferred/IMG_20171113_162246.jpgbin0 -> 109043 bytes
-rw-r--r--tests/scenes/subpres_deferred/IMG_20171113_163139.jpgbin0 -> 167516 bytes
-rw-r--r--tests/scenes/subpres_deferred/QT-badge.pngbin0 -> 26806 bytes
-rw-r--r--tests/scenes/subpres_deferred/fonts/TitilliumWeb-Regular.ttfbin0 -> 63752 bytes
-rw-r--r--tests/scenes/subpres_deferred/presentations/subpres_deferred.uip50
-rw-r--r--tests/scenes/subpres_deferred/presentations/subpresentation0.uip27
-rw-r--r--tests/scenes/subpres_deferred/presentations/subpresentation1.uip36
-rw-r--r--tests/scenes/subpres_deferred/presentations/subpresentation2.uip42
-rw-r--r--tests/scenes/subpres_deferred/presentations/subpresentation3.uip50
-rw-r--r--tests/scenes/subpres_deferred/subpres_deferred.uia19
10 files changed, 224 insertions, 0 deletions
diff --git a/tests/scenes/subpres_deferred/IMG_20171113_162246.jpg b/tests/scenes/subpres_deferred/IMG_20171113_162246.jpg
new file mode 100644
index 0000000..aacd1ef
--- /dev/null
+++ b/tests/scenes/subpres_deferred/IMG_20171113_162246.jpg
Binary files differ
diff --git a/tests/scenes/subpres_deferred/IMG_20171113_163139.jpg b/tests/scenes/subpres_deferred/IMG_20171113_163139.jpg
new file mode 100644
index 0000000..5134473
--- /dev/null
+++ b/tests/scenes/subpres_deferred/IMG_20171113_163139.jpg
Binary files differ
diff --git a/tests/scenes/subpres_deferred/QT-badge.png b/tests/scenes/subpres_deferred/QT-badge.png
new file mode 100644
index 0000000..0486310
--- /dev/null
+++ b/tests/scenes/subpres_deferred/QT-badge.png
Binary files differ
diff --git a/tests/scenes/subpres_deferred/fonts/TitilliumWeb-Regular.ttf b/tests/scenes/subpres_deferred/fonts/TitilliumWeb-Regular.ttf
new file mode 100644
index 0000000..6da8219
--- /dev/null
+++ b/tests/scenes/subpres_deferred/fonts/TitilliumWeb-Regular.ttf
Binary files differ
diff --git a/tests/scenes/subpres_deferred/presentations/subpres_deferred.uip b/tests/scenes/subpres_deferred/presentations/subpres_deferred.uip
new file mode 100644
index 0000000..f954717
--- /dev/null
+++ b/tests/scenes/subpres_deferred/presentations/subpres_deferred.uip
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="1280" presentationHeight="720" 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="Layer2" />
+ <Layer id="Layer" >
+ <Text id="SwitchText1" />
+ <Text id="SwitchText3" />
+ <Text id="SwitchText2" />
+ <Camera id="Camera" />
+ <Light id="Light" />
+ <Text id="2" />
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" background="SolidColor" backgroundcolor="0.509804 0.764706 1" />
+ <Add ref="#Camera" />
+ <Add ref="#Light" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#Layer2" name="SubPresentationHost" height="80" left="10" sourcepath="subpresentation0" top="10" width="80" />
+ <Add ref="#SwitchText1" name="SwitchText3" font="TitilliumWeb-Regular" position="-566.954 117.395 0" textcolor="1 0 0" textstring="#3" >
+ <Action id="SwitchText3-Action" eyeball="True" triggerObject="#SwitchText1" event="onPressureDown" targetObject="#Layer2" handler="Set Property" >
+ <HandlerArgument name="Property Name" type="String" argtype="Property" value="sourcepath" />
+ <HandlerArgument name="Property Value" type="String" argtype="Dependent" value="subpresentation3" />
+ </Action>
+ </Add>
+ <Add ref="#SwitchText3" name="SwitchText2" font="TitilliumWeb-Regular" position="-566.954 175.13 0" textcolor="1 0 0" textstring="#2" >
+ <Action id="SwitchText2-Action" eyeball="True" triggerObject="#SwitchText3" event="onPressureDown" targetObject="#Layer2" handler="Set Property" >
+ <HandlerArgument name="Property Name" type="String" argtype="Property" value="sourcepath" />
+ <HandlerArgument name="Property Value" type="String" argtype="Dependent" value="subpresentation2" />
+ </Action>
+ </Add>
+ <Add ref="#SwitchText2" name="SwitchText1" font="TitilliumWeb-Regular" position="-566.954 229.978 0" textcolor="1 0 0" textstring="#1" >
+ <Action id="SwitchText1-Action" eyeball="True" triggerObject="#SwitchText2" event="onPressureDown" targetObject="#Layer2" handler="Set Property" >
+ <HandlerArgument name="Property Name" type="String" argtype="Property" value="sourcepath" />
+ <HandlerArgument name="Property Value" type="String" argtype="Dependent" value="subpresentation1" />
+ </Action>
+ </Add>
+ <Add ref="#2" name="maintext" font="TitilliumWeb-Regular" position="-109.697 304.071 0" textstring="Main layer. Click below to change 'sourcepath' for the other Layer" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/scenes/subpres_deferred/presentations/subpresentation0.uip b/tests/scenes/subpres_deferred/presentations/subpresentation0.uip
new file mode 100644
index 0000000..00766d3
--- /dev/null
+++ b/tests/scenes/subpres_deferred/presentations/subpresentation0.uip
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="600" 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" />
+ <Text id="2" />
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" />
+ <Add ref="#Camera" />
+ <Add ref="#Light" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#2" name="sp0text" font="TitilliumWeb-Regular" textstring="Initial subpresentation" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/scenes/subpres_deferred/presentations/subpresentation1.uip b/tests/scenes/subpres_deferred/presentations/subpresentation1.uip
new file mode 100644
index 0000000..870f7de
--- /dev/null
+++ b/tests/scenes/subpres_deferred/presentations/subpresentation1.uip
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="640" presentationHeight="480" 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" />
+ <Text id="2" />
+ <Model id="sp1cone" >
+ <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" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#2" name="sp1text" font="TitilliumWeb-Regular" position="-4.29853 255.477 0" textstring="Sub-presentation #1" />
+ <Add ref="#sp1cone" name="sp1cone" position="-15.8771 -112.583 0" scale="1.90323 2.15152 1" sourcepath="#Cone" >
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 10 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 10 0 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 10 360 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/scenes/subpres_deferred/presentations/subpresentation2.uip b/tests/scenes/subpres_deferred/presentations/subpresentation2.uip
new file mode 100644
index 0000000..b96a85c
--- /dev/null
+++ b/tests/scenes/subpres_deferred/presentations/subpresentation2.uip
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="600" 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" />
+ <Text id="sp2text" />
+ <Model id="Cube" >
+ <Material id="Default" name="Default" >
+ <Image id="Default_diffusemap" />
+ </Material>
+ </Model>
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" />
+ <Add ref="#Camera" />
+ <Add ref="#Light" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#sp2text" name="sp2text" font="TitilliumWeb-Regular" position="-5.77347 270.2 0" textcolor="0.45098 1 0.956863" textstring="Sub-presentation #2" />
+ <Add ref="#Cube" name="Cube" position="13.8564 8.08289 0" rotation="-27.4748 -16.996 -20.5351" sourcepath="#Cube" >
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 -27.4748 100 100 10 45 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 -16.996 100 100 10 45 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 -20.5351 100 100 10 45 100 100</AnimationTrack>
+ <AnimationTrack property="scale.x" type="EaseInOut" >0 3 100 100 5.266 2 100 100 10 1 100 100</AnimationTrack>
+ <AnimationTrack property="scale.y" type="EaseInOut" >0 3 100 100 5.266 3 100 100 10 1 100 100</AnimationTrack>
+ <AnimationTrack property="scale.z" type="EaseInOut" >0 3 100 100 5.266 4 100 100 10 1 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default" diffusemap="#Default_diffusemap" />
+ <Add ref="#Default_diffusemap" sourcepath="../IMG_20171113_163139.jpg" subpresentation="" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/scenes/subpres_deferred/presentations/subpresentation3.uip b/tests/scenes/subpres_deferred/presentations/subpresentation3.uip
new file mode 100644
index 0000000..e6b135e
--- /dev/null
+++ b/tests/scenes/subpres_deferred/presentations/subpresentation3.uip
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="4" >
+ <Project >
+ <ProjectSettings author="" company="" presentationWidth="640" presentationHeight="480" maintainAspect="False" >
+ <CustomColors count="16" >#7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
+ </ProjectSettings>
+ <BufferData >
+ <ImageBuffer sourcepath="../QT-badge.png" hasTransparency="True" />
+ </BufferData>
+ <Graph >
+ <Scene id="Scene" >
+ <Layer id="Layer" >
+ <Camera id="Camera" />
+ <Light id="Light" />
+ <Text id="2" />
+ <Model id="Cylinder" >
+ <Material id="Default" name="Default" >
+ <Image id="Default_diffusemap" />
+ </Material>
+ </Model>
+ <Model id="QT-badge" >
+ <Material id="Material" >
+ <Image id="Material_diffusemap" />
+ </Material>
+ </Model>
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" />
+ <Add ref="#Camera" />
+ <Add ref="#Light" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#2" name="sp3text" font="TitilliumWeb-Regular" position="-17.3205 264.138 0" textcolor="1 0.866667 0.521569" textstring="Sub-presentation #3" />
+ <Add ref="#Cylinder" name="Cylinder" rotation="-24.0321 7.10331 -17.0138" scale="3 3 3" sourcepath="#Cylinder" >
+ <AnimationTrack property="rotation.x" type="EaseInOut" >0 -24.0321 100 100 10 45 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.y" type="EaseInOut" >0 7.10331 100 100 10 200 100 100</AnimationTrack>
+ <AnimationTrack property="rotation.z" type="EaseInOut" >0 -17.0138 100 100 10 -17.014 100 100</AnimationTrack>
+ </Add>
+ <Add ref="#Default" diffusemap="#Default_diffusemap" />
+ <Add ref="#Default_diffusemap" sourcepath="../IMG_20171113_162246.jpg" subpresentation="" />
+ <Add ref="#QT-badge" name="QT-badge" position="311.769 -197.742 0" scale="2.56 2.56 1" sourcepath="#Rectangle" />
+ <Add ref="#Material" diffusemap="#Material_diffusemap" />
+ <Add ref="#Material_diffusemap" sourcepath="../QT-badge.png" subpresentation="" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/scenes/subpres_deferred/subpres_deferred.uia b/tests/scenes/subpres_deferred/subpres_deferred.uia
new file mode 100644
index 0000000..3405688
--- /dev/null
+++ b/tests/scenes/subpres_deferred/subpres_deferred.uia
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8'?>
+<application xmlns="http://qt.io/qt3dstudio/uia">
+ <assets initial="subpres_deferred">
+ <presentation id="subpres_deferred" src="presentations/subpres_deferred.uip"/>
+ <presentation id="subpresentation1" src="presentations/subpresentation1.uip"/>
+ <presentation id="subpresentation2" src="presentations/subpresentation2.uip"/>
+ <presentation id="subpresentation3" src="presentations/subpresentation3.uip"/>
+ <presentation id="subpresentation0" src="presentations/subpresentation0.uip"/>
+ </assets>
+ <statemachine ref="#logic">
+ <visual-states>
+ <state ref="Initial">
+ <enter>
+ <goto-slide rel="next" element="main:Scene"/>
+ </enter>
+ </state>
+ </visual-states>
+ </statemachine>
+</application>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 01:59:08 +0000