From f3e38983d77c72f3121c33a149a58fdf9c64158c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kera=CC=88nen=20Pasi?= Date: Fri, 23 Aug 2013 16:17:29 +0300 Subject: New 3D scene for lights and camera setup for input handlers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83 Reviewed-by: Tomi Korpipää --- src/datavis3d/engine/scatter3dcontroller_p.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/datavis3d/engine/scatter3dcontroller_p.h') 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(); -- cgit v1.2.3