diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-03-18 10:41:10 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-06 15:30:27 +0000 |
| commit | e6741fa7d5b2afb27138b2eadcc9f16c43d854aa (patch) | |
| tree | 9b0b26a52a3cdc8185ab9802b8c7648a12cc7063 /src/render/defaults/qnormaldiffusespecularmapmaterial.h | |
| parent | 854f14cfa59b5ad8f3c7f9146c01c753ce6d4481 (diff) | |
QAbstractTextureProvider renamed to QAbstractTexture
Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f
Task-number: QTBUG-51504
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusespecularmapmaterial.h')
| -rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index b93aab760..aa4b23eaa 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -53,9 +53,9 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMateri { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) - Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) - Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged) - Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged) + Q_PROPERTY(Qt3DRender::QAbstractTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(Qt3DRender::QAbstractTexture *normal READ normal WRITE setNormal NOTIFY normalChanged) + Q_PROPERTY(Qt3DRender::QAbstractTexture *specular READ specular WRITE setSpecular NOTIFY specularChanged) Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) @@ -64,25 +64,25 @@ public: ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; - QAbstractTextureProvider *diffuse() const; - QAbstractTextureProvider *normal() const; - QAbstractTextureProvider *specular() const; + QAbstractTexture *diffuse() const; + QAbstractTexture *normal() const; + QAbstractTexture *specular() const; float shininess() const; float textureScale() const; public Q_SLOTS: void setAmbient(const QColor &ambient); - void setDiffuse(QAbstractTextureProvider *diffuse); - void setNormal(QAbstractTextureProvider *normal); - void setSpecular(QAbstractTextureProvider *specular); + void setDiffuse(QAbstractTexture *diffuse); + void setNormal(QAbstractTexture *normal); + void setSpecular(QAbstractTexture *specular); void setShininess(float shininess); void setTextureScale(float textureScale); Q_SIGNALS: void ambientChanged(const QColor &ambient); - void diffuseChanged(QAbstractTextureProvider *diffuse); - void normalChanged(QAbstractTextureProvider *normal); - void specularChanged(QAbstractTextureProvider *specular); + void diffuseChanged(QAbstractTexture *diffuse); + void normalChanged(QAbstractTexture *normal); + void specularChanged(QAbstractTexture *specular); void shininessChanged(float shininess); void textureScaleChanged(float textureScale); |