diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-12 09:53:52 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-12 10:31:27 +0300 |
| commit | 7f8966b035c9fd73d2cde04521c92892feefc0f9 (patch) | |
| tree | 55fee47c70805ff6bd4df1a8cd7693ea34132b27 /src/datavisualization/engine/q3dcamera.h | |
| parent | 1262c6562d7264c9fe4caf2f433615348c0f2ef8 (diff) | |
Fix Q3DScene caching
Task-number: QTRD-2258
Change-Id: Ifce23dca40566e75398e00975e8b2159b325739e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dcamera.h')
| -rw-r--r-- | src/datavisualization/engine/q3dcamera.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index ed09c3e1..2db4b300 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -19,13 +19,9 @@ #ifndef Q3DCAMERA_H #define Q3DCAMERA_H -#include <QObject> +#include <QtDataVisualization/q3dobject.h> #include <QMatrix4x4> -#include "datavisualizationglobal_p.h" -#include "q3dbars.h" -#include "q3dobject.h" - class QVector3D; class QPoint; class QPointF; @@ -63,7 +59,7 @@ public: const QVector3D &defaultUp); // Calculate view matrix based on zoomadjustment, current rotation and current zoom level - virtual void updateViewMatrix(GLfloat zoomAdjustment); + virtual void updateViewMatrix(qreal zoomAdjustment); virtual void setCameraPreset(QDataVis::CameraPreset preset); virtual QDataVis::CameraPreset cameraPreset(); @@ -72,14 +68,16 @@ public: virtual int zoomLevel(); virtual QVector3D calculatePositionRelativeToCamera(const QVector3D &relativePosition, - GLfloat fixedRotation, - GLfloat distanceModifier) const; + qreal fixedRotation, + qreal distanceModifier) const; private: - void setRotationsPrivate(const QPointF &rotation); QScopedPointer<Q3DCameraPrivate> d_ptr; Q_DISABLE_COPY(Q3DCamera) + + friend class Q3DCameraPrivate; + friend class Q3DScenePrivate; }; QT_DATAVISUALIZATION_END_NAMESPACE |