diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-02 09:40:37 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:49 +0200 |
| commit | 3f20529e605eac75f416931c5c96ea03efa0c3ce (patch) | |
| tree | 1db3865f104a9a61ab5eeb71b5fc77868adbe07b /src/render/frontend/qmaterial.h | |
| parent | 7b26f6a1746419161a8f875e341b3e31220f4141 (diff) | |
QAbstract removed from core
Task-number: QTBUG-41530
Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmaterial.h')
| -rw-r--r-- | src/render/frontend/qmaterial.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index 08bc47fc8..c1560f7a4 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -45,9 +45,6 @@ #include <QVariant> #include <Qt3DCore/qcomponent.h> -#include <Qt3DCore/qabstracteffect.h> -#include <Qt3DCore/qabstractmaterial.h> - #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE @@ -57,16 +54,19 @@ namespace Qt3D { class QTexture; class QParameter; class QMaterialPrivate; +class QEffect; typedef QMap<QString, QTexture*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public QAbstractMaterial +class QT3DRENDERERSHARED_EXPORT QMaterial : public QComponent { Q_OBJECT + Q_PROPERTY(Qt3D::QEffect* effect READ effect WRITE setEffect NOTIFY effectChanged) public: explicit QMaterial(QNode *parent = 0); - void setEffect(QAbstractEffect *effect) Q_DECL_OVERRIDE; + void setEffect(QEffect *effect); + QEffect *effect() const; void addParameter(QParameter *parameter); void removeParameter(QParameter *parameter); @@ -76,6 +76,9 @@ public: void setTextureParameter(QString name, QTexture* tex); +Q_SIGNALS: + void effectChanged(); + protected: QMaterial(QMaterialPrivate &dd, QNode *parent = 0); |