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/q3dscene.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/q3dscene.h')
| -rw-r--r-- | src/datavisualization/engine/q3dscene.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 352a3b82..7a2a6e30 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -19,18 +19,15 @@ #ifndef Q3DSCENE_H #define Q3DSCENE_H +#include <QtDataVisualization/qdatavisualizationenums.h> #include <QObject> -#include "datavisualizationglobal_p.h" -#include "q3dscene_p.h" - QT_DATAVISUALIZATION_BEGIN_NAMESPACE class Q3DCamera; class Q3DBox; class Q3DLight; - -// Note: Scene doesn't take ownership of any of the objects given as parameter. Upon destruction of the scene it will call setParentScene(0) on it's child objects. +class Q3DScenePrivate; class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject { @@ -40,8 +37,6 @@ public: Q3DScene(QObject *parent = 0); ~Q3DScene(); - Q3DScene *clone(QObject *parent = 0); - QRect viewport() const; void setViewport(const QRect &viewport); void setViewportSize(int width, int height); @@ -69,13 +64,15 @@ public: // Calcluate light position based on rotation. // Call after calling calculateViewMatrix to get up-to-date position void setLightPositionRelativeToCamera(const QVector3D &relativePosition, - GLfloat fixedRotation = 0.0f, - GLfloat distanceModifier = 0.0f); + qreal fixedRotation = 0.0, + qreal distanceModifier = 0.0); private: QScopedPointer<Q3DScenePrivate> d_ptr; Q_DISABLE_COPY(Q3DScene) + + friend class Abstract3DRenderer; }; QT_DATAVISUALIZATION_END_NAMESPACE |