diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-31 15:11:31 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-06-02 09:52:01 +0000 |
| commit | a398469e66e3a953097857c60655c41bf291a06b (patch) | |
| tree | 325d44f4dc27d792d64ddbe19644a64691f40c23 /examples | |
| parent | c406cdb2b9bdb05e642a35d55825fd24ef545efc (diff) | |
Fix shadow-map-qml example
In the absence of the ParameterMapper type (removed) we need to
directly specify the correct uniform names.
Task-number: QTBUG-53737
Change-Id: I678ac6f5fab968ee2105f45c8e2d9db66da78293
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/shadow-map-qml/AdsMaterial.qml | 6 | ||||
| -rw-r--r-- | examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/examples/qt3d/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml index 7948b7733..698dae1aa 100644 --- a/examples/qt3d/shadow-map-qml/AdsMaterial.qml +++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml @@ -60,9 +60,9 @@ Material { property real shininess: 150.0 parameters: [ - Parameter { name: "ambient"; value: Qt.vector3d(root.ambientColor.r, root.ambientColor.g, root.ambientColor.b) }, - Parameter { name: "diffuse"; value: Qt.vector3d(root.diffuseColor.r, root.diffuseColor.g, root.diffuseColor.b) }, - Parameter { name: "specular"; value: Qt.vector3d(root.specularColor.r, root.specularColor.g, root.specularColor.b) }, + Parameter { name: "ka"; value: Qt.vector3d(root.ambientColor.r, root.ambientColor.g, root.ambientColor.b) }, + Parameter { name: "kd"; value: Qt.vector3d(root.diffuseColor.r, root.diffuseColor.g, root.diffuseColor.b) }, + Parameter { name: "ks"; value: Qt.vector3d(root.specularColor.r, root.specularColor.g, root.specularColor.b) }, Parameter { name: "shininess"; value: root.shininess } ] } diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 068c93764..5169f6ad2 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -62,10 +62,6 @@ RenderSettings { activeFrameGraph: Viewport { normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) - ClearBuffers { - clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0) - } - RenderSurfaceSelector { RenderPassFilter { matchAny: [ FilterKey { name: "pass"; value: "shadowmap" } ] @@ -105,10 +101,11 @@ RenderSettings { } } - RenderPassFilter { - matchAny: [ FilterKey { name: "pass"; value: "forward" } ] + RenderPassFilter { + matchAny: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffers { + clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0) buffers: ClearBuffers.ColorDepthBuffer CameraSelector { |