diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 10:57:33 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:20:04 +0000 |
commit | 081c2c4e82ad4efd6cd16c4e843069d5beb76261 (patch) | |
tree | 88818ddb6f0703f33f7c7bcdc70cdd0b7a4ad73d /src | |
parent | c31b6bb11f57430c0a065a505d3e8448d55ab34f (diff) |
Fix annotations for QGoochMaterial default
Change-Id: I5cb3fb08fd9208e7e452e04cb4976033d091202d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/render/defaults/qgoochmaterial.cpp | 11 | ||||
-rw-r--r-- | src/render/defaults/qgoochmaterial_p.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index 81d76bdbb..0388dcc4e 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -36,7 +36,7 @@ #include "qgoochmaterial.h" #include "qgoochmaterial_p.h" - +#include <Qt3DRender/qannotation.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qparameter.h> @@ -71,6 +71,7 @@ QGoochMaterialPrivate::QGoochMaterialPrivate() , m_es2RenderPass(new QRenderPass) , m_gl3Shader(new QShaderProgram) , m_gl2ES2Shader(new QShaderProgram) + , m_annotation(new QAnnotation) { } @@ -113,6 +114,14 @@ void QGoochMaterialPrivate::init() m_es2Technique->graphicsApiFilter()->setMinorVersion(0); m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); + m_annotation->setParent(q); + m_annotation->setName(QStringLiteral("renderingStyle")); + m_annotation->setValue("forward"); + + m_gl3Technique->addAnnotation(m_annotation); + m_gl2Technique->addAnnotation(m_annotation); + m_es2Technique->addAnnotation(m_annotation); + m_gl3RenderPass->setShaderProgram(m_gl3Shader); m_gl2RenderPass->setShaderProgram(m_gl2ES2Shader); m_es2RenderPass->setShaderProgram(m_gl2ES2Shader); diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h index 5d1c56280..6d028e0ff 100644 --- a/src/render/defaults/qgoochmaterial_p.h +++ b/src/render/defaults/qgoochmaterial_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAnnotation; class QEffect; class QRenderPass; class QShaderProgram; @@ -90,6 +91,7 @@ public: QRenderPass *m_es2RenderPass; QShaderProgram *m_gl3Shader; QShaderProgram *m_gl2ES2Shader; + QAnnotation *m_annotation; Q_DECLARE_PUBLIC(QGoochMaterial) }; |