diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-04-29 08:18:06 +0200 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-02 10:26:25 +0000 |
| commit | f63397953d052dc2a35bcc0ec32eaff0ebd80f05 (patch) | |
| tree | 869d1bd567a7a8a6d399a2ecb4e6d9e561c6b557 /src/extras/defaults/qfirstpersoncameracontroller.cpp | |
| parent | 617e4c768616868a3e306668630efdfca69604d7 (diff) | |
Splitting of QAxisInput
Placed buttons and scale into a new class
named QButtonAxisInput
Change-Id: I0e8407dc361d9d6eda38973a8950f77b17119467
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/extras/defaults/qfirstpersoncameracontroller.cpp')
| -rw-r--r-- | src/extras/defaults/qfirstpersoncameracontroller.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp index 2558dc7b6..0a69dc2ca 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller.cpp +++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp @@ -53,6 +53,7 @@ #include <Qt3DRender/QCamera> #include <Qt3DInput/QAxis> #include <Qt3DInput/QAxisInput> +#include <Qt3DInput/QButtonAxisInput> #include <Qt3DInput/QAction> #include <Qt3DInput/QActionInput> #include <Qt3DInput/QLogicalDevice> @@ -79,12 +80,12 @@ QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() , m_fineMotionKeyInput(new Qt3DInput::QActionInput()) , m_mouseRxInput(new Qt3DInput::QAxisInput()) , m_mouseRyInput(new Qt3DInput::QAxisInput()) - , m_keyboardTxPosInput(new Qt3DInput::QAxisInput()) - , m_keyboardTyPosInput(new Qt3DInput::QAxisInput()) - , m_keyboardTzPosInput(new Qt3DInput::QAxisInput()) - , m_keyboardTxNegInput(new Qt3DInput::QAxisInput()) - , m_keyboardTyNegInput(new Qt3DInput::QAxisInput()) - , m_keyboardTzNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardTxPosInput(new Qt3DInput::QButtonAxisInput()) + , m_keyboardTyPosInput(new Qt3DInput::QButtonAxisInput()) + , m_keyboardTzPosInput(new Qt3DInput::QButtonAxisInput()) + , m_keyboardTxNegInput(new Qt3DInput::QButtonAxisInput()) + , m_keyboardTyNegInput(new Qt3DInput::QButtonAxisInput()) + , m_keyboardTzNegInput(new Qt3DInput::QButtonAxisInput()) , m_keyboardDevice(new Qt3DInput::QKeyboardDevice()) , m_mouseDevice(new Qt3DInput::QMouseDevice()) , m_logicalDevice(new Qt3DInput::QLogicalDevice()) |