From f06e898718851914bcb4c1d2410e7fd0bc776874 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 30 Sep 2019 16:38:32 +0100 Subject: Update QLogicalDevice to use direct sync Change-Id: I6e176c19ceda3ca1c0bf03da4d78fe92ec3344a7 Reviewed-by: Paul Lemire --- src/input/backend/logicaldevice.cpp | 42 ++++++++--------------------------- src/input/backend/logicaldevice_p.h | 8 +++---- src/input/frontend/qinputaspect.cpp | 2 +- src/input/frontend/qlogicaldevice.cpp | 25 ++++----------------- 4 files changed, 17 insertions(+), 60 deletions(-) (limited to 'src/input') diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index 5fcfb07bb..6bea0d85d 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -56,18 +56,10 @@ namespace Qt3DInput { namespace Input { LogicalDevice::LogicalDevice() - : QBackendNode() + : BackendNode() { } -void LogicalDevice::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) -{ - const auto typedChange = qSharedPointerCast>(change); - const auto &data = typedChange->data; - m_actions = data.actionIds; - m_axes = data.axisIds; -} - void LogicalDevice::cleanup() { QBackendNode::setEnabled(false); @@ -75,31 +67,15 @@ void LogicalDevice::cleanup() m_axes.clear(); } -void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) +void LogicalDevice::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) { - switch (e->type()) { - case Qt3DCore::PropertyValueAdded: { - const auto change = qSharedPointerCast(e); - if (change->propertyName() == QByteArrayLiteral("axis")) - m_axes.push_back(change->addedNodeId()); - else if (change->propertyName() == QByteArrayLiteral("action")) - m_actions.push_back(change->addedNodeId()); - break; - } - - case Qt3DCore::PropertyValueRemoved: { - const auto change = qSharedPointerCast(e); - if (change->propertyName() == QByteArrayLiteral("axis")) - m_axes.removeOne(change->removedNodeId()); - else if (change->propertyName() == QByteArrayLiteral("action")) - m_actions.removeOne(change->removedNodeId()); - break; - } - - default: - break; - } - QBackendNode::sceneChangeEvent(e); + BackendNode::syncFromFrontEnd(frontEnd, firstTime); + const QLogicalDevice *node = qobject_cast(frontEnd); + if (!node) + return; + + m_actions = Qt3DCore::qIdsForNodes(node->actions()); + m_axes = Qt3DCore::qIdsForNodes(node->axes()); } LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager) diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h index 138a54777..292f2a5c3 100644 --- a/src/input/backend/logicaldevice_p.h +++ b/src/input/backend/logicaldevice_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include QT_BEGIN_NAMESPACE @@ -62,7 +62,7 @@ namespace Input { class LogicalDeviceManager; -class Q_AUTOTEST_EXPORT LogicalDevice : public Qt3DCore::QBackendNode +class Q_AUTOTEST_EXPORT LogicalDevice : public BackendNode { public: LogicalDevice(); @@ -71,11 +71,9 @@ public: inline QVector axes() const { return m_axes; } inline QVector actions() const { return m_actions; } - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; private: - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final; - QVector m_axes; QVector m_actions; }; diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 110d9877f..6985e71c8 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -158,7 +158,7 @@ QInputAspect::QInputAspect(QInputAspectPrivate &dd, QObject *parent) registerBackendType(QBackendNodeMapperPtr(new Input::InputNodeFunctor(d_func()->m_inputHandler->actionInputManager()))); registerBackendType(QBackendNodeMapperPtr(new Input::InputNodeFunctor(d_func()->m_inputHandler->inputChordManager()))); registerBackendType(QBackendNodeMapperPtr(new Input::InputNodeFunctor(d_func()->m_inputHandler->inputSequenceManager()))); - registerBackendType(QBackendNodeMapperPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager()))); + registerBackendType(QBackendNodeMapperPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager()))); registerBackendType(QBackendNodeMapperPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data()))); registerBackendType(QBackendNodeMapperPtr(new Input::InputSettingsFunctor(d_func()->m_inputHandler.data()))); registerBackendType(QBackendNodeMapperPtr(new Input::PhysicalDeviceProxyNodeFunctor(d_func()->m_inputHandler->physicalDeviceProxyManager()))); diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 1e7033962..8869d2116 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -176,11 +176,7 @@ void QLogicalDevice::addAction(QAction *action) // Ensures proper bookkeeping d->registerDestructionHelper(action, &QLogicalDevice::removeAction, d->m_actions); - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), action); - change->setPropertyName("action"); - d->notifyObservers(change); - } + d->update(); } } @@ -191,12 +187,7 @@ void QLogicalDevice::removeAction(QAction *action) { Q_D(QLogicalDevice); if (d->m_actions.contains(action)) { - - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), action); - change->setPropertyName("action"); - d->notifyObservers(change); - } + d->update(); d->m_actions.removeOne(action); @@ -236,11 +227,7 @@ void QLogicalDevice::addAxis(QAxis *axis) // Ensures proper bookkeeping d->registerDestructionHelper(axis, &QLogicalDevice::removeAxis, d->m_axes); - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), axis); - change->setPropertyName("axis"); - d->notifyObservers(change); - } + d->update(); } } @@ -251,11 +238,7 @@ void QLogicalDevice::removeAxis(QAxis *axis) { Q_D(QLogicalDevice); if (d->m_axes.contains(axis)) { - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), axis); - change->setPropertyName("axis"); - d->notifyObservers(change); - } + d->update(); d->m_axes.removeOne(axis); -- cgit v1.2.3