diff options
Diffstat (limited to 'examples/qt3d/wave')
-rw-r--r-- | examples/qt3d/wave/WaveEffect.qml | 9 | ||||
-rw-r--r-- | examples/qt3d/wave/WaveMaterial.qml | 4 |
2 files changed, 4 insertions, 9 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 } ] |