diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 10:24:41 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:19:59 +0000 |
| commit | 04a5290ddcf3b5f8d1f87c6a2790e62da4574da2 (patch) | |
| tree | 8d1a9ffe366962d8fcd17af0ec5d4a12da81ae99 | |
| parent | 91e6be6dfe775d078029f1abca5acc3e635a67a8 (diff) | |
Fix annotations in QNormalDiffuseSpecularMapMaterial
Change-Id: Id9cd5cacec76f342f5090eecba5f33cad6fd8007
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial.cpp | 13 | ||||
| -rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial_p.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index 6a359a1e2..9a16a660d 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -36,6 +36,7 @@ #include "qnormaldiffusespecularmapmaterial.h" #include "qnormaldiffusespecularmapmaterial_p.h" +#include <Qt3DRender/qannotation.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -76,6 +77,7 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva , m_normalDiffuseSpecularES2RenderPass(new QRenderPass()) , m_normalDiffuseSpecularGL3Shader(new QShaderProgram()) , m_normalDiffuseSpecularGL2ES2Shader(new QShaderProgram()) + , m_annotation(new QAnnotation) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -130,6 +132,15 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setMinorVersion(0); m_normalDiffuseSpecularES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); + Q_Q(QNormalDiffuseSpecularMapMaterial); + m_annotation->setParent(q); + m_annotation->setName(QStringLiteral("renderingStyle")); + m_annotation->setValue("forward"); + + m_normalDiffuseSpecularGL3Technique->addAnnotation(m_annotation); + m_normalDiffuseSpecularGL2Technique->addAnnotation(m_annotation); + m_normalDiffuseSpecularES2Technique->addAnnotation(m_annotation); + m_normalDiffuseSpecularGL3RenderPass->setShaderProgram(m_normalDiffuseSpecularGL3Shader); m_normalDiffuseSpecularGL2RenderPass->setShaderProgram(m_normalDiffuseSpecularGL2ES2Shader); m_normalDiffuseSpecularES2RenderPass->setShaderProgram(m_normalDiffuseSpecularGL2ES2Shader); @@ -149,7 +160,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() m_normalDiffuseSpecularEffect->addParameter(m_shininessParameter); m_normalDiffuseSpecularEffect->addParameter(m_textureScaleParameter); - q_func()->setEffect(m_normalDiffuseSpecularEffect); + q->setEffect(m_normalDiffuseSpecularEffect); } void QNormalDiffuseSpecularMapMaterialPrivate::handleAmbientChanged(const QVariant &var) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h index f3283f85e..e50ef70e6 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -96,6 +97,7 @@ public: QRenderPass *m_normalDiffuseSpecularES2RenderPass; QShaderProgram *m_normalDiffuseSpecularGL3Shader; QShaderProgram *m_normalDiffuseSpecularGL2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial) }; |