From dd99eb73740ad015a2a2d28481e5a2ca8ab1d7b1 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 5 Aug 2014 14:00:08 +0300 Subject: Enable camera targeting. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/abstract3drenderer_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/datavisualization/engine/abstract3drenderer_p.h') diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 40c7db0a..50370954 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -207,6 +207,8 @@ protected: const QMatrix4x4 &projectionViewMatrix, const QMatrix4x4 &depthMatrix); float calculatePolarBackgroundMargin(); + virtual void fixCameraTarget(QVector3D &target) = 0; + void updateCameraViewport(); bool m_hasNegativeValues; Q3DTheme *m_cachedTheme; @@ -274,6 +276,8 @@ protected: float m_vBackgroundMargin; float m_hBackgroundMargin; + QVector3D m_oldCameraTarget; + private: friend class Abstract3DController; }; -- cgit v1.2.3