diff options
author | Christian Strømme <christian.stromme@qt.io> | 2018-09-21 10:33:54 +0200 |
---|---|---|
committer | Christian Strømme <christian.stromme@qt.io> | 2018-09-21 10:34:42 +0200 |
commit | 9091098014c4cdfbc122bbc015b7641b07f28205 (patch) | |
tree | 034af6f3991a538814c55c6636c570b2efbf7fbb /tests | |
parent | 59923f7725c82ac31c1245a36bd3b1be9bec3cd7 (diff) | |
parent | 95942f6b187c5272074c191424a18e33f8516967 (diff) |
Merge remote-tracking branch 'origin/2.1'
Change-Id: I5339cbc7f52608a7bfce10360ed20ba344b9c736
Diffstat (limited to 'tests')
-rw-r--r-- | tests/scenes/actions/property_change_on_event.uip | 37 | ||||
-rw-r--r-- | tests/scenes/slideplayer/slideduration/slideduration.uia | 6 | ||||
-rw-r--r-- | tests/scenes/slideplayer/slideduration/slideduration.uip | 33 | ||||
-rw-r--r-- | tests/scenes/slideplayer/visibility/noanimtracks.uip | 38 | ||||
-rw-r--r-- | tests/scenes/subpres_nested/fonts/TitilliumWeb-Regular.ttf | bin | 0 -> 63752 bytes | |||
-rw-r--r-- | tests/scenes/subpres_nested/multisub.uia | 17 | ||||
-rw-r--r-- | tests/scenes/subpres_nested/multisub.uip | 39 | ||||
-rw-r--r-- | tests/scenes/subpres_nested/subpres1.uip | 39 | ||||
-rw-r--r-- | tests/scenes/subpres_nested/subpres11.uip | 32 |
9 files changed, 241 insertions, 0 deletions
diff --git a/tests/scenes/actions/property_change_on_event.uip b/tests/scenes/actions/property_change_on_event.uip new file mode 100644 index 0000000..f26be4d --- /dev/null +++ b/tests/scenes/actions/property_change_on_event.uip @@ -0,0 +1,37 @@ +<?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="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Cone" > + <Material id="Default" name="Default" /> + </Model> + <Text id="Text" /> + </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="#Cone" name="Cone" position="-7.69803 -147.224 0" scale="3.1194 3.64516 1" sourcepath="#Cone" > + <Action id="Cone-Action" eyeball="True" triggerObject="#Cone" event="onPressureDown" targetObject="#Cone" handler="Set Property" > + <HandlerArgument name="Property Name" type="String" argtype="Property" value="opacity" /> + <HandlerArgument name="Property Value" argtype="Dependent" value="28" /> + </Action> + </Add> + <Add ref="#Default" /> + <Add ref="#Text" name="Text" font="TitilliumWeb-Regular" position="-310.807 296.373 0" textstring="Click on the cone to change its opacity" /> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/slideplayer/slideduration/slideduration.uia b/tests/scenes/slideplayer/slideduration/slideduration.uia new file mode 100644 index 0000000..57b6fdd --- /dev/null +++ b/tests/scenes/slideplayer/slideduration/slideduration.uia @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='utf-8'?> +<application xmlns="http://qt.io/qt3dstudio/uia"> + <assets initial="nn"> + <presentation id="nn" src="slideduration.uip"/> + </assets> +</application> diff --git a/tests/scenes/slideplayer/slideduration/slideduration.uip b/tests/scenes/slideplayer/slideduration/slideduration.uip new file mode 100644 index 0000000..9c64081 --- /dev/null +++ b/tests/scenes/slideplayer/slideduration/slideduration.uip @@ -0,0 +1,33 @@ +<?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" /> + </Layer> + <Layer id="Layer2" > + <Camera id="Camera_001" /> + <Light id="Light_001" /> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" endtime="12000" /> + <Add ref="#Camera" endtime="12000" /> + <Add ref="#Light" endtime="12000" /> + <State id="Scene-Slide1" name="Slide1" > + <!-- NOTE: There's set property for the Layer on this slide, which means it's endtime is 10000 --> + <Add ref="#Layer2" name="Layer2" endtime="12000" starttime="2000" /> + <Add ref="#Camera_001" endtime="12000" starttime="2000" /> + <Add ref="#Light_001" endtime="12000" starttime="2000" /> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/slideplayer/visibility/noanimtracks.uip b/tests/scenes/slideplayer/visibility/noanimtracks.uip new file mode 100644 index 0000000..6d78587 --- /dev/null +++ b/tests/scenes/slideplayer/visibility/noanimtracks.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" >#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="Sphere" > + <Material id="Default" name="Default" /> + </Model> + <Model id="Cube" > + <Material id="Default_001" name="Default" /> + </Model> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" endtime="9483" /> + <Add ref="#Camera" endtime="9483" /> + <Add ref="#Light" endtime="9483" /> + <State id="Scene-Slide1" name="Slide1" > + <Set ref="#Layer" endtime="8500" /> + <Set ref="#Camera" endtime="8500" /> + <Set ref="#Light" endtime="8500" /> + <Add ref="#Sphere" name="Sphere" endtime="4500" sourcepath="#Sphere" starttime="2500" /> + <Add ref="#Default" /> + <Add ref="#Cube" name="Cube" endtime="6500" position="100 100 0" sourcepath="#Cube" starttime="3500" /> + <Add ref="#Default_001" /> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/subpres_nested/fonts/TitilliumWeb-Regular.ttf b/tests/scenes/subpres_nested/fonts/TitilliumWeb-Regular.ttf Binary files differnew file mode 100644 index 0000000..6da8219 --- /dev/null +++ b/tests/scenes/subpres_nested/fonts/TitilliumWeb-Regular.ttf diff --git a/tests/scenes/subpres_nested/multisub.uia b/tests/scenes/subpres_nested/multisub.uia new file mode 100644 index 0000000..b32cc11 --- /dev/null +++ b/tests/scenes/subpres_nested/multisub.uia @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<application> + <assets initial="multisub"> + <presentation id="multisub" src="multisub.uip"/> + <presentation id="subpres1" src="subpres1.uip"/> + <presentation id="subpres11" src="subpres11.uip"/> + </assets> + <statemachine ref="#logic"> + <visual-states> + <state ref="Initial"> + <enter> + <goto-slide element="main:Scene" rel="next"/> + </enter> + </state> + </visual-states> + </statemachine> +</application> diff --git a/tests/scenes/subpres_nested/multisub.uip b/tests/scenes/subpres_nested/multisub.uip new file mode 100644 index 0000000..beccb01 --- /dev/null +++ b/tests/scenes/subpres_nested/multisub.uip @@ -0,0 +1,39 @@ +<?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" > + <Camera id="Camera_001" /> + <Light id="Light_001" /> + </Layer> + <Layer id="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Cube" > + <Material id="Default" name="Default" /> + </Model> + <Text id="Text" /> + </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="#Layer2" name="Layer2" sourcepath="subpres1" /> + <Add ref="#Camera_001" /> + <Add ref="#Light_001" /> + <Add ref="#Cube" name="Cube" position="-184.749 264.992 97.2463" rotation="5.6886 20.4975 -33.0697" sourcepath="#Cube" /> + <Add ref="#Default" /> + <Add ref="#Text" name="Text" font="TitilliumWeb-Regular" position="108.734 236.714 0" textstring="main presentation" /> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/subpres_nested/subpres1.uip b/tests/scenes/subpres_nested/subpres1.uip new file mode 100644 index 0000000..180eb12 --- /dev/null +++ b/tests/scenes/subpres_nested/subpres1.uip @@ -0,0 +1,39 @@ +<?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" bgcolorenable="False" > + <Layer id="Layer2" > + <Camera id="Camera_001" /> + <Light id="Light_001" /> + </Layer> + <Layer id="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Cone" > + <Material id="Default" name="Default" /> + </Model> + <Text id="Text" /> + </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="#Layer2" name="Layer2" sourcepath="subpres11" /> + <Add ref="#Camera_001" /> + <Add ref="#Light_001" /> + <Add ref="#Cone" name="Cone" sourcepath="#Cone" /> + <Add ref="#Default" /> + <Add ref="#Text" name="Text" font="TitilliumWeb-Regular" position="-212.978 21.811 0" textstring="Subpresentation #1" /> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/subpres_nested/subpres11.uip b/tests/scenes/subpres_nested/subpres11.uip new file mode 100644 index 0000000..d33e118 --- /dev/null +++ b/tests/scenes/subpres_nested/subpres11.uip @@ -0,0 +1,32 @@ +<?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" bgcolorenable="False" > + <Layer id="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Text id="Text" /> + <Model id="Cylinder" > + <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="#Text" name="Text" font="TitilliumWeb-Regular" textstring="Nested subpresentation" /> + <Add ref="#Cylinder" name="Cylinder" position="6.92821 -115.47 0" sourcepath="#Cylinder" /> + <Add ref="#Default" /> + </State> + </State> + </Logic> + </Project> +</UIP> |