diff options
| author | Keränen Pasi <pasi.keranen@digia.com> | 2013-08-23 16:17:29 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-09-10 09:46:55 +0300 |
| commit | f3e38983d77c72f3121c33a149a58fdf9c64158c (patch) | |
| tree | d7aebaed7e6e8b4570f8d96f195d1dca42c56f03 /src/datavis3d/input/qabstract3dinputhandler_p.h | |
| parent | a88d9cacf7465ea0a1b5eb642f6c2f9cc7ad971d (diff) | |
New 3D scene for lights and camera setup for input handlers.
Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/input/qabstract3dinputhandler_p.h')
| -rw-r--r-- | src/datavis3d/input/qabstract3dinputhandler_p.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/datavis3d/input/qabstract3dinputhandler_p.h b/src/datavis3d/input/qabstract3dinputhandler_p.h index 7c56c2fa..a4b61ff3 100644 --- a/src/datavis3d/input/qabstract3dinputhandler_p.h +++ b/src/datavis3d/input/qabstract3dinputhandler_p.h @@ -29,12 +29,13 @@ #ifndef QABSTRACT3DINPUTHANDLER_P_H #define QABSTRACT3DINPUTHANDLER_P_H -#include <QMouseEvent> +#include "datavis3dglobal_p.h" +#include <QRect> QT_DATAVIS3D_BEGIN_NAMESPACE class QAbstract3DInputHandler; -class CameraHelper; +class Q3DScene; class QAbstract3DInputHandlerPrivate { @@ -45,18 +46,22 @@ public: public: QAbstract3DInputHandler *q_ptr; int m_prevDistance; + QPoint m_previousInputPos; + + GLfloat m_defaultXRotation; + GLfloat m_defaultYRotation; private: QDataVis::InputState m_inputState; - bool m_isSlicingActivated; QPoint m_inputPosition; - int m_zoomLevel; QRect m_mainViewPort; - // TODO: Replace with proper camera once it's available - CameraHelper *m_camera; + // TODO: Check if this could be avoided with signals/slots or some other way. + Q3DScene *m_scene; + bool m_isDefaultHandler; friend class QAbstract3DInputHandler; + friend class Abstract3DController; }; QT_DATAVIS3D_END_NAMESPACE |