Reset input axis changes when enabling camera controller

When input axis are enabled or disable, we now reset the value
to 0. And enabling or disabling the camera controller, we now
do the same for the axis. This prevents residual movement when
re-enabling the controller due to the asynchronous updates.

Task-number: QTBUG-77996
Change-Id: I5ac016d5b708e1f8d8eaa996bbd28c00c0f05e79
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 8 insertions, 0 deletions

diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp
index 27df65d7b..c8ebf42f3 100644
--- a/src/extras/defaults/qabstractcameracontroller.cpp
+++ b/src/extras/defaults/qabstractcameracontroller.cpp
@@ -211,6 +211,10 @@ void QAbstractCameraControllerPrivate::init()
                      m_logicalDevice, &Qt3DInput::QLogicalDevice::setEnabled);
     QObject::connect(q, &Qt3DCore::QEntity::enabledChanged,
                      m_frameAction, &Qt3DLogic::QFrameAction::setEnabled);
+    for (auto axis: {m_rxAxis, m_ryAxis, m_txAxis, m_tyAxis, m_tzAxis}) {
+        QObject::connect(q, &Qt3DCore::QEntity::enabledChanged,
+                         axis, &Qt3DInput::QAxis::setEnabled);
+    }
 
     QObject::connect(m_escapeButtonAction, &Qt3DInput::QAction::activeChanged,
                      q, [this](bool isActive) {
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 01e28e9cf..1830c8005 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -83,6 +83,10 @@ namespace Qt3DInput {
 QAxis::QAxis(Qt3DCore::QNode *parent)
     : Qt3DCore::QNode(*new QAxisPrivate(), parent)
 {
+    Q_D(QAxis);
+    connect(this, &QAxis::enabledChanged, [d]() {
+        d->setValue(0.);
+    });
 }
 
 /*! \internal */