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.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.h')
-rw-r--r-- | src/datavisualization/engine/q3dcamera.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index 1a3a3284..44aff452 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -35,14 +35,8 @@ class QT_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject Q_ENUMS(CameraPreset) Q_PROPERTY(float xRotation READ xRotation WRITE setXRotation NOTIFY xRotationChanged) Q_PROPERTY(float yRotation READ yRotation WRITE setYRotation NOTIFY yRotationChanged) - Q_PROPERTY(float minXRotation READ minXRotation NOTIFY minXRotationChanged) - Q_PROPERTY(float minYRotation READ minYRotation NOTIFY minYRotationChanged) - Q_PROPERTY(float maxXRotation READ maxXRotation NOTIFY maxXRotationChanged) - Q_PROPERTY(float maxYRotation READ maxYRotation NOTIFY maxYRotationChanged) Q_PROPERTY(int zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) - Q_PROPERTY(QMatrix4x4 viewMatrix READ viewMatrix WRITE setViewMatrix NOTIFY viewMatrixChanged) Q_PROPERTY(CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset NOTIFY cameraPresetChanged) - Q_PROPERTY(bool viewMatrixAutoUpdateEnabled READ isViewMatrixAutoUpdateEnabled WRITE setViewMatrixAutoUpdateEnabled NOTIFY viewMatrixAutoUpdateChanged) Q_PROPERTY(bool wrapXRotation READ wrapXRotation WRITE setWrapXRotation NOTIFY wrapXRotationChanged) Q_PROPERTY(bool wrapYRotation READ wrapYRotation WRITE setWrapYRotation NOTIFY wrapYRotationChanged) @@ -84,12 +78,6 @@ public: float yRotation() const; void setYRotation(float rotation); - float minXRotation() const; - float maxXRotation() const; - - float minYRotation() const; - float maxYRotation() const; - bool wrapXRotation() const; void setWrapXRotation(bool isEnabled); @@ -98,48 +86,23 @@ public: virtual void copyValuesFrom(const Q3DObject &source); - QMatrix4x4 viewMatrix() const; - void setViewMatrix(const QMatrix4x4 &viewMatrix); - - bool isViewMatrixAutoUpdateEnabled() const; - void setViewMatrixAutoUpdateEnabled(bool isEnabled); - CameraPreset cameraPreset() const; void setCameraPreset(CameraPreset preset); int zoomLevel() const; void setZoomLevel(int zoomLevel); - Q_INVOKABLE void setBaseOrientation(const QVector3D &defaultPosition, - const QVector3D &defaultTarget, - const QVector3D &defaultUp); - - QVector3D calculatePositionRelativeToCamera(const QVector3D &relativePosition, - float fixedRotation, - float distanceModifier) const; void setCameraPosition(float horizontal, float vertical, float distance = 100.0f); signals: void xRotationChanged(float rotation); void yRotationChanged(float rotation); - void minXRotationChanged(float rotation); - void minYRotationChanged(float rotation); - void maxXRotationChanged(float rotation); - void maxYRotationChanged(float rotation); void zoomLevelChanged(int zoomLevel); - void viewMatrixChanged(QMatrix4x4 viewMatrix); void cameraPresetChanged(CameraPreset preset); - void viewMatrixAutoUpdateChanged(bool enabled); void wrapXRotationChanged(bool isEnabled); void wrapYRotationChanged(bool isEnabled); private: - void setMinXRotation(float rotation); - void setMinYRotation(float rotation); - void setMaxXRotation(float rotation); - void setMaxYRotation(float rotation); - -private: QScopedPointer<Q3DCameraPrivate> d_ptr; Q_DISABLE_COPY(Q3DCamera) |