Port wave and wireframe examples away from ParameterMapping.

Change-Id: I2535623ffb1898a019f471876e0420e43b7d4a8e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 10 insertions, 22 deletions

diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index ac132d235..9d358d08b 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -65,8 +65,8 @@ Effect {
     //
     // Material -> Effect -> Technique -> RenderPass -> GLSL default values
     parameters: [
-        Parameter { name: "ambient"; value: Qt.vector3d( 0.1, 0.1, 0.1 ) },
-        Parameter { name: "diffuse"; value: Qt.vector3d( 0.7, 0.7, 0.7 ) }
+        Parameter { name: "ka"; value: Qt.vector3d( 0.1, 0.1, 0.1 ) },
+        Parameter { name: "kd"; value: Qt.vector3d( 0.7, 0.7, 0.7 ) }
     ]
 
     techniques: [
@@ -89,11 +89,6 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    bindings: [
-                        ParameterMapping { parameterName: "ambient";  shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform },
-                        ParameterMapping { parameterName: "diffuse";  shaderVariableName: "kd"; bindingType: ParameterMapping.Uniform }
-                    ]
-
                     shaderProgram: wireframe ? wireframeShader : standardShader
 
                     // Disable depth testing and use simple additive blending
diff --git a/examples/qt3d/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml
index e10a1c9d9..efec8d8e7 100644
--- a/examples/qt3d/wave/WaveMaterial.qml
+++ b/examples/qt3d/wave/WaveMaterial.qml
@@ -63,8 +63,8 @@ Material {
     effect: WaveEffect { id: effect }
 
     parameters: [
-        Parameter { name: "ambient"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) },
-        Parameter { name: "diffuse"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) },
+        Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) },
+        Parameter { name: "kd"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) },
         Parameter { name: "line.width"; value: root.lineWidth },
         Parameter { name: "line.color"; value: root.lineColor }
     ]
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index 06252f6c5..4caa6e735 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -55,9 +55,9 @@ Effect {
     id: root
 
     parameters: [
-        Parameter { name: "ambient";   value: Qt.vector3d( 0.1, 0.1, 0.1 ) },
-        Parameter { name: "diffuse";   value: Qt.vector3d( 0.7, 0.7, 0.7 ) },
-        Parameter { name: "specular";  value: Qt.vector3d( 0.95, 0.95, 0.95 ) },
+        Parameter { name: "ka";   value: Qt.vector3d( 0.1, 0.1, 0.1 ) },
+        Parameter { name: "kd";   value: Qt.vector3d( 0.7, 0.7, 0.7 ) },
+        Parameter { name: "ks";  value: Qt.vector3d( 0.95, 0.95, 0.95 ) },
         Parameter { name: "shininess"; value: 150.0 }
     ]
 
@@ -81,13 +81,6 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-
-                    bindings: [
-                        ParameterMapping { parameterName: "ambient";  shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform },
-                        ParameterMapping { parameterName: "diffuse";  shaderVariableName: "kd"; bindingType: ParameterMapping.Uniform },
-                        ParameterMapping { parameterName: "specular"; shaderVariableName: "ks"; bindingType: ParameterMapping.Uniform }
-                    ]
-
                     shaderProgram: ShaderProgram {
                         vertexShaderCode:   loadSource("qrc:/shaders/robustwireframe.vert")
                         geometryShaderCode: loadSource("qrc:/shaders/robustwireframe.geom")
diff --git a/examples/qt3d/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml
index 05efe3c8b..96b00497a 100644
--- a/examples/qt3d/wireframe/WireframeMaterial.qml
+++ b/examples/qt3d/wireframe/WireframeMaterial.qml
@@ -62,9 +62,9 @@ Material {
     property color lineColor: Qt.rgba( 0.0, 0.0, 0.0, 1.0 )
 
     parameters: [
-        Parameter { name: "ambient"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) },
-        Parameter { name: "diffuse"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) },
-        Parameter { name: "specular"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) },
+        Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) },
+        Parameter { name: "kd"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) },
+        Parameter { name: "ksp"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) },
         Parameter { name: "shininess"; value: root.shininess },
         Parameter { name: "line.width"; value: root.lineWidth },
         Parameter { name: "line.color"; value: root.lineColor }