diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-02 15:05:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 20:07:42 +0200 |
| commit | ffa5d0b3ef4abde3b74f048936c9012e243a3e6c (patch) | |
| tree | 332c0dcdd9ab1832429738d90af164601ea1a3cb /src/quick3d/quick3drenderer/items/quick3dtechnique.h | |
| parent | 50f73e80c9da75a092f4e92dab3b08ca74dd91f6 (diff) | |
Reworked Quick3DTechnique to only be an extension of Technique
Change-Id: Iac2d558cfcdabefd174ec60cfb07d6b360e021c9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3dtechnique.h')
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dtechnique.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drenderer/items/quick3dtechnique.h index 56d7b0416..d19a5a6f8 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h +++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.h @@ -42,6 +42,7 @@ #ifndef QT3D_RENDER_QUICK_QUICK3DTECHNIQUE_H #define QT3D_RENDER_QUICK_QUICK3DTECHNIQUE_H +#include <Qt3DQuick/quick3dnode.h> #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> #include <Qt3DRenderer/technique.h> #include <QQmlListProperty> @@ -54,20 +55,22 @@ namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public Technique +class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public Qt3D::Quick::Quick3DNode { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::TechniqueCriterion> criteria READ criteriaList NOTIFY criteriaChanged) Q_PROPERTY(QQmlListProperty<Qt3D::RenderPass> renderPasses READ renderPassList NOTIFY renderPassesChanged) Q_PROPERTY(QQmlListProperty<Qt3D::Parameter> parameters READ parameterList) public: - explicit Quick3DTechnique(Node *parent = 0); + explicit Quick3DTechnique(QObject *parent = 0); QQmlListProperty<Qt3D::TechniqueCriterion> criteriaList(); QQmlListProperty<Qt3D::RenderPass> renderPassList(); QQmlListProperty<Qt3D::Parameter> parameterList(); + // Use QAbstractTechnique when it has been properly defined + inline Technique *parentTechnique() const { return qobject_cast<Technique*>(parent()); } + Q_SIGNALS: void criteriaChanged(); void renderPassesChanged(); |