qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sean Harmer 2016-05-31 15:11:31 +01:00 committed by Jani Heikkinen
parent c406cdb2b9
commit a398469e66
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/qt3d/shadow-map-qml/AdsMaterial.qml
View File

@ -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 }
]
}

9
examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
View File

@ -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 {