summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/scatter3dcontroller_p.h
diff options
context:
space:
mode:
authorKeränen Pasi <pasi.keranen@digia.com>2013-08-23 16:17:29 +0300
committerPasi Keränen <pasi.keranen@digia.com>2013-09-10 09:46:55 +0300
commitf3e38983d77c72f3121c33a149a58fdf9c64158c (patch)
treed7aebaed7e6e8b4570f8d96f195d1dca42c56f03 /src/datavis3d/engine/scatter3dcontroller_p.h
parenta88d9cacf7465ea0a1b5eb642f6c2f9cc7ad971d (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/engine/scatter3dcontroller_p.h')
-rw-r--r--src/datavis3d/engine/scatter3dcontroller_p.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/datavis3d/engine/scatter3dcontroller_p.h b/src/datavis3d/engine/scatter3dcontroller_p.h
index fd7d82ad..fb1b693f 100644
--- a/src/datavis3d/engine/scatter3dcontroller_p.h
+++ b/src/datavis3d/engine/scatter3dcontroller_p.h
@@ -57,11 +57,6 @@ class QT_DATAVIS3D_EXPORT Scatter3DController : public Abstract3DController
private:
Scatter3DChangeBitField m_changeTracker;
- // Interaction
- MouseState m_mouseState;
- QPoint m_mousePos;
- bool m_isSlicingActivated;
-
// Rendering
Scatter3DRenderer *m_renderer;
int m_selectedItemIndex;
@@ -72,15 +67,6 @@ public:
void initializeOpenGL();
- MouseState mouseState();
- QPoint mousePosition();
-
- bool isSlicingActive();
- void setSlicingActive(bool isSlicing);
-
- QMatrix4x4 calculateViewMatrix(int zoom, int viewPortWidth, int viewPortHeight,
- bool showUnder = false);
-
// Object type
void setObjectType(QDataVis::MeshStyle style, bool smooth = false);
@@ -91,15 +77,6 @@ public:
int selectedItemIndex() const;
static inline int noSelectionIndex() { return -1; }
-#if defined(Q_OS_ANDROID)
- void mouseDoubleClickEvent(QMouseEvent *event);
- void touchEvent(QTouchEvent *event);
-#endif
- void mousePressEvent(QMouseEvent *event, const QPoint &mousePos);
- void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos);
- void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos);
- void wheelEvent(QWheelEvent *event);
-
virtual void setActiveDataProxy(QAbstractDataProxy *proxy);
void synchDataToRenderer();