diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-07-25 12:55:50 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-26 13:17:22 +0200 |
| commit | 5a86d31a6cd660cdf367a78bf1287b032ef49606 (patch) | |
| tree | 8d0971fe01703f3b21ad58217414cc5d1af3decc /examples | |
| parent | b1ef9f55e4b66565dd7c9e17262e921cbee58b20 (diff) | |
Fix rollerball example by adding openGLFilter to technique
Plus a few whitespace cleanups - yes sanity bot will complain
Change-Id: Id6954ca267158a6b96c798cbdef11d11e8332b66
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/rollerball/AdsEffect.qml | 21 | ||||
| -rw-r--r-- | examples/rollerball/ForwardRenderer.qml | 3 |
2 files changed, 15 insertions, 9 deletions
diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml index 45ba42675..e47cc8eaf 100644 --- a/examples/rollerball/AdsEffect.qml +++ b/examples/rollerball/AdsEffect.qml @@ -69,18 +69,23 @@ Effect { techniques: [ Technique { - criteria : [ - Criterion { name : "RenderingStyle"; value : "forward"} - ] + openGLFilter { + api: OpenGLFilter.Desktop + profile: OpenGLFilter.Core + majorVersion: 3 + minorVersion: 1 + } + + criteria: [ Criterion { name : "renderingStyle"; value : "forward" } ] - parameters : [ + parameters: [ Parameter { name: "lightPosition"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) }, Parameter { name: "lightIntensity"; value: Qt.vector3d( 0.7, 0.7, 0.7 ) } ] renderPasses: [ RenderPass { - criteria: [] + name: "lighting" // The bindings property allows us to map from names of parameters (uniforms or vertex attributes) // within a shader to more friendly names in QML. By default the parameter names are exposed from @@ -88,9 +93,9 @@ Effect { // ka uniform name in the shader to a property called ambient bindings: [ // Uniforms (those provided by the user) - ParameterMapper { parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapper.Uniform}, - ParameterMapper { parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapper.Uniform}, - ParameterMapper { parameterName: "specular"; shaderVariableName: "ks"; bindingType: ParameterMapper.Uniform} + ParameterMapper { parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapper.Uniform }, + ParameterMapper { parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapper.Uniform }, + ParameterMapper { parameterName: "specular"; shaderVariableName: "ks"; bindingType: ParameterMapper.Uniform } ] shaderProgram: ShaderProgram { diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml index d728986f8..ed7eb5cf6 100644 --- a/examples/rollerball/ForwardRenderer.qml +++ b/examples/rollerball/ForwardRenderer.qml @@ -50,7 +50,8 @@ TechniqueFilter { property alias camera: cameraSelector.camera // Select the forward rendering Technique of any used Effect - criteria : [Criterion { name : "RenderingStyle"; value : "forward"}] + criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ] + // Use the whole viewport Viewport { id: viewport |