diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 11:00:32 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:20:06 +0000 |
| commit | 75b087b32e7642e6b528dffc61a99f32611b251c (patch) | |
| tree | bbd5fbf251e7a8ff4598781fdf8894414975f2a5 /src | |
| parent | 081c2c4e82ad4efd6cd16c4e843069d5beb76261 (diff) | |
Fix annotations in QDiffuseSpecularMapMaterial default
Change-Id: I42a2ef40d274dab27971a17611dd5dd058e67653
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 14 | ||||
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial_p.h | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 21f68ea98..18a78db3f 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -36,7 +36,7 @@ #include "qdiffusespecularmapmaterial.h" #include "qdiffusespecularmapmaterial_p.h" - +#include <Qt3DRender/qannotation.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -75,6 +75,7 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() , m_diffuseSpecularMapES2RenderPass(new QRenderPass()) , m_diffuseSpecularMapGL3Shader(new QShaderProgram()) , m_diffuseSpecularMapGL2ES2Shader(new QShaderProgram()) + , m_annotation(new QAnnotation) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -122,6 +123,15 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setMinorVersion(0); m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); + Q_Q(QDiffuseSpecularMapMaterial); + m_annotation->setParent(q); + m_annotation->setName(QStringLiteral("renderingStyle")); + m_annotation->setValue("forward"); + + m_diffuseSpecularMapGL3Technique->addAnnotation(m_annotation); + m_diffuseSpecularMapGL2Technique->addAnnotation(m_annotation); + m_diffuseSpecularMapES2Technique->addAnnotation(m_annotation); + m_diffuseSpecularMapGL3RenderPass->setShaderProgram(m_diffuseSpecularMapGL3Shader); m_diffuseSpecularMapGL2RenderPass->setShaderProgram(m_diffuseSpecularMapGL2ES2Shader); m_diffuseSpecularMapES2RenderPass->setShaderProgram(m_diffuseSpecularMapGL2ES2Shader); @@ -140,7 +150,7 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapEffect->addParameter(m_shininessParameter); m_diffuseSpecularMapEffect->addParameter(m_textureScaleParameter); - q_func()->setEffect(m_diffuseSpecularMapEffect); + q->setEffect(m_diffuseSpecularMapEffect); } void QDiffuseSpecularMapMaterialPrivate::handleAmbientChanged(const QVariant &var) diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h index b6fb01a91..6bfa7636f 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -93,6 +94,7 @@ public: QRenderPass *m_diffuseSpecularMapES2RenderPass; QShaderProgram *m_diffuseSpecularMapGL3Shader; QShaderProgram *m_diffuseSpecularMapGL2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QDiffuseSpecularMapMaterial) }; |