summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-02-25 15:10:58 +0000
committerRobert Brock <robert.brock@kdab.com>2016-02-26 10:41:38 +0000
commit50e51c827b6cf22e8387631833add6af01d51843 (patch)
tree2440a7ef659446d7287ef44df71415a1dc3a31b7 /examples
parent7e2f9d42eebe13182918d832577c4f5ed96ab87b (diff)
QDepthTest rename func to depthFunction
As per API review Change-Id: Iea3cbdb16618b248e221817000b71822a588bf6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml4
-rw-r--r--examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml2
-rw-r--r--examples/qt3d/planets-qml/PlanetShadowEffectD.qml2
-rw-r--r--examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml2
-rw-r--r--examples/qt3d/playground-qml/ComplexTechnique.qml2
-rw-r--r--examples/qt3d/shadow-map-qml/AdsEffect.qml4
-rw-r--r--examples/qt3d/skybox/Skybox.qml6
-rw-r--r--examples/qt3d/transparency-qml-scene3d/Scene.qml4
-rw-r--r--examples/qt3d/transparency-qml/main.qml4
-rw-r--r--examples/qt3d/wave/WaveEffect.qml2
10 files changed, 16 insertions, 16 deletions
diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
index 3df92f33d..09bf2ce26 100644
--- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
+++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
@@ -73,7 +73,7 @@ Viewport {
StateSet {
renderStates: [
ColorMask { red: true; green: false; blue: false; alpha: false },
- DepthTest { func: DepthTest.Less }
+ DepthTest { depthFunction: DepthTest.Less }
]
}
}
@@ -86,7 +86,7 @@ Viewport {
StateSet {
renderStates: [
ColorMask { red: false; green: true; blue: true; alpha: false },
- DepthTest { func: DepthTest.Less }
+ DepthTest { depthFunction: DepthTest.Less }
]
}
}
diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
index dde9e50d3..e2264588c 100644
--- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
+++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
@@ -67,7 +67,7 @@ Viewport {
ClipPlane { plane: 0 },
ClipPlane { plane: 1 },
ClipPlane { plane: 2 },
- DepthTest { func: DepthTest.LessOrEqual }
+ DepthTest { depthFunction: DepthTest.LessOrEqual }
]
// Branch 1
diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
index 64969553b..578080472 100644
--- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
@@ -87,7 +87,7 @@ Effect {
renderStates: [
PolygonOffset { factor: 4; units: 4 },
- DepthTest { func: DepthTest.Less }
+ DepthTest { depthFunction: DepthTest.Less }
]
},
RenderPass {
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 2e4333bb3..68375d092 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -181,7 +181,7 @@ Material {
renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
BlendEquation {mode: BlendEquation.FuncAdd},
CullFace { mode : CullFace.Back },
- DepthTest { func : DepthTest.LessOrEqual}
+ DepthTest { depthFunction : DepthTest.LessOrEqual}
]
shaderProgram : ShaderProgram {
vertexShaderCode: "
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 5ef66d9a7..3e1e48479 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -156,7 +156,7 @@ Technique {
renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
BlendEquation {mode: BlendEquation.FuncAdd},
CullFace { mode : CullFace.Back },
- DepthTest { func : DepthTest.LessOrEqual}
+ DepthTest { depthFunction : DepthTest.LessOrEqual}
]
shaderProgram : ShaderProgram {
vertexShaderCode: "
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index a3836f429..e136d91fe 100644
--- a/examples/qt3d/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
@@ -93,7 +93,7 @@ Effect {
renderStates: [
PolygonOffset { factor: 4; units: 4 },
- DepthTest { func: DepthTest.Less }
+ DepthTest { depthFunction: DepthTest.Less }
]
},
@@ -138,7 +138,7 @@ Effect {
renderStates: [
PolygonOffset { factor: 4; units: 4 },
- DepthTest { func: DepthTest.Less }
+ DepthTest { depthFunction: DepthTest.Less }
]
},
diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml
index 12c7915f1..05725c49f 100644
--- a/examples/qt3d/skybox/Skybox.qml
+++ b/examples/qt3d/skybox/Skybox.qml
@@ -115,7 +115,7 @@ Entity {
renderStates: [
// cull front faces
CullFace { mode: CullFace.Front },
- DepthTest { func: DepthTest.LessOrEqual }
+ DepthTest { depthFunction: DepthTest.LessOrEqual }
]
}
},
@@ -130,7 +130,7 @@ Entity {
shaderProgram: gl2es2SkyboxShader
renderStates: [
CullFace { mode: CullFace.Front },
- DepthTest { func: DepthTest.LessOrEqual }
+ DepthTest { depthFunction: DepthTest.LessOrEqual }
]
}
},
@@ -145,7 +145,7 @@ Entity {
shaderProgram: gl2es2SkyboxShader
renderStates: [
CullFace { mode: CullFace.Front },
- DepthTest { func: DepthTest.LessOrEqual }
+ DepthTest { depthFunction: DepthTest.LessOrEqual }
]
}
}
diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml
index 1989151e1..a2d24129a 100644
--- a/examples/qt3d/transparency-qml-scene3d/Scene.qml
+++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml
@@ -154,7 +154,7 @@ Entity {
renderPasses: RenderPass {
renderStates: [
CullFace { mode : CullFace.Back },
- DepthTest { func: DepthTest.Less },
+ DepthTest { depthFunction: DepthTest.Less },
DepthMask { mask: false },
BlendState {
srcRGB: BlendState.SrcAlpha
@@ -178,7 +178,7 @@ Entity {
renderPasses: RenderPass {
renderStates: [
CullFace { mode : CullFace.Back },
- DepthTest { func: DepthTest.Less },
+ DepthTest { depthFunction: DepthTest.Less },
DepthMask { mask: false },
BlendState {
srcRGB: BlendState.SrcAlpha
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index f2369d62f..c11b887d8 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -172,7 +172,7 @@ Entity {
renderPasses: RenderPass {
renderStates: [
CullFace { mode : CullFace.Back },
- DepthTest { func: DepthTest.Less },
+ DepthTest { depthFunction: DepthTest.Less },
DepthMask { mask: false },
BlendState {
srcRGB: BlendState.SrcAlpha
@@ -197,7 +197,7 @@ Entity {
renderPasses: RenderPass {
renderStates: [
CullFace { mode : CullFace.Back },
- DepthTest { func: DepthTest.Less },
+ DepthTest { depthFunction: DepthTest.Less },
DepthMask { mask: false },
BlendState {
srcRGB: BlendState.SrcAlpha
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 393a45075..ac132d235 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -98,7 +98,7 @@ Effect {
// Disable depth testing and use simple additive blending
renderStates: [
- DepthTest { func: DepthTest.Always },
+ DepthTest { depthFunction: DepthTest.Always },
DepthMask { mask: true },
BlendState {
srcRGB: BlendState.One