summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-07-26 15:45:23 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-07-27 13:26:42 +0000
commitf6a16988eda3a2631a1934a4550fadf1d1d58dfb (patch)
tree7da49e429ab4a7b7dff812e1f4d6a2e094573804 /tests
parente5c9612429b32ffb9fe336c3d5fe4060fb457e0e (diff)
Add missing scene build steps when dyn.adding entire layers
Change-Id: Idbd015fef9b609c028670f48bd65dca8facffc68 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/scripts/newlayer.drgscr8
-rw-r--r--tests/scripts/newlayer_direct.drgscr8
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/scripts/newlayer.drgscr b/tests/scripts/newlayer.drgscr
index ae7e556..54d1471 100644
--- a/tests/scripts/newlayer.drgscr
+++ b/tests/scripts/newlayer.drgscr
@@ -1,4 +1,5 @@
object(newlayer, newlayer, Layer, null, Slide1)
+// default layer background is Transparent, this is good
object(newlayer_cam, newlayer_cam, Camera, newlayer, Slide1)
// the default position does not work since the property is shared with nodes and those use 0 0 0 as the default,
@@ -8,6 +9,13 @@ set(newlayer_cam, position, 0 0 -600)
// must have a light to see something
object(newlayer_light, newlayer_light, Light, newlayer, Slide1)
+// add a simple model
+object(newlayer_cube, newlayer_cube, Model, newlayer, Slide1)
+set(newlayer_cube, sourcepath, #Cube)
+object(newlayer_cube_mat, newlayer_cube_mat, DefaultMaterial, newlayer_cube, Slide1)
+set(newlayer_cube, position, -200 0 0)
+set(newlayer_cube, rotation, 10 20 0)
+
// add some text
object(newlayer_text, newlayer_text, Text, newlayer, Slide1)
set(newlayer_text, textstring, New Layer!)
diff --git a/tests/scripts/newlayer_direct.drgscr b/tests/scripts/newlayer_direct.drgscr
index 4688a2b..5dbe01d 100644
--- a/tests/scripts/newlayer_direct.drgscr
+++ b/tests/scripts/newlayer_direct.drgscr
@@ -8,6 +8,14 @@ set(newlayer_cam, position, 0 0 -600)
object(newlayer_light, newlayer_light, Light, newlayer, Slide1)
+// model-material is tightly coupled, create them in an atomic step to avoid trouble
+object(newlayer_cube, newlayer_cube, Model, null, Slide1)
+set(newlayer_cube, sourcepath, #Cube)
+object(newlayer_cube_mat, newlayer_cube_mat, DefaultMaterial, newlayer_cube, Slide1)
+set(newlayer_cube, position, -200 0 0)
+set(newlayer_cube, rotation, 10 20 0)
+setparent(newlayer_cube, newlayer)
+
object(newlayer_text, newlayer_text, Text, newlayer, Slide1)
set(newlayer_text, textstring, New Layer!)
set(newlayer_text, textcolor, 0 1 0)