Some fixes for examples.

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

Change-Id: I182092d43b0842da07e995387c0fe174d45345df
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

8 files changed, 5 insertions, 182 deletions

diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index d863562c7..c0f01d093 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -77,14 +77,6 @@ Effect {
             renderPasses: [
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
@@ -107,15 +99,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDS.frag")
@@ -138,15 +121,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDS.frag")
diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml
index 0d3003f9f..0e556741f 100644
--- a/examples/qt3d/planets-qml/PlanetEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectD.qml
@@ -79,20 +79,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/gl3/planetD.frag")
@@ -114,20 +100,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetD.frag")
@@ -150,20 +122,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetD.frag")
diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml
index c3c1906be..15e38dd7d 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml
@@ -79,20 +79,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/gl3/planetDB.frag")
@@ -114,20 +100,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDB.frag")
@@ -150,20 +122,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDB.frag")
diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
index 38ca581b8..f45d66dba 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
@@ -79,15 +79,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/gl3/planetDSB.frag")
@@ -109,15 +100,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDSB.frag")
@@ -140,15 +122,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetDB.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetDSB.frag")
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 1495c33d6..963cee7f5 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -52,7 +52,7 @@
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 
-FrameGraph {
+RenderSettings {
     id: root
 
     property alias viewCamera: viewCameraSelector.camera
diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
index d4ec48090..d314863c9 100644
--- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
@@ -93,20 +93,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/gl3/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/gl3/planetD.frag")
@@ -128,20 +114,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetD.frag")
@@ -164,20 +136,6 @@ Effect {
                 RenderPass {
                     annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
-                    bindings: [
-                        // Uniforms (those provided by the user)
-                        ParameterMapping {
-                            parameterName: "ambient";
-                            shaderVariableName: "ka";
-                            bindingType: ParameterMapping.Uniform
-                        },
-                        ParameterMapping {
-                            parameterName: "specular";
-                            shaderVariableName: "ks";
-                            bindingType: ParameterMapping.Uniform
-                        }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/es2/planetD.vert")
                         fragmentShaderCode: loadSource("qrc:/shaders/es2/planetD.frag")
diff --git a/examples/qt3d/planets-qml/PlanetsMain.qml b/examples/qt3d/planets-qml/PlanetsMain.qml
index 3228a20fc..f6e8db05b 100644
--- a/examples/qt3d/planets-qml/PlanetsMain.qml
+++ b/examples/qt3d/planets-qml/PlanetsMain.qml
@@ -66,7 +66,7 @@ Item {
     //! [0]
     Scene3D {
         anchors.fill: parent
-        aspects: ["render", "logic"]
+        aspects: ["render", "logic", "input"]
         focus: true
 
         SolarSystem { id: solarsystem }
diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml
index 3f77d7ce8..b87d5fe3c 100644
--- a/examples/qt3d/planets-qml/SolarSystem.qml
+++ b/examples/qt3d/planets-qml/SolarSystem.qml
@@ -51,6 +51,7 @@
 import QtQuick 2.0 as QQ2
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
+import Qt3D.Input 2.0
 import Qt3D.Logic 2.0
 
 import "planets.js" as Planets
@@ -145,7 +146,8 @@ Entity {
             id: framegraph
             viewCamera: camera
             lightCamera: light.lightCamera
-        }
+        },
+        InputSettings {}
     ]
 
     CloudEffectDS {