summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@qt.io>2018-04-25 17:29:56 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-04-27 07:33:33 +0000
commitea2f9437fdfb608dbc42255f8e7427e2ac811426 (patch)
tree66391f02719a15b3456e83b87e6395af9d17ba84 /tests
parent3bd3d3c76e0212e6d205fe9696f082adfd8ba788 (diff)
Add lancelot tests for alias nodes and scoped lights
Also extend the timeout for the 1.x scenegrabber since some tests take longer to load that we were waiting for timeouts. Change-Id: I5b602572622b0aa163e753320346b6b6fd95dc78 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/q3dslancelot/data/lighting/scopedLights.uip47
-rw-r--r--tests/auto/q3dslancelot/data/primitives/aliasNodes.uip70
-rw-r--r--tests/auto/q3dslancelot/oldscenegrabber/main.cpp2
3 files changed, 118 insertions, 1 deletions
diff --git a/tests/auto/q3dslancelot/data/lighting/scopedLights.uip b/tests/auto/q3dslancelot/data/lighting/scopedLights.uip
new file mode 100644
index 0000000..5d7ef1c
--- /dev/null
+++ b/tests/auto/q3dslancelot/data/lighting/scopedLights.uip
@@ -0,0 +1,47 @@
+<?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="Layer2" >
+ <Camera id="Camera_001" />
+ <Model id="Cube_001" >
+ <Material id="Default_002" name="Default" />
+ </Model>
+ </Layer>
+ <Layer id="Layer" >
+ <Camera id="Camera" />
+ <Light id="Light" />
+ <Model id="Cube" >
+ <Material id="Default" name="Default" />
+ </Model>
+ <Model id="Cube2" >
+ <Material id="Default_001" name="Default" />
+ </Model>
+ <Light id="Light2" />
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" >
+ <Add ref="#Layer" />
+ <Add ref="#Camera" />
+ <Add ref="#Light" lightdiffuse="0.486275 0.992157 1" scope="#Cube" shdwfilter="36.98" />
+ <Add ref="#Cube" name="Cube" position="-284.867 0 0" sourcepath="#Cube" />
+ <Add ref="#Default" />
+ <Add ref="#Cube2" name="Cube2" position="340.036 0 0" sourcepath="#Cube" />
+ <Add ref="#Default_001" />
+ <Add ref="#Light2" name="Light2" lightdiffuse="0.682353 0.682353 1" scope="#Cube2" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Add ref="#Layer2" name="Layer2" />
+ <Add ref="#Camera_001" />
+ <Add ref="#Cube_001" name="Cube" position="0 169.409 0" sourcepath="#Cube" />
+ <Add ref="#Default_002" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/auto/q3dslancelot/data/primitives/aliasNodes.uip b/tests/auto/q3dslancelot/data/primitives/aliasNodes.uip
new file mode 100644
index 0000000..6c78922
--- /dev/null
+++ b/tests/auto/q3dslancelot/data/primitives/aliasNodes.uip
@@ -0,0 +1,70 @@
+<?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" />
+ <Alias id="Alias" referencednode="#Cone" />
+ <Model id="Cone" >
+ <Material id="Default" name="Default" />
+ <Model id="Cylinder" >
+ <Material id="Default_001" name="Default" />
+ </Model>
+ </Model>
+ <Model id="Cube" >
+ <Material id="Default_002" name="Default" />
+ <Model id="Sphere" >
+ <Material id="Default_003" name="Default" />
+ </Model>
+ </Model>
+ <Alias id="Alias2" referencednode="#Cube" />
+ <Alias id="Alias3" referencednode="#Cube" />
+ <Component id="Component" >
+ <Alias id="Alias_001" referencednode="#Cone" />
+ </Component>
+ </Layer>
+ </Scene>
+ </Graph>
+ <Logic >
+ <State name="Master Slide" component="#Scene" playmode="Looping" >
+ <Add ref="#Layer" endtime="2000" />
+ <Add ref="#Camera" endtime="2000" />
+ <Add ref="#Light" endtime="2000" />
+ <Add ref="#Cube" name="Cube" endtime="2000" position="-406.711 -191.167 0" rotation="-29.6396 -9.23137 4.84142" scale="1.13842 0.98 1.47" sourcepath="#Cube" />
+ <Add ref="#Default_002" />
+ <Add ref="#Sphere" name="Sphere" endtime="2000" position="0 50 0" sourcepath="#Sphere" />
+ <Add ref="#Default_003" />
+ <Add ref="#Alias2" name="Alias2" endtime="2000" position="314.27 143.707 0" />
+ <State id="Scene-Slide1" name="Slide1" >
+ <Set ref="#Sphere" position="0 50 0" />
+ <Add ref="#Alias" name="Alias" position="256.58 0 0" >
+ <Action id="Alias-Action" eyeball="True" triggerObject="#Alias" event="onPressureDown" targetObject="#Alias" handler="Set Property" >
+ <HandlerArgument name="Property Name" type="String" argtype="Property" value="position" />
+ <HandlerArgument name="Property Value" type="Float3" argtype="Dependent" />
+ </Action>
+ </Add>
+ <Add ref="#Cone" name="Cone" position="-304.023 0 0" sourcepath="#Cone" />
+ <Add ref="#Default" />
+ <Add ref="#Cylinder" name="Cylinder" position="0 -49.867 0" sourcepath="#Cylinder" />
+ <Add ref="#Default_001" />
+ <Add ref="#Alias3" name="Alias3" rotation="-90 0 0" >
+ <Action id="Alias3-Action" eyeball="True" triggerObject="#Alias3" event="onPressureDown" targetObject="#Scene" handler="Go to Slide" >
+ <HandlerArgument name="Slide" type="String" argtype="Slide" value="Slide2" />
+ </Action>
+ </Add>
+ <Add ref="#Component" name="Component" position="0 -214.265 0" />
+ </State>
+ </State>
+ <State name="Master Slide" component="#Component" >
+ <State id="Component-Slide1" name="Slide1" >
+ <Add ref="#Alias_001" name="Alias" rotation="-38 0 0" />
+ </State>
+ </State>
+ </Logic>
+ </Project>
+</UIP>
diff --git a/tests/auto/q3dslancelot/oldscenegrabber/main.cpp b/tests/auto/q3dslancelot/oldscenegrabber/main.cpp
index e942a9b..429fdc4 100644
--- a/tests/auto/q3dslancelot/oldscenegrabber/main.cpp
+++ b/tests/auto/q3dslancelot/oldscenegrabber/main.cpp
@@ -47,7 +47,7 @@
#define SCENE_STABLE_TIME 200
// Give up after SCENE_TIMEOUT ms
-#define SCENE_TIMEOUT 6000
+#define SCENE_TIMEOUT 15000
class Grabber : public QObject
{