diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-02-23 16:27:24 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 16:59:13 +0000 |
commit | 2a485273c1da1f56412bfd19795ac5a29331b770 (patch) | |
tree | 1e206d595d23cb1a7d44f376cc8a47cd2d1af17e /src/extras/defaults/qmetalroughmaterial.h | |
parent | 271ff077ed2235eee149f23f157d8e17d058af4b (diff) |
Remove env light API from metal/rough materials
Now that EnvironmentLight is available in Qt3DRender this is no longer
necessary. We have a much better way to set the environment lighting
now.
Change-Id: I492d1383aaf4e60b434c7ab94f3696e499545f9f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/defaults/qmetalroughmaterial.h')
-rw-r--r-- | src/extras/defaults/qmetalroughmaterial.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/extras/defaults/qmetalroughmaterial.h b/src/extras/defaults/qmetalroughmaterial.h index e13d6c1e9..a7de7b80c 100644 --- a/src/extras/defaults/qmetalroughmaterial.h +++ b/src/extras/defaults/qmetalroughmaterial.h @@ -60,8 +60,6 @@ class QT3DEXTRASSHARED_EXPORT QMetalRoughMaterial : public Qt3DRender::QMaterial Q_PROPERTY(QColor baseColor READ baseColor WRITE setBaseColor NOTIFY baseColorChanged) Q_PROPERTY(float metalness READ metalness WRITE setMetalness NOTIFY metalnessChanged) Q_PROPERTY(float roughness READ roughness WRITE setRoughness NOTIFY roughnessChanged) - Q_PROPERTY(Qt3DRender::QAbstractTexture *environmentIrradiance READ environmentIrradiance WRITE setEnvironmentIrradiance NOTIFY environmentIrradianceChanged) - Q_PROPERTY(Qt3DRender::QAbstractTexture *environmentSpecular READ environmentSpecular WRITE setEnvironmentSpecular NOTIFY environmentSpecularChanged) public: explicit QMetalRoughMaterial(Qt3DCore::QNode *parent = nullptr); @@ -70,22 +68,16 @@ public: QColor baseColor() const; float metalness() const; float roughness() const; - Qt3DRender::QAbstractTexture *environmentIrradiance() const; - Qt3DRender::QAbstractTexture *environmentSpecular() const; public Q_SLOTS: void setBaseColor(const QColor &baseColor); void setMetalness(float metalness); void setRoughness(float roughness); - void setEnvironmentIrradiance(Qt3DRender::QAbstractTexture *environmentIrradiance); - void setEnvironmentSpecular(Qt3DRender::QAbstractTexture *environmentSpecular); Q_SIGNALS: void baseColorChanged(const QColor &baseColor); void metalnessChanged(float metalness); void roughnessChanged(float roughness); - void environmentIrradianceChanged(Qt3DRender::QAbstractTexture *environmentIrradiance); - void environmentSpecularChanged(Qt3DRender::QAbstractTexture *environmentSpecular); protected: QMetalRoughMaterial(QMetalRoughMaterialPrivate &dd, Qt3DCore::QNode *parent = nullptr); |