diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-04-11 14:42:08 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-04-11 15:32:14 +0000 |
| commit | ae0ba57cff00f068ba729a6c6926b7f93ec059af (patch) | |
| tree | 55992ad8934052bbc7ac7c0ffc665ba1df691dd2 /tests | |
| parent | e52b17e302fa8d6ae09529ab1145d5801564e9e7 (diff) | |
ProgAA: Enable for subpresentations
Change-Id: Ia3d14fa9a59fc3a8cac45f378267ba53fd59eb68
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/progaa/UV-Checker.png | bin | 0 -> 10586 bytes | |||
| -rw-r--r-- | tests/scenes/progaa/progaa_in_subpres_as_image.uia | 16 | ||||
| -rw-r--r-- | tests/scenes/progaa/progaa_in_subpres_as_image.uip | 38 |
3 files changed, 54 insertions, 0 deletions
diff --git a/tests/scenes/progaa/UV-Checker.png b/tests/scenes/progaa/UV-Checker.png Binary files differnew file mode 100644 index 0000000..fd3fa9c --- /dev/null +++ b/tests/scenes/progaa/UV-Checker.png diff --git a/tests/scenes/progaa/progaa_in_subpres_as_image.uia b/tests/scenes/progaa/progaa_in_subpres_as_image.uia new file mode 100644 index 0000000..f50ad82 --- /dev/null +++ b/tests/scenes/progaa/progaa_in_subpres_as_image.uia @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<application> + <assets initial="main"> + <presentation id="main" src="progaa_in_subpres_as_image.uip"/> + <presentation id="subpres1" src="progaa_after_10_sec.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/progaa/progaa_in_subpres_as_image.uip b/tests/scenes/progaa/progaa_in_subpres_as_image.uip new file mode 100644 index 0000000..ce4123f --- /dev/null +++ b/tests/scenes/progaa/progaa_in_subpres_as_image.uip @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<UIP version="3" > + <Project > + <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" 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" /> + <Model id="Cylinder" > + <Material id="Material" /> + </Model> + <Light id="Light" /> + <Model id="Rectangle" > + <Material id="Default" name="Default" > + <Image id="Default_diffusemap" /> + </Material> + </Model> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" background="Transparent" backgroundcolor="0.0392157 0.45098 0.564706" /> + <Add ref="#Camera" /> + <State id="Scene-Slide1" name="Slide1" > + <Add ref="#Cylinder" name="Cylinder" position="525.195 -281.039 147.747" rotation="-26.2701 -25.7819 13.1225" sourcepath="#Cylinder" /> + <Add ref="#Material" /> + <Add ref="#Light" name="Light" position="303.109 95.2628 0" /> + <Add ref="#Rectangle" name="Rectangle" position="10.166 90.9326 0" scale="10.5093 4.40912 1" sourcepath="#Rectangle" /> + <Add ref="#Default" diffusemap="#Default_diffusemap" /> + <Add ref="#Default_diffusemap" sourcepath="UV-Checker.png" subpresentation="subpres1" /> + </State> + </State> + </Logic> + </Project> +</UIP> |
