diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-10-11 14:03:41 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-10-14 19:56:15 +0100 |
commit | e8ef2e3e75278f18abe977927393c819d3880618 (patch) | |
tree | d0ca0e602272b9e1443e1e85a7cd6be8ad25b2d6 /src/quick3d | |
parent | fd85ebb1e24d48ffdff0659810a1830691bba89f (diff) |
Update QScene2D to use direct sync
Change-Id: Iba2fa5ce9d295706fc50f904cac68f00bd8f02b7
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.cpp | 34 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.h | 3 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d_p.h | 2 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 158 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d_p.h | 10 |
5 files changed, 85 insertions, 122 deletions
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index ef06f39f1..8cabb7541 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -42,8 +42,6 @@ #include "scene2devent_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> QT_BEGIN_NAMESPACE @@ -190,15 +188,6 @@ QScene2DPrivate::~QScene2DPrivate() delete m_renderManager; } -void QScene2DPrivate::setScene(Qt3DCore::QScene *scene) -{ - Q_Q(QScene2D); - QNodePrivate::setScene(scene); - const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(q->id()); - change->setPropertyName("sceneInitialized"); - notifyObservers(change); -} - /*! The constructor creates a new QScene2D instance with the specified \a parent. @@ -311,6 +300,15 @@ QVector<Qt3DCore::QEntity*> QScene2D::entities() } /*! + Retrieve entities associated with the QScene2D. + */ +QVector<Qt3DCore::QEntity*> QScene2D::entities() const +{ + Q_D(const QScene2D); + return d->m_entities; +} + +/*! Adds an \a entity to the the QScene2D object. If the entities have QObjectPicker, the pick events from that entity are sent to QScene2D and converted to mouse events. */ @@ -321,12 +319,7 @@ void QScene2D::addEntity(Qt3DCore::QEntity *entity) d->m_entities.append(entity); d->registerDestructionHelper(entity, &QScene2D::removeEntity, d->m_entities); - - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), entity); - change->setPropertyName("entities"); - d->notifyObservers(change); - } + d->updateNode(entity, "entities", PropertyValueAdded); } } @@ -340,12 +333,7 @@ void QScene2D::removeEntity(Qt3DCore::QEntity *entity) d->m_entities.removeAll(entity); d->unregisterDestructionHelper(entity); - - if (d->m_changeArbiter != nullptr) { - const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), entity); - change->setPropertyName("entities"); - d->notifyObservers(change); - } + d->updateNode(entity, "entities", PropertyValueRemoved); } } diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index eab900ca4..2f5c1010e 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -86,7 +86,8 @@ public: QQuickItem *item() const; bool isMouseEnabled() const; - QVector<Qt3DCore::QEntity *> entities(); + Q_DECL_DEPRECATED QVector<Qt3DCore::QEntity *> entities(); + QVector<Qt3DCore::QEntity *> entities() const; void addEntity(Qt3DCore::QEntity *entity); void removeEntity(Qt3DCore::QEntity *entity); diff --git a/src/quick3d/quick3dscene2d/items/qscene2d_p.h b/src/quick3d/quick3dscene2d/items/qscene2d_p.h index ce354845a..4814564c2 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d_p.h @@ -74,8 +74,6 @@ public: QScene2DPrivate(); ~QScene2DPrivate(); - void setScene(Qt3DCore::QScene *scene) override; - Scene2DManager *m_renderManager; QMetaObject::Connection m_textureDestroyedConnection; Qt3DRender::QRenderTargetOutput *m_output; diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 562f0d2c7..981b290e2 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -37,6 +37,7 @@ #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DQuickScene2D/qscene2d.h> #include <Qt3DRender/qpicktriangleevent.h> #include <Qt3DRender/qobjectpicker.h> @@ -58,6 +59,7 @@ #include <private/qbackendnode_p.h> #include <private/qobjectpicker_p.h> #include <private/qpickevent_p.h> +#include <private/qpicktriangleevent_p.h> #include <private/entity_p.h> #include <private/platformsurfacefilter_p.h> #include <private/trianglesvisitor_p.h> @@ -130,7 +132,9 @@ Scene2D::Scene2D() Scene2D::~Scene2D() { - stopGrabbing(); + for (auto connection: qAsConst(m_connections)) + QObject::disconnect(connection); + m_connections.clear(); } void Scene2D::setOutput(Qt3DCore::QNodeId outputId) @@ -141,12 +145,9 @@ void Scene2D::setOutput(Qt3DCore::QNodeId outputId) void Scene2D::initializeSharedObject() { if (!m_initialized) { - // bail out if we're running autotests - if (!m_sharedObject->m_renderManager - || m_sharedObject->m_renderManager->thread() == QThread::currentThread()) { + if (!qgetenv("QT3D_SCENE2D_DISABLE_RENDERING").isEmpty()) return; - } renderThreadClientCount->fetchAndAddAcquire(1); @@ -171,76 +172,50 @@ void Scene2D::initializeSharedObject() } } -void Scene2D::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) +void Scene2D::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) { - const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QScene2DData>>(change); - const auto &data = typedChange->data; - m_renderPolicy = data.renderPolicy; - setSharedObject(data.sharedObject); - setOutput(data.output); - m_entities = data.entityIds; - m_mouseEnabled = data.mouseEnabled; -} + Qt3DRender::Render::BackendNode::syncFromFrontEnd(frontEnd, firstTime); + const QScene2D *node = qobject_cast<const QScene2D *>(frontEnd); + if (!node) + return; + const QScene2DPrivate *dnode = static_cast<const QScene2DPrivate *>(QScene2DPrivate::get(node)); -void Scene2D::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) -{ - switch (e->type()) { - - case Qt3DCore::PropertyUpdated: { - - Qt3DCore::QPropertyUpdatedChangePtr propertyChange - = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("renderPolicy")) { - m_renderPolicy = propertyChange->value().value<QScene2D::RenderPolicy>(); - } else if (propertyChange->propertyName() == QByteArrayLiteral("output")) { - Qt3DCore::QNodeId outputId = propertyChange->value().value<Qt3DCore::QNodeId>(); - setOutput(outputId); - } else if (propertyChange->propertyName() == QByteArrayLiteral("pressed")) { - QObjectPickerEvent ev = propertyChange->value().value<QObjectPickerEvent>(); - QPickEventPtr pickEvent = ev.event; - handlePickEvent(QEvent::MouseButtonPress, pickEvent); - } else if (propertyChange->propertyName() == QByteArrayLiteral("released")) { - QObjectPickerEvent ev = propertyChange->value().value<QObjectPickerEvent>(); - QPickEventPtr pickEvent = ev.event; - handlePickEvent(QEvent::MouseButtonRelease, pickEvent); - } else if (propertyChange->propertyName() == QByteArrayLiteral("moved")) { - QObjectPickerEvent ev = propertyChange->value().value<QObjectPickerEvent>(); - QPickEventPtr pickEvent = ev.event; - handlePickEvent(QEvent::MouseMove, pickEvent); - } else if (propertyChange->propertyName() == QByteArrayLiteral("mouseEnabled")) { - m_mouseEnabled = propertyChange->value().toBool(); - if (m_mouseEnabled && !m_cachedPickEvent.isNull()) { - handlePickEvent(QEvent::MouseButtonPress, m_cachedPickEvent); - m_cachedPickEvent.clear(); - } - } else if (propertyChange->propertyName() == QByteArrayLiteral("sceneInitialized")) { - startGrabbing(); + if (m_mouseEnabled != node->isMouseEnabled()) { + m_mouseEnabled = node->isMouseEnabled(); + if (!firstTime && m_mouseEnabled && m_cachedPickEvent) { + handlePickEvent(QEvent::MouseButtonPress, m_cachedPickEvent.data()); + m_cachedPickEvent.clear(); } - break; } - case Qt3DCore::PropertyValueAdded: { - const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e); - if (change->propertyName() == QByteArrayLiteral("entities")) { - m_entities.push_back(change->addedNodeId()); - registerObjectPickerEvents(change->addedNodeId()); - } - break; - } + m_renderPolicy = node->renderPolicy(); + auto id = Qt3DCore::qIdForNode(node->output()); + if (id != m_outputId) + setOutput(id); + + auto ids = Qt3DCore::qIdsForNodes(node->entities()); + std::sort(std::begin(ids), std::end(ids)); + Qt3DCore::QNodeIdVector addedEntities; + Qt3DCore::QNodeIdVector removedEntities; + std::set_difference(std::begin(ids), std::end(ids), + std::begin(m_entities), std::end(m_entities), + std::inserter(addedEntities, addedEntities.end())); + std::set_difference(std::begin(m_entities), std::end(m_entities), + std::begin(ids), std::end(ids), + std::inserter(removedEntities, removedEntities.end())); + for (const auto &id: addedEntities) { + Qt3DCore::QEntity *entity = qobject_cast<Qt3DCore::QEntity *>(dnode->m_scene->lookupNode(id)); + if (!entity) + return; - case Qt3DCore::PropertyValueRemoved: { - const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e); - if (change->propertyName() == QByteArrayLiteral("entities")) { - m_entities.removeOne(change->removedNodeId()); - unregisterObjectPickerEvents(change->removedNodeId()); - } - break; + registerObjectPickerEvents(entity); } + for (const auto &id: removedEntities) + unregisterObjectPickerEvents(id); + m_entities = ids; - default: - break; - } - BackendNode::sceneChangeEvent(e); + if (firstTime) + setSharedObject(dnode->m_renderManager->m_sharedObject); } void Scene2D::setSharedObject(Qt3DRender::Quick::Scene2DSharedObjectPtr sharedObject) @@ -449,19 +424,31 @@ void Scene2D::cleanup() } -bool Scene2D::registerObjectPickerEvents(Qt3DCore::QNodeId entityId) +bool Scene2D::registerObjectPickerEvents(Qt3DCore::QEntity *qentity) { Entity *entity = nullptr; if (!resourceAccessor()->accessResource(RenderBackendResourceAccessor::EntityHandle, - entityId, (void**)&entity, nullptr)) { + qentity->id(), (void**)&entity, nullptr)) return false; - } + if (!entity->containsComponentsOfType<ObjectPicker>() || !entity->containsComponentsOfType<GeometryRenderer>()) { qCWarning(Qt3DRender::Quick::Scene2D) << Q_FUNC_INFO << "Entity does not contain required components: ObjectPicker and GeometryRenderer"; return false; } + + QObjectPicker *picker = qentity->componentsOfType<QObjectPicker>().front(); + m_connections << QObject::connect(picker, &QObjectPicker::pressed, qentity, [this](Qt3DRender::QPickEvent *pick) { + handlePickEvent(QEvent::MouseButtonPress, pick); + }); + m_connections << QObject::connect(picker, &QObjectPicker::released, qentity, [this](Qt3DRender::QPickEvent *pick) { + handlePickEvent(QEvent::MouseButtonRelease, pick); + }); + m_connections << QObject::connect(picker, &QObjectPicker::moved, qentity, [this](Qt3DRender::QPickEvent *pick) { + handlePickEvent(QEvent::MouseMove, pick); + }); + Qt3DCore::QBackendNodePrivate *priv = Qt3DCore::QBackendNodePrivate::get(this); Qt3DCore::QChangeArbiter *arbiter = static_cast<Qt3DCore::QChangeArbiter*>(priv->m_arbiter); arbiter->registerObserver(d_ptr, entity->componentUuid<ObjectPicker>()); @@ -472,26 +459,27 @@ void Scene2D::unregisterObjectPickerEvents(Qt3DCore::QNodeId entityId) { Entity *entity = nullptr; if (!resourceAccessor()->accessResource(RenderBackendResourceAccessor::EntityHandle, - entityId, (void**)&entity, nullptr)) { + entityId, (void**)&entity, nullptr)) return; - } + Qt3DCore::QBackendNodePrivate *priv = Qt3DCore::QBackendNodePrivate::get(this); Qt3DCore::QChangeArbiter *arbiter = static_cast<Qt3DCore::QChangeArbiter*>(priv->m_arbiter); arbiter->unregisterObserver(d_ptr, entity->componentUuid<ObjectPicker>()); } -void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEventPtr &ev) +void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEvent *ev) { if (!isEnabled()) return; if (m_mouseEnabled) { - QPickTriangleEvent *pickTriangle = static_cast<QPickTriangleEvent *>(ev.data()); + const QPickTriangleEvent *pickTriangle = static_cast<const QPickTriangleEvent *>(ev); + Q_ASSERT(pickTriangle->entity()); Entity *entity = nullptr; if (!resourceAccessor()->accessResource(RenderBackendResourceAccessor::EntityHandle, - QPickEventPrivate::get(pickTriangle)->m_entity, - (void**)&entity, nullptr)) { + Qt3DCore::qIdForNode(pickTriangle->entity()), + (void**)&entity, nullptr)) return; - } + CoordinateReader reader(renderer()->nodeManagers()); if (reader.setGeometry(entity->renderComponent<GeometryRenderer>(), QAttribute::defaultTextureCoordinateAttributeName())) { @@ -515,24 +503,14 @@ void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEventPtr &ev) QCoreApplication::postEvent(m_sharedObject->m_quickWindow, mouseEvent); } } else if (type == QEvent::MouseButtonPress) { - m_cachedPickEvent = ev; + const QPickTriangleEvent *pickTriangle = static_cast<const QPickTriangleEvent *>(ev); + const QPickTriangleEventPrivate *dpick = QPickTriangleEventPrivate::get(pickTriangle); + m_cachedPickEvent = QPickEventPtr(dpick->clone()); } else { m_cachedPickEvent.clear(); } } -void Scene2D::startGrabbing() -{ - for (Qt3DCore::QNodeId e : qAsConst(m_entities)) - registerObjectPickerEvents(e); -} - -void Scene2D::stopGrabbing() -{ - for (Qt3DCore::QNodeId e : qAsConst(m_entities)) - unregisterObjectPickerEvents(e); -} - } // namespace Quick } // namespace Render } // namespace Qt3DRender diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h index bd7874cd6..2f2b556ec 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h @@ -94,16 +94,13 @@ public: void setOutput(Qt3DCore::QNodeId outputId); void initializeSharedObject(); - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override; - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; bool updateFbo(QOpenGLTexture *texture); void syncRenderControl(); - void startGrabbing(); - void stopGrabbing(); - bool registerObjectPickerEvents(Qt3DCore::QNodeId entityId); + bool registerObjectPickerEvents(Qt3DCore::QEntity *qentity); void unregisterObjectPickerEvents(Qt3DCore::QNodeId entityId); - void handlePickEvent(int type, const Qt3DRender::QPickEventPtr &ev); + void handlePickEvent(int type, const QPickEvent *ev); QOpenGLContext *m_context; QOpenGLContext *m_shareContext; @@ -126,6 +123,7 @@ public: #ifdef QT_OPENGL_ES_2_ANGLE bool m_usingAngle; #endif + QVector<QMetaObject::Connection> m_connections; }; } // Quick |