diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2016-02-26 18:21:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 13:19:47 +0000 |
| commit | a5ee671f47464cc687fab86b868dfc8197e3a3fd (patch) | |
| tree | 9b32fe4521ed8fa2436e6b3aeb132801bdb7af84 /examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml | |
| parent | f34ec1fff6c2c62864a86c346e1ecd1364c83293 (diff) | |
Some fixes for examples.
Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings,
remove parameter bindings
Change-Id: I182092d43b0842da07e995387c0fe174d45345df
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml')
| -rw-r--r-- | examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml index 2ba9ddcb4..880ab0b1a 100644 --- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml +++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml @@ -161,13 +161,6 @@ Material { RenderPass { annotations: Annotation {name: "Name"; value: "ColorMaterial"} - bindings: [ // Add only the bindings needed for a shader - ParameterMapping {parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform}, - ParameterMapping {parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapping.Uniform}, - ParameterMapping {parameterName: "lightPos"; shaderVariableName: "lightPosition"; bindingType: ParameterMapping.Uniform}, - ParameterMapping {parameterName: "lightIntensity"; shaderVariableName: "lightIntensity"; bindingType: ParameterMapping.Uniform} - ] - shaderProgram: ShaderProgram { id: diffuseShader vertexShaderCode: loadSource("qrc:/shaders/diffuse.vert") @@ -177,7 +170,6 @@ Material { // TEXTURE PASS + UBO RenderPass { annotations : [Annotation {name : "Name"; value : "Texture" }] - bindings: ParameterMapping {parameterName: "texture"; shaderVariableName: "tex"; bindingType: ParameterMapping.Uniform} renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One}, BlendEquation {blendFunction: BlendEquation.Add}, |