diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-19 14:01:09 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-20 09:48:19 +0200 |
| commit | aa542150122d975a1a6fc097a0ce4e2dd339528e (patch) | |
| tree | 5ec1824a5e51d046731d2fefe1dbdf55a5788a91 /src/datavisualizationqml2/abstractdeclarative_p.h | |
| parent | e0034b33b9e88aae416d6af0751f5826b9b03924 (diff) | |
MSAA support added to QML
Change-Id: I64258705e4423b2762aeff28c3eafd6bdf5d34e9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index e5e9909b..8be3e0fa 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -51,6 +51,7 @@ class AbstractDeclarative : public QQuickItem Q_FLAGS(SelectionFlag SelectionFlags) Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) + Q_PROPERTY(int msaaSamples READ msaaSamples WRITE setMsaaSamples NOTIFY msaaSamplesChanged) Q_PROPERTY(Declarative3DScene* scene READ scene NOTIFY sceneChanged) Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged) Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) @@ -84,7 +85,7 @@ public: enum RenderingMode { RenderDirectToBackground = 0, RenderDirectToBackground_NoClear, - RenderIndirect_NoAA + RenderIndirect }; public: @@ -100,6 +101,9 @@ public: virtual void setShadowQuality(ShadowQuality quality); virtual AbstractDeclarative::ShadowQuality shadowQuality() const; + virtual void setMsaaSamples(int samples); + virtual int msaaSamples() const; + virtual Declarative3DScene *scene() const; virtual QAbstract3DInputHandler *inputHandler() const; @@ -117,6 +121,9 @@ public: void synchDataToRenderer(); void render(); + void activateOpenGLContext(QQuickWindow *window); + void doneOpenGLContext(QQuickWindow *window); + void checkWindowList(QQuickWindow *window); public slots: @@ -141,6 +148,7 @@ protected: signals: void selectionModeChanged(SelectionFlags mode); void shadowQualityChanged(ShadowQuality quality); + void msaaSamplesChanged(int samples); void sceneChanged(Q3DScene *scene); void inputHandlerChanged(QAbstract3DInputHandler *inputHandler); void themeChanged(Q3DTheme *theme); @@ -149,7 +157,11 @@ signals: private: QPointer<Abstract3DController> m_controller; QRectF m_cachedGeometry; + QOpenGLContext *m_context; + QOpenGLContext *m_qtContext; + QQuickWindow *m_contextWindow; AbstractDeclarative::RenderingMode m_renderMode; + int m_samples; QSize m_initialisedSize; }; Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::SelectionFlags) |