summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-07-03 11:02:59 +0200
committerSean Harmer <sean.harmer@kdab.com>2014-07-05 17:30:18 +0200
commit6254b64a5934cceeb64c0f75cb51cef10656f423 (patch)
tree78ff0d7667ca11a1abb4442bd62d42d01704d8a0 /examples
parent62000ee72d4cc44152487cb7fcf85fb189b5c521 (diff)
Updated simple-qml to use Layers and LayerFilter
Change-Id: I8c7243490786e08b65ae83b9f2c0e0428c03773d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/simple-qml/ForwardRenderer.qml8
-rw-r--r--examples/simple-qml/main.qml10
2 files changed, 14 insertions, 4 deletions
diff --git a/examples/simple-qml/ForwardRenderer.qml b/examples/simple-qml/ForwardRenderer.qml
index f917f8726..aba8d0404 100644
--- a/examples/simple-qml/ForwardRenderer.qml
+++ b/examples/simple-qml/ForwardRenderer.qml
@@ -57,6 +57,7 @@ TechniqueFilter {
property alias viewportRect: viewport.rect
property alias cameraViewportTopRight: cameraSelectorTopRight.camera
property alias cameraViewportBottomLeft: cameraSelectorBottomLeft.camera
+ property alias layerFilters : layerFilter.layers
criteria : [
TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"}
@@ -73,8 +74,11 @@ TechniqueFilter {
CameraSelector {
id : cameraSelectorTopRight
objectName : "cameraSelector"
- RenderPassFilter { renderPassName: "zFill" }
- RenderPassFilter { renderPassName: "lighting" }
+ LayerFilter {
+ id : layerFilter
+ RenderPassFilter { renderPassName: "zFill" }
+ RenderPassFilter { renderPassName: "lighting" }
+ }
}
}
diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml
index 413af7907..5a8c8688f 100644
--- a/examples/simple-qml/main.qml
+++ b/examples/simple-qml/main.qml
@@ -67,6 +67,7 @@ Node {
ball2.mesh = test ? null : ballMesh
ball1.mesh = test ? cubeMesh : ballMesh
test = !test
+ external_forward_renderer.activeFrameGraph.layerFilters = test ? ["balls"] : []
}
}
@@ -359,6 +360,8 @@ Node {
objectName: "dae_scene"
}
+ Layer { id: ballLayer; name : "balls" }
+
Entity {
id: ball
objectName: "ball"
@@ -372,10 +375,12 @@ Node {
components : [
transform,
ballMesh,
- ballMaterial
+ ballMaterial,
+ ballLayer
]
}
+
Entity {
id: ball1
objectName: "ball1"
@@ -389,7 +394,8 @@ Node {
components: [
transform,
mesh,
- ballTexturedMaterial
+ ballTexturedMaterial,
+ ballLayer
]
}