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 | |
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')
-rw-r--r-- | src/extras/defaults/qfirstpersoncameracontroller.cpp | 13 | ||||
-rw-r--r-- | src/extras/defaults/qfirstpersoncameracontroller_p.h | 13 | ||||
-rw-r--r-- | src/extras/defaults/qorbitcontrol.cpp | 13 | ||||
-rw-r--r-- | src/extras/defaults/qorbitcontrol_p.h | 13 |
4 files changed, 28 insertions, 24 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()) diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h index 9e62b8e19..756ab668d 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller_p.h +++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h @@ -85,6 +85,7 @@ class QAction; class QActionInput; class QAxis; class QAxisInput; +class QButtonAxisInput; class QAxisActionHandler; } @@ -114,12 +115,12 @@ public: Qt3DInput::QAxisInput *m_mouseRxInput; Qt3DInput::QAxisInput *m_mouseRyInput; - Qt3DInput::QAxisInput *m_keyboardTxPosInput; - Qt3DInput::QAxisInput *m_keyboardTyPosInput; - Qt3DInput::QAxisInput *m_keyboardTzPosInput; - Qt3DInput::QAxisInput *m_keyboardTxNegInput; - Qt3DInput::QAxisInput *m_keyboardTyNegInput; - Qt3DInput::QAxisInput *m_keyboardTzNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTxPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTyPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTzPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTxNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTyNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTzNegInput; Qt3DInput::QKeyboardDevice *m_keyboardDevice; Qt3DInput::QMouseDevice *m_mouseDevice; diff --git a/src/extras/defaults/qorbitcontrol.cpp b/src/extras/defaults/qorbitcontrol.cpp index fbcaa9902..7c1c5e6f8 100644 --- a/src/extras/defaults/qorbitcontrol.cpp +++ b/src/extras/defaults/qorbitcontrol.cpp @@ -40,6 +40,7 @@ #include <Qt3DRender/QCamera> #include <Qt3DInput/QAxis> #include <Qt3DInput/QAxisInput> +#include <Qt3DInput/QButtonAxisInput> #include <Qt3DInput/QAction> #include <Qt3DInput/QActionInput> #include <Qt3DInput/QLogicalDevice> @@ -75,12 +76,12 @@ QOrbitControlPrivate::QOrbitControlPrivate() , m_shiftButtonInput(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()) diff --git a/src/extras/defaults/qorbitcontrol_p.h b/src/extras/defaults/qorbitcontrol_p.h index e37ca50f6..900227152 100644 --- a/src/extras/defaults/qorbitcontrol_p.h +++ b/src/extras/defaults/qorbitcontrol_p.h @@ -71,6 +71,7 @@ class QAction; class QActionInput; class QAxis; class QAxisInput; +class QButtonAxisInput; class QAxisActionHandler; } @@ -104,12 +105,12 @@ public: Qt3DInput::QAxisInput *m_mouseRxInput; Qt3DInput::QAxisInput *m_mouseRyInput; - Qt3DInput::QAxisInput *m_keyboardTxPosInput; - Qt3DInput::QAxisInput *m_keyboardTyPosInput; - Qt3DInput::QAxisInput *m_keyboardTzPosInput; - Qt3DInput::QAxisInput *m_keyboardTxNegInput; - Qt3DInput::QAxisInput *m_keyboardTyNegInput; - Qt3DInput::QAxisInput *m_keyboardTzNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTxPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTyPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTzPosInput; + Qt3DInput::QButtonAxisInput *m_keyboardTxNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTyNegInput; + Qt3DInput::QButtonAxisInput *m_keyboardTzNegInput; Qt3DInput::QKeyboardDevice *m_keyboardDevice; Qt3DInput::QMouseDevice *m_mouseDevice; |