From a5ee671f47464cc687fab86b868dfc8197e3a3fd Mon Sep 17 00:00:00 2001
From: Wieland Hagen <wieland.hagen@kdab.com>
Date: Fri, 26 Feb 2016 18:21:20 +0100
Subject: Some fixes for examples.

Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings,
remove parameter bindings

Change-Id: I182092d43b0842da07e995387c0fe174d45345df
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 .../qt3d/shadow-map-qml/ShadowMapFrameGraph.qml    | 74 +++++++++++-----------
 1 file changed, 38 insertions(+), 36 deletions(-)

(limited to 'examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml')

diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 7183b4e3b..956f19ef6 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -52,7 +52,7 @@ import QtQuick 2.2 as QQ2
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 
-FrameGraph {
+RenderSettings {
     id: root
 
     property alias viewCamera: viewCameraSelector.camera
@@ -63,52 +63,54 @@ FrameGraph {
         normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0)
         clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0)
 
-        RenderPassFilter {
-            includes: [ Annotation { name: "pass"; value: "shadowmap" } ]
+        RenderSurfaceSelector {
+            RenderPassFilter {
+                includes: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
-            RenderTargetSelector {
-                target: RenderTarget {
-                    outputs: [
-                        RenderTargetOutput {
-                            objectName: "depth"
-                            attachmentPoint: RenderTargetOutput.Depth
-                            texture: Texture2D {
-                                id: depthTexture
-                                width: 1024
-                                height: 1024
-                                format: Texture.DepthFormat
-                                generateMipMaps: false
-                                magnificationFilter: Texture.Linear
-                                minificationFilter: Texture.Linear
-                                wrapMode {
-                                    x: WrapMode.ClampToEdge
-                                    y: WrapMode.ClampToEdge
+                RenderTargetSelector {
+                    target: RenderTarget {
+                        outputs: [
+                            RenderTargetOutput {
+                                objectName: "depth"
+                                attachmentPoint: RenderTargetOutput.Depth
+                                texture: Texture2D {
+                                    id: depthTexture
+                                    width: 1024
+                                    height: 1024
+                                    format: Texture.DepthFormat
+                                    generateMipMaps: false
+                                    magnificationFilter: Texture.Linear
+                                    minificationFilter: Texture.Linear
+                                    wrapMode {
+                                        x: WrapMode.ClampToEdge
+                                        y: WrapMode.ClampToEdge
+                                    }
+                                    comparisonFunction: Texture.CompareLessEqual
+                                    comparisonMode: Texture.CompareRefToTexture
                                 }
-                                comparisonFunction: Texture.CompareLessEqual
-                                comparisonMode: Texture.CompareRefToTexture
                             }
-                        }
-                    ]
-                }
+                        ]
+                    }
 
-                ClearBuffer {
-                    buffers: ClearBuffer.DepthBuffer
+                    ClearBuffer {
+                        buffers: ClearBuffer.DepthBuffer
 
-                    CameraSelector {
-                        id: lightCameraSelector
+                        CameraSelector {
+                            id: lightCameraSelector
+                        }
                     }
                 }
             }
-        }
 
-        RenderPassFilter {
-            includes: [ Annotation { name: "pass"; value: "forward" } ]
+            RenderPassFilter {
+                includes: [ Annotation { name: "pass"; value: "forward" } ]
 
-            ClearBuffer {
-                buffers: ClearBuffer.ColorDepthBuffer
+                ClearBuffer {
+                    buffers: ClearBuffer.ColorDepthBuffer
 
-                CameraSelector {
-                    id: viewCameraSelector
+                    CameraSelector {
+                        id: viewCameraSelector
+                    }
                 }
             }
         }
-- 
cgit v1.2.3