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/qnormaldiffusemapmaterial.h | |
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/qnormaldiffusemapmaterial.h')
-rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 34c1cf7c3..5c6320113 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QTexture; +class QAbstractTextureProvider; class QNormalDiffuseMapMaterialPrivate; class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial @@ -57,8 +57,8 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) Q_PROPERTY(QColor specular READ specular WRITE setSpecular NOTIFY specularChanged) - Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) - Q_PROPERTY(QTexture *normal READ normal WRITE setNormal NOTIFY normalChanged) + Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged) Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) @@ -68,15 +68,15 @@ public: QColor ambient() const; QColor specular() const; - QTexture *diffuse() const; - QTexture *normal() const; + QAbstractTextureProvider *diffuse() const; + QAbstractTextureProvider *normal() const; float shininess() const; float textureScale() const; void setAmbient(const QColor &ambient); void setSpecular(const QColor &specular); - void setDiffuse(QTexture *diffuse); - void setNormal(QTexture *normal); + void setDiffuse(QAbstractTextureProvider *diffuse); + void setNormal(QAbstractTextureProvider *normal); void setShininess(float shininess); void setTextureScale(float textureScale); |