diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-09-30 12:18:32 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-10-01 07:04:33 +0100 |
commit | 5bc3eec77b7052626bac91efd05026c92b0108b5 (patch) | |
tree | efc9b9f9987860c552e200b79fa08c1d7f764ffc | |
parent | 040d50f0e3c44739bb546ac96da251b03d7ac271 (diff) |
Update Axis Input classes to use direct sync
Change-Id: I22b0bb0fdf966cba536676e360dae5c9701e9ecb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/input/backend/abstractaxisinput.cpp | 24 | ||||
-rw-r--r-- | src/input/backend/abstractaxisinput_p.h | 7 | ||||
-rw-r--r-- | src/input/backend/analogaxisinput.cpp | 23 | ||||
-rw-r--r-- | src/input/backend/analogaxisinput_p.h | 4 | ||||
-rw-r--r-- | src/input/backend/buttonaxisinput.cpp | 35 | ||||
-rw-r--r-- | src/input/backend/buttonaxisinput_p.h | 3 | ||||
-rw-r--r-- | src/input/frontend/qinputaspect.cpp | 4 | ||||
-rw-r--r-- | tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp | 20 | ||||
-rw-r--r-- | tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp | 30 | ||||
-rw-r--r-- | tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp | 60 | ||||
-rw-r--r-- | tests/auto/input/utils/tst_utils.cpp | 8 |
11 files changed, 81 insertions, 137 deletions
diff --git a/src/input/backend/abstractaxisinput.cpp b/src/input/backend/abstractaxisinput.cpp index aae165a7e..de957c73a 100644 --- a/src/input/backend/abstractaxisinput.cpp +++ b/src/input/backend/abstractaxisinput.cpp @@ -54,32 +54,24 @@ namespace Qt3DInput { namespace Input { AbstractAxisInput::AbstractAxisInput() - : Qt3DCore::QBackendNode() + : BackendNode() { } -void AbstractAxisInput::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) -{ - const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QAbstractAxisInputData>>(change); - const auto &data = typedChange->data; - m_sourceDevice = data.sourceDeviceId; -} - void AbstractAxisInput::cleanup() { QBackendNode::setEnabled(false); m_sourceDevice = Qt3DCore::QNodeId(); } -void AbstractAxisInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) +void AbstractAxisInput::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) { - if (e->type() == Qt3DCore::PropertyUpdated) { - Qt3DCore::QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("sourceDevice")) { - m_sourceDevice = propertyChange->value().value<Qt3DCore::QNodeId>(); - } - } - QBackendNode::sceneChangeEvent(e); + BackendNode::syncFromFrontEnd(frontEnd, firstTime); + const QAbstractAxisInput *node = qobject_cast<const QAbstractAxisInput *>(frontEnd); + if (!node) + return; + + m_sourceDevice = Qt3DCore::qIdForNode(node->sourceDevice()); } } // Input diff --git a/src/input/backend/abstractaxisinput_p.h b/src/input/backend/abstractaxisinput_p.h index 765e2214f..07a063908 100644 --- a/src/input/backend/abstractaxisinput_p.h +++ b/src/input/backend/abstractaxisinput_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <Qt3DCore/qbackendnode.h> +#include <Qt3DInput/private/backendnode_p.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE @@ -64,19 +64,18 @@ namespace Input { class InputHandler; -class Q_AUTOTEST_EXPORT AbstractAxisInput : public Qt3DCore::QBackendNode +class Q_AUTOTEST_EXPORT AbstractAxisInput : public BackendNode { public: virtual void cleanup(); inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; virtual float process(InputHandler *inputHandler, qint64 currentTime) = 0; protected: AbstractAxisInput(); - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override; Qt3DCore::QNodeId m_sourceDevice; }; diff --git a/src/input/backend/analogaxisinput.cpp b/src/input/backend/analogaxisinput.cpp index 4a801baec..845bfad85 100644 --- a/src/input/backend/analogaxisinput.cpp +++ b/src/input/backend/analogaxisinput.cpp @@ -59,29 +59,20 @@ AnalogAxisInput::AnalogAxisInput() { } -void AnalogAxisInput::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) -{ - const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QAnalogAxisInputData>>(change); - const auto &data = typedChange->data; - m_axis = data.axis; - AbstractAxisInput::initializeFromPeer(change); -} - void AnalogAxisInput::cleanup() { m_axis = 0; AbstractAxisInput::cleanup(); } -void AnalogAxisInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) +void AnalogAxisInput::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) { - if (e->type() == Qt3DCore::PropertyUpdated) { - Qt3DCore::QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("axis")) { - m_axis = propertyChange->value().toInt(); - } - } - AbstractAxisInput::sceneChangeEvent(e); + AbstractAxisInput::syncFromFrontEnd(frontEnd, firstTime); + const QAnalogAxisInput *node = qobject_cast<const QAnalogAxisInput *>(frontEnd); + if (!node) + return; + + m_axis = node->axis(); } float AnalogAxisInput::process(InputHandler *inputHandler, qint64 currentTime) diff --git a/src/input/backend/analogaxisinput_p.h b/src/input/backend/analogaxisinput_p.h index cd43e7d23..f13a2a2e1 100644 --- a/src/input/backend/analogaxisinput_p.h +++ b/src/input/backend/analogaxisinput_p.h @@ -66,13 +66,11 @@ public: void cleanup() final; inline int axis() const { return m_axis; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) final; float process(InputHandler *inputHandler, qint64 currentTime) override; private: - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final; - int m_axis; }; diff --git a/src/input/backend/buttonaxisinput.cpp b/src/input/backend/buttonaxisinput.cpp index fef8f6d41..ef67ce1fc 100644 --- a/src/input/backend/buttonaxisinput.cpp +++ b/src/input/backend/buttonaxisinput.cpp @@ -63,17 +63,6 @@ ButtonAxisInput::ButtonAxisInput() { } -void ButtonAxisInput::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) -{ - const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QButtonAxisInputData>>(change); - const auto &data = typedChange->data; - m_buttons = data.buttons; - m_scale = data.scale; - m_acceleration = data.acceleration; - m_deceleration = data.deceleration; - AbstractAxisInput::initializeFromPeer(change); -} - void ButtonAxisInput::cleanup() { m_scale = 0.0f; @@ -101,21 +90,17 @@ void ButtonAxisInput::updateSpeedRatio(qint64 currentTime, ButtonAxisInput::Upda m_lastUpdateTime = currentTime; } -void ButtonAxisInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) +void ButtonAxisInput::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) { - if (e->type() == Qt3DCore::PropertyUpdated) { - Qt3DCore::QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("scale")) { - m_scale = propertyChange->value().toFloat(); - } else if (propertyChange->propertyName() == QByteArrayLiteral("buttons")) { - m_buttons = propertyChange->value().value<QVector<int>>(); - } else if (propertyChange->propertyName() == QByteArrayLiteral("acceleration")) { - m_acceleration = propertyChange->value().toFloat(); - } else if (propertyChange->propertyName() == QByteArrayLiteral("deceleration")) { - m_deceleration = propertyChange->value().toFloat(); - } - } - AbstractAxisInput::sceneChangeEvent(e); + AbstractAxisInput::syncFromFrontEnd(frontEnd, firstTime); + const QButtonAxisInput *node = qobject_cast<const QButtonAxisInput *>(frontEnd); + if (!node) + return; + + m_scale = node->scale(); + m_buttons = node->buttons(); + m_acceleration = node->acceleration(); + m_deceleration = node->deceleration(); } namespace { diff --git a/src/input/backend/buttonaxisinput_p.h b/src/input/backend/buttonaxisinput_p.h index f47a9b5cc..761b9e92a 100644 --- a/src/input/backend/buttonaxisinput_p.h +++ b/src/input/backend/buttonaxisinput_p.h @@ -78,13 +78,12 @@ public: inline float speedRatio() const { return m_speedRatio; } inline qint64 lastUpdateTime() const { return m_lastUpdateTime; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) final; float process(InputHandler *inputHandler, qint64 currentTime) override; private: void updateSpeedRatio(qint64 currentTime, UpdateType type); - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final; QVector<int> m_buttons; float m_scale; diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 197f487a7..da49e70e6 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -151,8 +151,8 @@ QInputAspect::QInputAspect(QInputAspectPrivate &dd, QObject *parent) registerBackendType<QMouseHandler, true>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data()))); registerBackendType<QAxis, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Axis, Input::AxisManager>(d_func()->m_inputHandler->axisManager()))); registerBackendType<QAxisAccumulator, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisAccumulator, Input::AxisAccumulatorManager>(d_func()->m_inputHandler->axisAccumulatorManager()))); - registerBackendType<QAnalogAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AnalogAxisInput, Input::AnalogAxisInputManager>(d_func()->m_inputHandler->analogAxisInputManager()))); - registerBackendType<QButtonAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager()))); + registerBackendType<QAnalogAxisInput, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AnalogAxisInput, Input::AnalogAxisInputManager>(d_func()->m_inputHandler->analogAxisInputManager()))); + registerBackendType<QButtonAxisInput, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager()))); registerBackendType<QAxisSetting, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager()))); registerBackendType<Qt3DInput::QAction, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager()))); registerBackendType<QActionInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ActionInput, Input::ActionInputManager>(d_func()->m_inputHandler->actionInputManager()))); diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp index 1390b6b49..48ac4b3fe 100644 --- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp +++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp @@ -89,7 +89,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); // THEN QCOMPARE(backendAxisInput.peerId(), axisInput.id()); @@ -114,7 +114,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); backendAxisInput.cleanup(); // THEN @@ -125,23 +125,21 @@ private Q_SLOTS: void checkPropertyChanges() { // GIVEN + DummyAxisInput axisInput; DummyAxisInputBackend backendAxisInput; + simulateInitializationSync(&axisInput, &backendAxisInput); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setEnabled(false); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN - QCOMPARE(backendAxisInput.isEnabled(), true); + QCOMPARE(backendAxisInput.isEnabled(), false); // WHEN TestDevice device; - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("sourceDevice"); - updateChange->setValue(QVariant::fromValue(device.id())); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setSourceDevice(&device); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.sourceDevice(), device.id()); diff --git a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp index a37c37e96..0bdaadc46 100644 --- a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp +++ b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp @@ -55,7 +55,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); // THEN QCOMPARE(backendAxisInput.peerId(), axisInput.id()); @@ -83,7 +83,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); backendAxisInput.cleanup(); // THEN @@ -95,32 +95,28 @@ private Q_SLOTS: void checkPropertyChanges() { // GIVEN + Qt3DInput::QAnalogAxisInput axisInput; Qt3DInput::Input::AnalogAxisInput backendAxisInput; + simulateInitializationSync(&axisInput, &backendAxisInput); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(32); - updateChange->setPropertyName("axis"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setAxis(32); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.axis(), 32); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setEnabled(false); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN - QCOMPARE(backendAxisInput.isEnabled(), true); + QCOMPARE(backendAxisInput.isEnabled(), false); // WHEN TestDevice device; - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("sourceDevice"); - updateChange->setValue(QVariant::fromValue(device.id())); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setSourceDevice(&device); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.sourceDevice(), device.id()); @@ -142,7 +138,7 @@ private Q_SLOTS: axisInput.setEnabled(true); axisInput.setAxis(2); axisInput.setSourceDevice(device); - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); QCOMPARE(backendAxisInput.axis(), 2); // WHEN @@ -176,7 +172,7 @@ private Q_SLOTS: axisInput.setEnabled(false); axisInput.setAxis(2); axisInput.setSourceDevice(device); - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); QCOMPARE(backendAxisInput.axis(), 2); // WHEN diff --git a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp index 18887cfe6..5debe4d99 100644 --- a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp +++ b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp @@ -58,7 +58,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); // THEN QCOMPARE(backendAxisInput.peerId(), axisInput.id()); @@ -98,7 +98,7 @@ private Q_SLOTS: axisInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); backendAxisInput.cleanup(); // THEN @@ -115,77 +115,63 @@ private Q_SLOTS: void checkPropertyChanges() { // GIVEN + Qt3DInput::QButtonAxisInput axisInput; Qt3DInput::Input::ButtonAxisInput backendAxisInput; + simulateInitializationSync(&axisInput, &backendAxisInput); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(QVariant::fromValue(QVector<int>() << 64)); - updateChange->setPropertyName("buttons"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setButtons(QVector<int>() << 64); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.buttons(), QVector<int>() << 64); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setValue(0.5f); - updateChange->setPropertyName("scale"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setScale(0.5f); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.scale(), 0.5f); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setEnabled(false); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN - QCOMPARE(backendAxisInput.isEnabled(), true); + QCOMPARE(backendAxisInput.isEnabled(), false); // WHEN TestDevice device; - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("sourceDevice"); - updateChange->setValue(QVariant::fromValue(device.id())); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setSourceDevice(&device); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.sourceDevice(), device.id()); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setValue(0.42f); - updateChange->setPropertyName("acceleration"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setAcceleration(0.42f); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.acceleration(), 0.42f); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setValue(-0.42f); - updateChange->setPropertyName("acceleration"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setAcceleration(-0.42f); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QVERIFY(qIsInf(backendAxisInput.acceleration())); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setValue(0.43f); - updateChange->setPropertyName("deceleration"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setDeceleration(0.43f); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QCOMPARE(backendAxisInput.deceleration(), 0.43f); // WHEN - updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId()); - updateChange->setValue(-0.43f); - updateChange->setPropertyName("deceleration"); - backendAxisInput.sceneChangeEvent(updateChange); + axisInput.setDeceleration(-0.43f); + backendAxisInput.syncFromFrontEnd(&axisInput, false); // THEN QVERIFY(qIsInf(backendAxisInput.deceleration())); @@ -210,7 +196,7 @@ private Q_SLOTS: axisInput.setAcceleration(0.15f); axisInput.setDeceleration(0.3f); axisInput.setSourceDevice(device); - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); QCOMPARE(backendAxisInput.speedRatio(), 0.0f); QCOMPARE(backendAxisInput.lastUpdateTime(), 0); @@ -311,7 +297,7 @@ private Q_SLOTS: axisInput.setAcceleration(0.15f); axisInput.setDeceleration(0.3f); axisInput.setSourceDevice(device); - simulateInitialization(&axisInput, &backendAxisInput); + simulateInitializationSync(&axisInput, &backendAxisInput); QCOMPARE(backendAxisInput.speedRatio(), 0.0f); QCOMPARE(backendAxisInput.lastUpdateTime(), 0); diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp index d90034a3f..0b82bf23f 100644 --- a/tests/auto/input/utils/tst_utils.cpp +++ b/tests/auto/input/utils/tst_utils.cpp @@ -94,7 +94,7 @@ private Q_SLOTS: // WHEN -> Create backend AnalogAxisInput Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id()); - simulateInitialization(&analogAxisInput, backendAxisInput); + simulateInitializationSync(&analogAxisInput, backendAxisInput); // THEN QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis()); @@ -125,7 +125,7 @@ private Q_SLOTS: // WHEN -> Create backend AnalogAxisInput Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id()); - simulateInitialization(&analogAxisInput, backendAxisInput); + simulateInitializationSync(&analogAxisInput, backendAxisInput); // THEN QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis()); @@ -165,7 +165,7 @@ private Q_SLOTS: // WHEN -> Create backend AnalogAxisInput Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id()); - simulateInitialization(&analogAxisInput, backendAxisInput); + simulateInitializationSync(&analogAxisInput, backendAxisInput); // THEN QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis()); @@ -196,7 +196,7 @@ private Q_SLOTS: // WHEN -> Create backend AnalogAxisInput Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id()); - simulateInitialization(&analogAxisInput, backendAxisInput); + simulateInitializationSync(&analogAxisInput, backendAxisInput); // THEN QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis()); |