diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-03-16 17:20:37 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-21 19:15:33 +0000 |
| commit | acb32c488b9ad6802b3e8b0d4293ae15748fb65e (patch) | |
| tree | 1c34613ce1c30e3b43f96d5f23c7662720e5af25 /examples | |
| parent | 002bb76d8c8c0c3188d9ce83888cde883627a629 (diff) | |
QDepthMask transformed into QNoDepthMask
By default the absence of a QNoDepthMask node in a RenderStateSet implies
depth mask is enabled. Its presence, disables it.
Change-Id: Iaa22b6cee12ee76e64d66a00e97f8aadfa82398b
Task-number: QTBUG-51433
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/transparency-qml-scene3d/Scene.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/transparency-qml/main.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/wave/WaveEffect.qml | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml index 43c853ebc..72903c9d2 100644 --- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml +++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml @@ -96,7 +96,7 @@ Material { renderPasses: RenderPass { shaderProgram: gl3PhongAlphaShader renderStates: [ - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha @@ -118,7 +118,7 @@ Material { renderPasses: RenderPass { shaderProgram: gl2es2PhongAlphaShader renderStates: [ - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml index 759846b68..618ecc519 100644 --- a/examples/qt3d/transparency-qml-scene3d/Scene.qml +++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml @@ -160,7 +160,7 @@ Entity { renderStates: [ CullFace { mode : CullFace.Back }, DepthTest { depthFunction: DepthTest.Less }, - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha @@ -184,7 +184,7 @@ Entity { renderStates: [ CullFace { mode : CullFace.Back }, DepthTest { depthFunction: DepthTest.Less }, - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml index b9b88b26a..880e80875 100644 --- a/examples/qt3d/transparency-qml/main.qml +++ b/examples/qt3d/transparency-qml/main.qml @@ -173,7 +173,7 @@ Entity { renderStates: [ CullFace { mode : CullFace.Back }, DepthTest { depthFunction: DepthTest.Less }, - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha @@ -198,7 +198,7 @@ Entity { renderStates: [ CullFace { mode : CullFace.Back }, DepthTest { depthFunction: DepthTest.Less }, - DepthMask { mask: false }, + NoDepthMask { }, BlendEquationArguments { sourceRgb: BlendEquationArguments.SourceAlpha destinationRgb: BlendEquationArguments.OneMinusSourceAlpha diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index 5609e6def..cbdcd1a6d 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -94,7 +94,6 @@ Effect { // Disable depth testing and use simple additive blending renderStates: [ DepthTest { depthFunction: DepthTest.Always }, - DepthMask { mask: true }, BlendEquationArguments { sourceRgb: BlendEquationArguments.One destinationRgb: BlendEquationArguments.OneMinusSourceColor |