diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-28 08:31:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 11:15:35 +0000 |
| commit | bfc4432f4deccb6b1287e4cc0d4aa8e34ea810c1 (patch) | |
| tree | 62031b56bb903796df11f84a6df8215effe9ea8c /src/render/defaults/qdiffusemapmaterial.cpp | |
| parent | f49cabe35cbd89bd4e5a0e91100a96afdb5d8401 (diff) | |
QTexture renamed to QAbstractTextureProvider
This is done prior to the whole texture API refactoring.
Doc was also added, might need improvement later on but a base is present at
least.
Change-Id: I75589f14dfbfba7bc4250b2e0960670e020ed38a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusemapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index d32633cc0..8b16b8f4a 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -60,7 +60,7 @@ namespace Qt3D { QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq) : QMaterialPrivate(qq) , m_diffuseMapEffect(new QEffect()) - , m_diffuseTexture(new QTexture(QTexture::Target2D)) + , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D)) , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f))) , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture)) , m_specularParameter(new QParameter(QStringLiteral("ks"), QColor::fromRgbF(0.95f, 0.95f, 0.95f, 1.0f))) @@ -77,8 +77,8 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq) , m_diffuseMapGL3Shader(new QShaderProgram()) , m_diffuseMapGL2ES2Shader(new QShaderProgram()) { - m_diffuseTexture->setMagnificationFilter(QTexture::Linear); - m_diffuseTexture->setMinificationFilter(QTexture::LinearMipMapLinear); + m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); + m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); m_diffuseTexture->setGenerateMipMaps(true); m_diffuseTexture->setMaximumAnisotropy(16.0f); @@ -209,10 +209,10 @@ float QDiffuseMapMaterial::shininess() const the wrap mode is repeat, the maximum anisotropy is set to 16.0 and mipmapping is enabled. */ -QTexture *QDiffuseMapMaterial::diffuse() const +QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const { Q_D(const QDiffuseMapMaterial); - return d->m_diffuseParameter->value().value<QTexture *>(); + return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>(); } /*! @@ -259,7 +259,7 @@ void QDiffuseMapMaterial::setShininess(float shininess) \fn Qt3D::QDiffuseMapMaterial::setDiffuse(QTexture *diffuseMap) Sets the current diffuse map to \a diffuseMap. */ -void QDiffuseMapMaterial::setDiffuse(QTexture *diffuseMap) +void QDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuseMap) { Q_D(QDiffuseMapMaterial); d->m_diffuseParameter->setValue(QVariant::fromValue(diffuseMap)); |