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/qtexturedmetalroughmaterial.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/qtexturedmetalroughmaterial.h')
| -rw-r--r-- | src/extras/defaults/qtexturedmetalroughmaterial.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/extras/defaults/qtexturedmetalroughmaterial.h b/src/extras/defaults/qtexturedmetalroughmaterial.h index c5c3fce33..27c33ad6d 100644 --- a/src/extras/defaults/qtexturedmetalroughmaterial.h +++ b/src/extras/defaults/qtexturedmetalroughmaterial.h @@ -57,8 +57,6 @@ class QT3DEXTRASSHARED_EXPORT QTexturedMetalRoughMaterial : public Qt3DRender::Q Q_PROPERTY(Qt3DRender::QAbstractTexture *roughness READ roughness WRITE setRoughness NOTIFY roughnessChanged) Q_PROPERTY(Qt3DRender::QAbstractTexture *ambientOcclusion READ ambientOcclusion WRITE setAmbientOcclusion NOTIFY ambientOcclusionChanged) Q_PROPERTY(Qt3DRender::QAbstractTexture *normal READ normal WRITE setNormal NOTIFY normalChanged) - Q_PROPERTY(Qt3DRender::QAbstractTexture *environmentIrradiance READ environmentIrradiance WRITE setEnvironmentIrradiance NOTIFY environmentIrradianceChanged) - Q_PROPERTY(Qt3DRender::QAbstractTexture *environmentSpecular READ environmentSpecular WRITE setEnvironmentSpecular NOTIFY environmentSpecularChanged) public: explicit QTexturedMetalRoughMaterial(Qt3DCore::QNode *parent = nullptr); @@ -69,8 +67,6 @@ public: Qt3DRender::QAbstractTexture *roughness() const; Qt3DRender::QAbstractTexture *ambientOcclusion() const; Qt3DRender::QAbstractTexture *normal() const; - Qt3DRender::QAbstractTexture *environmentIrradiance() const; - Qt3DRender::QAbstractTexture *environmentSpecular() const; public Q_SLOTS: void setBaseColor(Qt3DRender::QAbstractTexture *baseColor); @@ -78,8 +74,6 @@ public Q_SLOTS: void setRoughness(Qt3DRender::QAbstractTexture *roughness); void setAmbientOcclusion(Qt3DRender::QAbstractTexture *ambientOcclusion); void setNormal(Qt3DRender::QAbstractTexture *normal); - void setEnvironmentIrradiance(Qt3DRender::QAbstractTexture *environmentIrradiance); - void setEnvironmentSpecular(Qt3DRender::QAbstractTexture *environmentSpecular); Q_SIGNALS: void baseColorChanged(Qt3DRender::QAbstractTexture *baseColor); @@ -87,8 +81,6 @@ Q_SIGNALS: void roughnessChanged(Qt3DRender::QAbstractTexture *roughness); void ambientOcclusionChanged(Qt3DRender::QAbstractTexture *ambientOcclusion); void normalChanged(Qt3DRender::QAbstractTexture *normal); - void environmentIrradianceChanged(Qt3DRender::QAbstractTexture *environmentIrradiance); - void environmentSpecularChanged(Qt3DRender::QAbstractTexture *environmentSpecular); protected: QTexturedMetalRoughMaterial(QTexturedMetalRoughMaterialPrivate &dd, Qt3DCore::QNode *parent = nullptr); |