diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /src/render/defaults/qdiffusespecularmapmaterial.cpp | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 75d6c8de2..b1bc840c1 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -39,7 +39,7 @@ #include "qdiffusespecularmapmaterial.h" #include "qdiffusespecularmapmaterial_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> @@ -74,7 +74,7 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() , m_diffuseSpecularMapES2RenderPass(new QRenderPass()) , m_diffuseSpecularMapGL3Shader(new QShaderProgram()) , m_diffuseSpecularMapGL2ES2Shader(new QShaderProgram()) - , m_annotation(new QAnnotation) + , m_filterKey(new QFilterKey) { m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); @@ -123,13 +123,13 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); Q_Q(QDiffuseSpecularMapMaterial); - m_annotation->setParent(q); - m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue(QStringLiteral("forward")); + m_filterKey->setParent(q); + m_filterKey->setName(QStringLiteral("renderingStyle")); + m_filterKey->setValue(QStringLiteral("forward")); - m_diffuseSpecularMapGL3Technique->addAnnotation(m_annotation); - m_diffuseSpecularMapGL2Technique->addAnnotation(m_annotation); - m_diffuseSpecularMapES2Technique->addAnnotation(m_annotation); + m_diffuseSpecularMapGL3Technique->addFilterKey(m_filterKey); + m_diffuseSpecularMapGL2Technique->addFilterKey(m_filterKey); + m_diffuseSpecularMapES2Technique->addFilterKey(m_filterKey); m_diffuseSpecularMapGL3RenderPass->setShaderProgram(m_diffuseSpecularMapGL3Shader); m_diffuseSpecularMapGL2RenderPass->setShaderProgram(m_diffuseSpecularMapGL2ES2Shader); |