diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 11:05:31 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:20:09 +0000 |
| commit | 72ea94f77d2daeb1fd3d6d33508a0c07c599f629 (patch) | |
| tree | ad0f37d001a2fd6f9cca6e4d94f97e5176eee4f3 /src | |
| parent | 75b087b32e7642e6b528dffc61a99f32611b251c (diff) | |
Fix annotations in QDiffuseMapMaterial default
Change-Id: I6400350e8cbb52095859508a900225ee2fd7108f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.cpp | 13 | ||||
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial_p.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index 1188b6ae1..eee245739 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -36,6 +36,7 @@ #include "qdiffusemapmaterial.h" #include "qdiffusemapmaterial_p.h" +#include <Qt3DRender/qannotation.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -73,6 +74,7 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate() , m_diffuseMapES2RenderPass(new QRenderPass()) , m_diffuseMapGL3Shader(new QShaderProgram()) , m_diffuseMapGL2ES2Shader(new QShaderProgram()) + , m_annotation(new QAnnotation) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -114,6 +116,15 @@ void QDiffuseMapMaterialPrivate::init() m_diffuseMapES2Technique->graphicsApiFilter()->setMinorVersion(0); m_diffuseMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); + Q_Q(QDiffuseMapMaterial); + m_annotation->setParent(q); + m_annotation->setName(QStringLiteral("renderingStyle")); + m_annotation->setValue("forward"); + + m_diffuseMapGL3Technique->addAnnotation(m_annotation); + m_diffuseMapGL2Technique->addAnnotation(m_annotation); + m_diffuseMapES2Technique->addAnnotation(m_annotation); + m_diffuseMapGL3RenderPass->setShaderProgram(m_diffuseMapGL3Shader); m_diffuseMapGL2RenderPass->setShaderProgram(m_diffuseMapGL2ES2Shader); m_diffuseMapES2RenderPass->setShaderProgram(m_diffuseMapGL2ES2Shader); @@ -132,7 +143,7 @@ void QDiffuseMapMaterialPrivate::init() m_diffuseMapEffect->addParameter(m_shininessParameter); m_diffuseMapEffect->addParameter(m_textureScaleParameter); - q_func()->setEffect(m_diffuseMapEffect); + q->setEffect(m_diffuseMapEffect); } void QDiffuseMapMaterialPrivate::handleAmbientChanged(const QVariant &var) diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h index cd3473fac..2cbd4fadb 100644 --- a/src/render/defaults/qdiffusemapmaterial_p.h +++ b/src/render/defaults/qdiffusemapmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -91,6 +92,7 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate QRenderPass *m_diffuseMapES2RenderPass; QShaderProgram *m_diffuseMapGL3Shader; QShaderProgram *m_diffuseMapGL2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QDiffuseMapMaterial) }; |