diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2016-02-17 17:53:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 13:19:39 +0000 |
| commit | c042228267dc4bb05ee3e6d53074c7218d1e7054 (patch) | |
| tree | aacbe10f48912e9324526e64d722377143d542cc /src/render/frontend/qrendersettings.h | |
| parent | 807a25d74550faf42ed79dfe234b5f1ce3380cf4 (diff) | |
Drop QFrameGraph in favor of QRenderSettings
QFrameGraph did store just the Frame Graph Root, and was not configurable
at runtime. This functionality has been moved to QRenderSettings.
The renderer now gets the scene graph root directly from QRenderSettings.
Change-Id: I3012eb96b8073717f96f5e42374859a3f4a89bfc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qrendersettings.h')
| -rw-r--r-- | src/render/frontend/qrendersettings.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h index 5d31189b6..9314b5048 100644 --- a/src/render/frontend/qrendersettings.h +++ b/src/render/frontend/qrendersettings.h @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QFrameGraphNode; class QRenderSettingsPrivate; class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent @@ -55,6 +56,9 @@ class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent Q_PROPERTY(PickMethod pickMethod READ pickMethod WRITE setPickMethod NOTIFY pickMethodChanged) Q_PROPERTY(PickResultMode pickResultMode READ pickResultMode WRITE setPickResultMode NOTIFY pickResultModeChanged) + Q_PROPERTY(Qt3DRender::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged) + Q_CLASSINFO("DefaultProperty", "activeFrameGraph") + public: explicit QRenderSettings(Qt3DCore::QNode *parent = nullptr); ~QRenderSettings(); @@ -73,14 +77,17 @@ public: PickMethod pickMethod() const; PickResultMode pickResultMode() const; + QFrameGraphNode *activeFrameGraph() const; public Q_SLOTS: void setPickMethod(PickMethod pickMethod); void setPickResultMode(PickResultMode pickResultMode); + void setActiveFrameGraph(QFrameGraphNode *activeFrameGraph); Q_SIGNALS: void pickMethodChanged(PickMethod pickMethod); void pickResultModeChanged(PickResultMode pickResult); + void activeFrameGraphChanged(QFrameGraphNode *activeFrameGraph); protected: Q_DECLARE_PRIVATE(QRenderSettings) |