diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 13:36:24 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 19:55:55 +0000 |
commit | 4304ef556d7725fba354eb5e4f10f39241f42fe3 (patch) | |
tree | cc11eff6150e6936036749561e2f54a1ec394947 /src/render/defaults/qnormaldiffusemapalphamaterial.cpp | |
parent | aa1eafa8895418776542d2192421d8758ffa1d84 (diff) |
Add annotations to QNormalDiffuseMapAlphaMaterial default
Change-Id: Idac0899f153254c26ed5a07761179c01504fd49f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusemapalphamaterial.cpp')
-rw-r--r-- | src/render/defaults/qnormaldiffusemapalphamaterial.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index bd438b3a3..e73856744 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -89,6 +89,15 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() m_normalDiffuseES2Technique->graphicsApiFilter()->setMinorVersion(0); m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); + Q_Q(QNormalDiffuseMapMaterial); + m_annotation->setParent(q); + m_annotation->setName(QStringLiteral("renderingStyle")); + m_annotation->setValue(QStringLiteral("forward")); + + m_normalDiffuseGL3Technique->addAnnotation(m_annotation); + m_normalDiffuseGL2Technique->addAnnotation(m_annotation); + m_normalDiffuseES2Technique->addAnnotation(m_annotation); + m_depthTest->setFunc(QDepthTest::Less); m_normalDiffuseGL3RenderPass->setShaderProgram(m_normalDiffuseGL3Shader); @@ -118,7 +127,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() m_normalDiffuseEffect->addParameter(m_shininessParameter); m_normalDiffuseEffect->addParameter(m_textureScaleParameter); - q_func()->setEffect(m_normalDiffuseEffect); + q->setEffect(m_normalDiffuseEffect); } |