summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-01-18 07:40:05 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-01-18 10:54:56 +0000
commitd401456e1b1a3d0f4c043137a3cff935c0c8aa0e (patch)
tree0133b4a3b232811fa873dc7d61cc401437b9b67b /src
parenta08a9b922dd626fc554542535b5b86c3d97d2d7c (diff)
Add a RenderSurfaceSelector to ForwardRenderer
In preparation for setting the window automatically from the convenience helper class for window + QML + Qt3D. Change-Id: I78fb3a874e900afe1097920f7ccda9f6aa26734f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
index 308081412..4559a31a9 100644
--- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
+++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
@@ -42,25 +42,29 @@ TechniqueFilter {
property alias camera: cameraSelector.camera
property alias clearColor: viewport.clearColor
property alias viewportRect: viewport.rect
+ property alias window: surfaceSelector.window
// Select the forward rendering Technique of any used Effect
requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
- // Use the whole viewport
- Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0)
- clearColor: "white"
+ RenderSurfaceSelector {
+ id: surfaceSelector
- // Use the specified camera
- CameraSelector {
- id : cameraSelector
- FrustumCulling {
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
+ // Use the whole viewport
+ Viewport {
+ id: viewport
+ rect: Qt.rect(0.0, 0.0, 1.0, 1.0)
+ clearColor: "white"
+
+ // Use the specified camera
+ CameraSelector {
+ id : cameraSelector
+ FrustumCulling {
+ ClearBuffer {
+ buffers : ClearBuffer.ColorDepthBuffer
+ }
}
}
}
}
}
-