First implementation of new input handling. Not integrated yet.

Change-Id: I8be494bf072926f4bd9db32572678bf7a4ea674a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

2 files changed, 15 insertions, 0 deletions

diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp
index 64dfe786..2f687cea 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavis3d/engine/abstract3dcontroller.cpp
@@ -22,6 +22,13 @@
 #include "qvalueaxis.h"
 #include "abstract3drenderer_p.h"
 
+#if defined(Q_OS_ANDROID)
+#include "qtouch3dinputhandler.h"
+#else
+#include "q3dinputhandler.h"
+#endif
+
+
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
@@ -45,6 +52,12 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
     m_isDataDirty(true)
 {
     m_theme.useColorTheme(QDataVis::ThemeSystem);
+#if defined(Q_OS_ANDROID)
+    m_inputHandler = new QTouch3DInputHandler();
+#else
+    m_inputHandler = new Q3DInputHandler();
+#endif
+    m_inputHandler->setCamera(m_cameraHelper);
 }
 
 Abstract3DController::~Abstract3DController()
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index df34e673..fdc19322 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -35,6 +35,7 @@
 #include "theme_p.h"
 #include "qabstractaxis.h"
 #include "drawer_p.h"
+#include "qabstract3dinputhandler.h"
 
 class QFont;
 
@@ -152,6 +153,7 @@ private:
     QString m_objFile;
 
 protected:
+    QAbstract3DInputHandler *m_inputHandler;
     CameraHelper *m_cameraHelper;
     int m_zoomLevel;
     QAbstractAxis *m_axisX;