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

Follow Annotation API changes. 

Change-Id: I9bb7fbe438d942d2cb776ab8cd3d8301a5862524
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Volker Krause 2016-03-18 19:15:41 +01:00
parent c710ac721b
commit d459685dce
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/qt3d/bigscene-instanced-qml/main.qml
View File

@ -99,7 +99,7 @@ Entity {
minorVersion: 2
majorVersion: 3
}
annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
filterKeys: [ FilterKey { name: "renderingStyle"; value: "forward" } ]
renderPasses: RenderPass {
shaderProgram: ShaderProgram {
vertexShaderCode: loadSource("qrc:/instanced.vert")

2
examples/qt3d/planets-qml/CloudEffectDS.qml
View File

@ -76,7 +76,7 @@ Effect {
renderPasses: [
RenderPass {
filterKeys: [ Annotation { name : "pass"; value : "forward" } ]
filterKeys: [ FilterKey { name : "pass"; value : "forward" } ]
shaderProgram: ShaderProgram {
vertexShaderCode: loadSource("qrc:/shaders/gl3/planetD.vert")

2
examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
View File

@ -169,7 +169,7 @@ Material {
},
// TEXTURE PASS + UBO
RenderPass {
filterKeys : [Annotation {name : "Name"; value : "Texture" }]
filterKeys : [FilterKey {name : "Name"; value : "Texture" }]
renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
BlendEquation {blendFunction: BlendEquation.Add},

2
examples/qt3d/shadow-map-qml/doc/src/shadow-map-qml.qdoc
View File

@ -221,7 +221,7 @@
\printuntil }
Inside the technique, we finally have the definition of our two rendering
passes. We \e tag each pass with an \l Annotation entity, matching the ones
passes. We \e tag each pass with an \l FilterKey entity, matching the ones
we specified in the framegraph configuration, so that each pass will have
different rendering settings:

2
examples/qt3d/transparency-qml/main.qml
View File

@ -161,7 +161,7 @@ Entity {
techniques: [
Technique
{
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGL
profile: GraphicsApiFilter.NoProfile

6
src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
View File

@ -99,7 +99,7 @@ Entity {
techniques: [
// GL3 Technique
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGL
profile: GraphicsApiFilter.CoreProfile
@ -116,7 +116,7 @@ Entity {
}
},
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGL
profile: GraphicsApiFilter.NoProfile
@ -132,7 +132,7 @@ Entity {
}
},
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGLES
profile: GraphicsApiFilter.NoProfile

6
src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
View File

@ -82,7 +82,7 @@ Material {
techniques: [
// OpenGL 3.1
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGL
profile: GraphicsApiFilter.CoreProfile
@ -96,7 +96,7 @@ Material {
// GL 2 Technique
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGL
majorVersion: 2
@ -109,7 +109,7 @@ Material {
// ES 2 Technique
Technique {
annotations: [ forward ]
filterKeys: [ forward ]
graphicsApiFilter {
api: GraphicsApiFilter.OpenGLES
profile: GraphicsApiFilter.NoProfile