diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-09 14:26:02 +0100 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-03-11 13:54:57 +0000 |
| commit | 55e681ac6cad2a059785a08ac920748b5f60acf9 (patch) | |
| tree | 5abae65ced03df2d8e988a06c797cf24ba555559 /examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | |
| parent | 4551f221b5a90a1d14c68c04edcc799d5f8316cc (diff) | |
QMouseController changes and rename
Task-number: QTBUG-51450
Change-Id: I7f2dbe9cf4afbd41450f42fbb6da10baa2ca7116
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp')
| -rw-r--r-- | examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp index 049c577c7..b671fdfc7 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp @@ -57,7 +57,8 @@ #include <Qt3DInput/QActionInput> #include <Qt3DInput/QLogicalDevice> #include <Qt3DInput/QKeyboardController> -#include <Qt3DInput/QMouseController> +#include <Qt3DInput/QMouseDevice> +#include <Qt3DInput/QMouseEvent> #include <Qt3DLogic/QLogicComponent> QT_BEGIN_NAMESPACE @@ -86,7 +87,7 @@ QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() , m_keyboardTyNegInput(new QAxisInput()) , m_keyboardTzNegInput(new QAxisInput()) , m_keyboardController(new QKeyboardController()) - , m_mouseController(new QMouseController()) + , m_mouseDevice(new QMouseDevice()) , m_logicalDevice(new QLogicalDevice()) , m_logicComponent(new Qt3DLogic::QLogicComponent()) , m_linearSpeed(10.0f) @@ -99,8 +100,8 @@ void QFirstPersonCameraControllerPrivate::init() //// Actions // Left Mouse Button Action - m_leftMouseButtonInput->setButtons(QVariantList() << QMouseController::Left); - m_leftMouseButtonInput->setSourceDevice(m_mouseController); + m_leftMouseButtonInput->setButtons(QVariantList() << QMouseEvent::LeftButton); + m_leftMouseButtonInput->setSourceDevice(m_mouseDevice); m_leftMouseButtonAction->addInput(m_leftMouseButtonInput); // Fine Motion Action @@ -111,13 +112,13 @@ void QFirstPersonCameraControllerPrivate::init() //// Axes // Mouse X - m_mouseRxInput->setAxis(QMouseController::X); - m_mouseRxInput->setSourceDevice(m_mouseController); + m_mouseRxInput->setAxis(QMouseDevice::X); + m_mouseRxInput->setSourceDevice(m_mouseDevice); m_rxAxis->addInput(m_mouseRxInput); // Mouse Y - m_mouseRyInput->setAxis(QMouseController::Y); - m_mouseRyInput->setSourceDevice(m_mouseController); + m_mouseRyInput->setAxis(QMouseDevice::Y); + m_mouseRyInput->setSourceDevice(m_mouseDevice); m_ryAxis->addInput(m_mouseRyInput); // Keyboard Pos Tx |