summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/q3dcamera_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-05 14:00:08 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-08-06 08:39:25 +0300
commitdd99eb73740ad015a2a2d28481e5a2ca8ab1d7b1 (patch)
treebcbbd462e547cd958b1343412d0a14e920b5c453 /src/datavisualization/engine/q3dcamera_p.h
parent73f127d8ef1937aa77ba0ec0be63f0bfd6cf92ab (diff)
Enable camera targeting.
Also fix custom item positioning in absolute mode as it was completely broken in bars and z-coord was flipped in others. Clarified Q3DObject::position property usage, namely that it is reserved for internal use for now. Some refactoring also done. Task-number: QTRD-2567 Change-Id: I5da65b83a2f8ecf20f8fd054e59748278ef1a714 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dcamera_p.h')
-rw-r--r--src/datavisualization/engine/q3dcamera_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index 01e7a508..6e9fd190 100644
--- a/src/datavisualization/engine/q3dcamera_p.h
+++ b/src/datavisualization/engine/q3dcamera_p.h
@@ -84,7 +84,7 @@ signals:
public:
Q3DCamera *q_ptr;
- QVector3D m_target;
+ QVector3D m_actualTarget;
QVector3D m_up;
QMatrix4x4 m_viewMatrix;
@@ -100,6 +100,7 @@ public:
bool m_wrapXRotation;
bool m_wrapYRotation;
Q3DCamera::CameraPreset m_activePreset;
+ QVector3D m_requestedTarget;
friend class Bars3DRenderer;
friend class Surface3DRenderer;