diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/extras/defaults/qorbitcameracontroller.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/extras/defaults/qorbitcameracontroller.cpp')
-rw-r--r-- | src/extras/defaults/qorbitcameracontroller.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/extras/defaults/qorbitcameracontroller.cpp b/src/extras/defaults/qorbitcameracontroller.cpp index 95b0e19dc..565a75ea1 100644 --- a/src/extras/defaults/qorbitcameracontroller.cpp +++ b/src/extras/defaults/qorbitcameracontroller.cpp @@ -34,9 +34,9 @@ ** ****************************************************************************/ -#include "qorbitcameracontroller_p.h" #include "qorbitcameracontroller.h" -#include <QtGlobal> +#include "qorbitcameracontroller_p.h" + #include <Qt3DRender/QCamera> #include <Qt3DInput/QAxis> #include <Qt3DInput/QAnalogAxisInput> @@ -48,6 +48,7 @@ #include <Qt3DInput/QMouseDevice> #include <Qt3DInput/QMouseEvent> #include <Qt3DLogic/QFrameAction> +#include <QtCore/QtGlobal> QT_BEGIN_NAMESPACE @@ -79,6 +80,9 @@ namespace Qt3DExtras { \li While both the left and the right mouse button are pressed, mouse movement along y-axis zooms the camera in and out without changing the view center. \row + \li Mouse scroll wheel + \li Zooms the camera in and out without changing the view center. + \row \li Arrow keys \li Move the camera vertically and horizontally relative to camera viewport. \row @@ -113,6 +117,8 @@ QOrbitCameraControllerPrivate::QOrbitCameraControllerPrivate() , m_shiftButtonInput(new Qt3DInput::QActionInput()) , m_mouseRxInput(new Qt3DInput::QAnalogAxisInput()) , m_mouseRyInput(new Qt3DInput::QAnalogAxisInput()) + , m_mouseTzXInput(new Qt3DInput::QAnalogAxisInput()) + , m_mouseTzYInput(new Qt3DInput::QAnalogAxisInput()) , m_keyboardTxPosInput(new Qt3DInput::QButtonAxisInput()) , m_keyboardTyPosInput(new Qt3DInput::QButtonAxisInput()) , m_keyboardTzPosInput(new Qt3DInput::QButtonAxisInput()) @@ -165,6 +171,16 @@ void QOrbitCameraControllerPrivate::init() m_mouseRyInput->setSourceDevice(m_mouseDevice); m_ryAxis->addInput(m_mouseRyInput); + // Mouse Wheel X + m_mouseTzXInput->setAxis(Qt3DInput::QMouseDevice::WheelX); + m_mouseTzXInput->setSourceDevice(m_mouseDevice); + m_tzAxis->addInput(m_mouseTzXInput); + + // Mouse Wheel Y + m_mouseTzYInput->setAxis(Qt3DInput::QMouseDevice::WheelY); + m_mouseTzYInput->setSourceDevice(m_mouseDevice); + m_tzAxis->addInput(m_mouseTzYInput); + // Keyboard Pos Tx m_keyboardTxPosInput->setButtons(QVector<int>() << Qt::Key_Right); m_keyboardTxPosInput->setScale(1.0f); |