diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-01-06 16:20:20 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-01-06 16:08:06 +0000 |
commit | 45902994198374a02f7c127120d8980a66796fb6 (patch) | |
tree | a95b14e7c45542584df6efff13983f1e4fb63fbe /src/render | |
parent | d61673010fcc67d60e76619941fac714d0141323 (diff) |
Fix dynamic texture provider property handling
The Q_PROPERTY has to include the namespace, otherwise setting
properties via QObject::setProperty() will fail.
Change-Id: Ifdf7012fd8b670710bac38eb0e5ce8eab057e719
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
5 files changed, 10 insertions, 8 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index d948ae7aa..5367abe9d 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_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(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index 12b8c6fbf..096c4ce88 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -52,8 +52,8 @@ class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) - Q_PROPERTY(QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged) - Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 945eaa616..835c0a155 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -52,8 +52,8 @@ class QT3DRENDERSHARED_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(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) - Q_PROPERTY(QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(Qt3DRender::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) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index 502656aef..2e72cc0fa 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -50,9 +50,9 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMateri { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) - Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) - Q_PROPERTY(QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged) - Q_PROPERTY(QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged) + 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(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h index bd13b59ea..093d20864 100644 --- a/src/render/texture/qabstracttextureprovider.h +++ b/src/render/texture/qabstracttextureprovider.h @@ -334,4 +334,6 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(Qt3DRender::QAbstractTextureProvider *) + #endif // QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H |