From f91ee783c5704b0d55da0d96dacf6eca8933e748 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Fri, 19 Jan 2018 10:36:58 +0100 Subject: QMesh: do not rely on QAspectEngine to create QGeometryFactory - This would prevent QMesh created without parent/scene to have a proper geometry factory. - This avoid passing the engine around Change-Id: I5091970f96e87ab8b129475a1113ef84ce170388 Task-number: QTBUG-65506 Reviewed-by: Mike Krus --- src/render/geometry/geometryrenderer.cpp | 23 ++++++++++++++ src/render/geometry/qmesh.cpp | 51 ++++++++++++++++++++------------ src/render/geometry/qmesh_p.h | 33 ++++++++++++++++----- 3 files changed, 81 insertions(+), 26 deletions(-) (limited to 'src/render/geometry') diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 270380e14..00b53fd8d 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -41,11 +41,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -197,7 +199,28 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) void GeometryRenderer::executeFunctor() { Q_ASSERT(m_geometryFactory); + + // What kind of functor are we dealing with? + const bool isQMeshFunctor = m_geometryFactory->id() == Qt3DRender::functorTypeId(); + + if (isQMeshFunctor) { + QSharedPointer meshLoader = qSharedPointerCast(m_geometryFactory); + + // Set the aspect engine to allow remote downloads + if (meshLoader->nodeManagers() == nullptr) + meshLoader->setNodeManagers(m_renderer->nodeManagers()); + + if (meshLoader->downloaderService() == nullptr) { + Qt3DCore::QServiceLocator *services = m_renderer->services(); + meshLoader->setDownloaderService(services->service(Qt3DCore::QServiceLocator::DownloadHelperService)); + }; + } + + // Load geometry std::unique_ptr geometry((*m_geometryFactory)()); + + // If the geometry is null, then we were either unable to load it (Error) + // or the mesh is located at a remote url and needs to be downloaded first (Loading) if (!geometry) return; diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 834284547..063810ad6 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -88,9 +88,7 @@ void QMeshPrivate::setScene(Qt3DCore::QScene *scene) void QMeshPrivate::updateFunctor() { Q_Q(QMesh); - Qt3DCore::QAspectEngine *engine = m_scene ? m_scene->engine() : nullptr; - if (engine) - q->setGeometryFactory(QGeometryFactoryPtr(new MeshLoaderFunctor(q, engine))); + q->setGeometryFactory(QGeometryFactoryPtr(new MeshLoaderFunctor(q))); } /*! @@ -235,13 +233,14 @@ QString QMesh::meshName() const /*! * \internal */ -MeshLoaderFunctor::MeshLoaderFunctor(QMesh *mesh, Qt3DCore::QAspectEngine *engine, const QByteArray &sourceData) +MeshLoaderFunctor::MeshLoaderFunctor(QMesh *mesh, const QByteArray &sourceData) : QGeometryFactory() , m_mesh(mesh->id()) , m_sourcePath(mesh->source()) , m_meshName(mesh->meshName()) - , m_engine(engine) , m_sourceData(sourceData) + , m_nodeManagers(nullptr) + , m_downloaderService(nullptr) { } @@ -259,9 +258,14 @@ QGeometry *MeshLoaderFunctor::operator()() if (!Qt3DCore::QDownloadHelperService::isLocal(m_sourcePath)) { if (m_sourceData.isEmpty()) { if (m_mesh) { - auto downloadService = Qt3DCore::QDownloadHelperService::getService(m_engine); - Qt3DCore::QDownloadRequestPtr request(new MeshDownloadRequest(m_mesh, m_sourcePath, m_engine)); - downloadService->submitRequest(request); + // Output a warning in the case a user is calling the functor directly + // in the frontend + if (m_nodeManagers == nullptr || m_downloaderService == nullptr) { + qWarning() << "Mesh source points to a remote URL. Remotes meshes can only be loaded if the geometry is processed by the Qt3DRender backend"; + return nullptr; + } + Qt3DCore::QDownloadRequestPtr request(new MeshDownloadRequest(m_mesh, m_sourcePath, m_nodeManagers)); + m_downloaderService->submitRequest(request); } return nullptr; } @@ -332,39 +336,48 @@ bool MeshLoaderFunctor::operator ==(const QGeometryFactory &other) const return (otherFunctor->m_sourcePath == m_sourcePath && otherFunctor->m_sourceData.isEmpty() == m_sourceData.isEmpty() && otherFunctor->m_meshName == m_meshName && - otherFunctor->m_engine == m_engine); + otherFunctor->m_downloaderService == m_downloaderService && + otherFunctor->m_nodeManagers == m_nodeManagers); return false; } /*! * \internal */ -MeshDownloadRequest::MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Qt3DCore::QAspectEngine *engine) +MeshDownloadRequest::MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Render::NodeManagers *managers) : Qt3DCore::QDownloadRequest(source) , m_mesh(mesh) - , m_engine(engine) + , m_nodeManagers(managers) { - } +// Called in Aspect Thread context (not a Qt3D AspectJob) +// We are sure that when this is called, no AspectJob are running void MeshDownloadRequest::onCompleted() { if (cancelled() || !succeeded()) return; - QRenderAspectPrivate* d_aspect = QRenderAspectPrivate::findPrivate(m_engine); - if (!d_aspect) + if (!m_nodeManagers) return; - Render::GeometryRenderer *renderer = d_aspect->m_nodeManagers->geometryRendererManager()->lookupResource(m_mesh); + Render::GeometryRenderer *renderer = m_nodeManagers->geometryRendererManager()->lookupResource(m_mesh); if (!renderer) return; - QSharedPointer functor = qSharedPointerCast(renderer->geometryFactory()); - functor->m_sourceData = m_data; + QGeometryFactoryPtr geometryFactory = renderer->geometryFactory(); + if (!geometryFactory.isNull() && geometryFactory->id() == Qt3DRender::functorTypeId()) { + QSharedPointer functor = qSharedPointerCast(geometryFactory); + + // We make sure we are setting the result for the right request + // (the functor for the mesh could have changed in the meantime) + if (m_url == functor->sourcePath()) { + functor->setSourceData(m_data); - // mark the component as dirty so that the functor runs again in the correct job - d_aspect->m_nodeManagers->geometryRendererManager()->addDirtyGeometryRenderer(m_mesh); + // mark the component as dirty so that the functor runs again in the correct job + m_nodeManagers->geometryRendererManager()->addDirtyGeometryRenderer(m_mesh); + } + } } } // namespace Qt3DRender diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index 1f602ba89..becc57928 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -54,13 +54,16 @@ #include #include #include +#include #include QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QMesh; +namespace Render { +class NodeManagers; +} class QT3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate { @@ -80,28 +83,44 @@ public: class Q_AUTOTEST_EXPORT MeshDownloadRequest : public Qt3DCore::QDownloadRequest { public: - MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Qt3DCore::QAspectEngine *engine); + MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Render::NodeManagers *managers); void onCompleted() Q_DECL_OVERRIDE; private: Qt3DCore::QNodeId m_mesh; - Qt3DCore::QAspectEngine *m_engine; + Render::NodeManagers *m_nodeManagers; }; class Q_AUTOTEST_EXPORT MeshLoaderFunctor : public QGeometryFactory { public : - MeshLoaderFunctor(QMesh *mesh, Qt3DCore::QAspectEngine *engine, const QByteArray &sourceData = QByteArray()); - QGeometry *operator()() Q_DECL_OVERRIDE; - bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE; + MeshLoaderFunctor(QMesh *mesh, const QByteArray &sourceData = QByteArray()); + + void setNodeManagers(Render::NodeManagers *managers) { m_nodeManagers = managers; } + Render::NodeManagers *nodeManagers() const { return m_nodeManagers; } + + void setDownloaderService(Qt3DCore::QDownloadHelperService *service) { m_downloaderService = service; } + Qt3DCore::QDownloadHelperService *downloaderService() const { return m_downloaderService; } + + void setSourceData(const QByteArray &data) { m_sourceData = data; } + QByteArray sourceData() const { return m_sourceData; } + + QUrl sourcePath() const { return m_sourcePath; } + Qt3DCore::QNodeId mesh() const { return m_mesh; } + QString meshName() const { return m_meshName; } + + QGeometry *operator()() override; + bool operator ==(const QGeometryFactory &other) const override; QT3D_FUNCTOR(MeshLoaderFunctor) +private: Qt3DCore::QNodeId m_mesh; QUrl m_sourcePath; QString m_meshName; - Qt3DCore::QAspectEngine *m_engine; QByteArray m_sourceData; + Render::NodeManagers *m_nodeManagers; + Qt3DCore::QDownloadHelperService *m_downloaderService; }; -- cgit v1.2.3