diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 10:38:24 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:20:01 +0000 |
| commit | c31b6bb11f57430c0a065a505d3e8448d55ab34f (patch) | |
| tree | bcd2d80a5098f82ab5ca5f4f773c297a833bc2d3 /src | |
| parent | 04a5290ddcf3b5f8d1f87c6a2790e62da4574da2 (diff) | |
Fix annotations in QNormalDiffuseMapMaterial default
Change-Id: I3da1cb2912efb6be8dc8dbacf3bae915199860ea
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial.cpp | 14 | ||||
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial_p.h | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index a6b358564..d8c3c25d2 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -36,7 +36,7 @@ #include "qnormaldiffusemapmaterial.h" #include "qnormaldiffusemapmaterial_p.h" - +#include <Qt3DRender/qannotation.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qtechnique.h> @@ -76,6 +76,7 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() , m_normalDiffuseES2RenderPass(new QRenderPass()) , m_normalDiffuseGL3Shader(new QShaderProgram()) , m_normalDiffuseGL2ES2Shader(new QShaderProgram()) + , m_annotation(new QAnnotation) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -124,6 +125,15 @@ void QNormalDiffuseMapMaterialPrivate::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("forward"); + + m_normalDiffuseGL3Technique->addAnnotation(m_annotation); + m_normalDiffuseGL2Technique->addAnnotation(m_annotation); + m_normalDiffuseES2Technique->addAnnotation(m_annotation); + m_normalDiffuseGL3RenderPass->setShaderProgram(m_normalDiffuseGL3Shader); m_normalDiffuseGL2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader); m_normalDiffuseES2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader); @@ -143,7 +153,7 @@ void QNormalDiffuseMapMaterialPrivate::init() m_normalDiffuseEffect->addParameter(m_shininessParameter); m_normalDiffuseEffect->addParameter(m_textureScaleParameter); - q_func()->setEffect(m_normalDiffuseEffect); + q->setEffect(m_normalDiffuseEffect); } void QNormalDiffuseMapMaterialPrivate::handleAmbientChanged(const QVariant &var) diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h index ba28d971f..d68212a1d 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -95,6 +96,7 @@ public: QRenderPass *m_normalDiffuseES2RenderPass; QShaderProgram *m_normalDiffuseGL3Shader; QShaderProgram *m_normalDiffuseGL2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QNormalDiffuseMapMaterial) }; |