diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-30 11:15:53 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-30 11:17:42 +0200 |
commit | 84d20142bd8926be2e08e4354635f36bc681f186 (patch) | |
tree | bdfc4d2c05dd48982213610a897d6ad34053bff9 /src/datavisualization/engine/q3dcamera_p.h | |
parent | 201a480af6ad2d36896570683ab87014827b9697 (diff) |
Moved nonfunctional public methods to private
Task-number: QTRD-2809
Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dcamera_p.h')
-rw-r--r-- | src/datavisualization/engine/q3dcamera_p.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index b55010c8..1112c87e 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -36,8 +36,9 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DCamera; -class Q3DCameraPrivate +class Q3DCameraPrivate : public QObject { + Q_OBJECT public: Q3DCameraPrivate(Q3DCamera *q); ~Q3DCameraPrivate(); @@ -47,12 +48,38 @@ public: void setXRotation(float rotation); void setYRotation(float rotation); void setMinXRotation(float rotation); + float minXRotation() const; void setMinYRotation(float rotation); + float minYRotation() const; void setMaxXRotation(float rotation); + float maxXRotation() const; void setMaxYRotation(float rotation); + float maxYRotation() const; void updateViewMatrix(float zoomAdjustment); + QMatrix4x4 viewMatrix() const; + void setViewMatrix(const QMatrix4x4 &viewMatrix); + + bool isViewMatrixAutoUpdateEnabled() const; + void setViewMatrixAutoUpdateEnabled(bool isEnabled); + + void setBaseOrientation(const QVector3D &defaultPosition, + const QVector3D &defaultTarget, + const QVector3D &defaultUp); + + QVector3D calculatePositionRelativeToCamera(const QVector3D &relativePosition, + float fixedRotation, + float distanceModifier) const; + +signals: + void minXRotationChanged(float rotation); + void minYRotationChanged(float rotation); + void maxXRotationChanged(float rotation); + void maxYRotationChanged(float rotation); + void viewMatrixChanged(QMatrix4x4 viewMatrix); + void viewMatrixAutoUpdateChanged(bool enabled); + public: Q3DCamera *q_ptr; |