diff options
author | Keränen Pasi <pasi.keranen@digia.com> | 2013-11-12 09:24:56 +0200 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-11-15 12:35:06 +0200 |
commit | cc22cc40e889b5b2f0e49ce32f660395cef865b7 (patch) | |
tree | 03bb5365bbfc614cfb94ffe304e632eb16ce5493 /src/datavisualization/engine/q3dscene.h | |
parent | 999ffa01d20f75a457da62d41c0fabfc32e5e1bb (diff) |
Changes scene to be proxy for input position and selection communication.
Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dscene.h')
-rw-r--r-- | src/datavisualization/engine/q3dscene.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 94d82c8b..5f034687 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -36,6 +36,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject Q_PROPERTY(QRect viewport READ viewport WRITE setViewport NOTIFY viewportChanged) Q_PROPERTY(QRect primarySubViewport READ primarySubViewport WRITE setPrimarySubViewport NOTIFY primarySubViewportChanged) Q_PROPERTY(QRect secondarySubViewport READ secondarySubViewport WRITE setSecondarySubViewport NOTIFY secondarySubViewportChanged) + Q_PROPERTY(QPoint selectionQueryPosition READ selectionQueryPosition WRITE setSelectionQueryPosition NOTIFY selectionQueryPositionChanged) Q_PROPERTY(bool secondarySubviewOnTop READ isSecondarySubviewOnTop WRITE setSecondarySubviewOnTop NOTIFY secondarySubviewOnTopChanged) Q_PROPERTY(bool slicingActive READ isSlicingActive WRITE setSlicingActive NOTIFY slicingActiveChanged) Q_PROPERTY(Q3DCamera* activeCamera READ activeCamera WRITE setActiveCamera NOTIFY activeCameraChanged) @@ -58,6 +59,10 @@ public: void setSecondarySubViewport(const QRect &secondarySubViewport); bool isPointInSecondarySubView(const QPoint &point); + void setSelectionQueryPosition(const QPoint &point); + QPoint selectionQueryPosition() const; + static const QPoint noSelectionPoint(); + void setSlicingActive(bool isSlicing); bool isSlicingActive() const; @@ -73,9 +78,9 @@ public: qreal devicePixelRatio() const; void setDevicePixelRatio(qreal pixelRatio); - void setLightPositionRelativeToCamera(const QVector3D &relativePosition, - qreal fixedRotation = 0.0, - qreal distanceModifier = 0.0); + Q_INVOKABLE void setLightPositionRelativeToCamera(const QVector3D &relativePosition, + qreal fixedRotation = 0.0, + qreal distanceModifier = 0.0); private: void emitNeedRender(); @@ -89,6 +94,7 @@ signals: void activeLightChanged(const Q3DLight *light); void devicePixelRatioChanged(qreal pixelRatio); void needRender(); + void selectionQueryPositionChanged(const QPoint position); private: QScopedPointer<Q3DScenePrivate> d_ptr; |