From 2dbfc82a8e16e227cf9abb72f8c3b6d9b5be3ffe Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 2 Mar 2016 16:52:31 +0100 Subject: Port wave and wireframe examples away from ParameterMapping. Change-Id: I2535623ffb1898a019f471876e0420e43b7d4a8e Reviewed-by: Paul Lemire --- examples/qt3d/wireframe/WireframeEffect.qml | 13 +++---------- examples/qt3d/wireframe/WireframeMaterial.qml | 6 +++--- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'examples/qt3d/wireframe') 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 } -- cgit v1.2.3