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.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/qdiffusemapmaterial.h')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 69eb0d33f..0f3d9cf51 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class QDiffuseMapMaterialPrivate; -class QTexture; +class QAbstractTextureProvider; class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial { @@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) Q_PROPERTY(QColor specular READ specular WRITE setSpecular NOTIFY specularChanged) Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) - Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: @@ -68,13 +68,13 @@ public: QColor ambient() const; QColor specular() const; float shininess() const; - QTexture *diffuse() const; + QAbstractTextureProvider *diffuse() const; float textureScale() const; void setAmbient(const QColor &color); void setSpecular(const QColor &specular); void setShininess(float shininess); - void setDiffuse(QTexture *diffuse); + void setDiffuse(QAbstractTextureProvider *diffuse); void setTextureScale(float textureScale); Q_SIGNALS: |