diff options
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 8 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem_p.h | 2 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 8 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer_p.h | 1 | ||||
-rw-r--r-- | src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp | 40 |
5 files changed, 50 insertions, 9 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 8cf2ffd87..57e6b0e6e 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -200,6 +200,9 @@ private: expression that depends on property updates driven by the Qt 3D simulation loop (FrameAction) will never reavaluates. */ + +qint8 Scene3DItem::ms_framesNeededToFlushPipeline = 3; + Scene3DItem::Scene3DItem(QQuickItem *parent) : QQuickItem(parent) , m_entity(nullptr) @@ -230,6 +233,11 @@ Scene3DItem::Scene3DItem(QQuickItem *parent) // we still won't get ignored by the QtQuick SG when in Underlay mode setWidth(1); setHeight(1); + + const QByteArray framesToFlushCountEnvVar = qgetenv("QT3D_SCENE3D_FRAMES_FLUSH_COUNT"); + if (!framesToFlushCountEnvVar.isEmpty()) { + ms_framesNeededToFlushPipeline = framesToFlushCountEnvVar.toInt(); + } } Scene3DItem::~Scene3DItem() diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index 3a6ca5007..41e82e9f1 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -171,7 +171,7 @@ private: QMetaObject::Connection m_windowConnection; qint8 m_framesToRender; - static const qint8 ms_framesNeededToFlushPipeline = 2; + static qint8 ms_framesNeededToFlushPipeline; }; } // Qt3DRender diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 51589de6c..275068b60 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -148,6 +148,7 @@ Scene3DRenderer::Scene3DRenderer() , m_shouldRender(false) , m_dirtyViews(false) , m_skipFrame(false) + , m_skippedLastFrame(false) , m_allowRendering(0) , m_compositingMode(Scene3DItem::FBO) { @@ -235,9 +236,16 @@ void Scene3DRenderer::beforeSynchronize() m_skipFrame = false; ContextSaver saver; static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderSynchronous(false); + + // Ensure the QtQuick GL state is reset to prevent previous Qt3D calls from leaving some objects bound in the state + if (!m_skippedLastFrame) + m_window->resetOpenGLState(); + + m_skippedLastFrame = true; return; } + m_skippedLastFrame = false; m_shouldRender = true; // Check size / multisampling diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index 22ce478e1..7c749b513 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -123,6 +123,7 @@ private: bool m_shouldRender; bool m_dirtyViews; bool m_skipFrame; + bool m_skippedLastFrame; QSemaphore m_allowRendering; Scene3DItem::CompositingMode m_compositingMode; QVector<Scene3DView *> m_views; diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index 938747a95..44c75a4df 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -73,6 +73,7 @@ public: #endif void _q_createdItem(int, QObject *); void _q_modelUpdated(const QQmlChangeSet &, bool); + QObject *modelObject(int index, bool async); bool m_componentComplete:1; bool m_effectiveReset:1; @@ -81,6 +82,7 @@ public: #if QT_CONFIG(qml_delegate_model) bool m_ownModel:1; #endif + int m_requestedIndex; QVariant m_model; QQmlInstanceModel *m_instanceModel; QQmlComponent *m_delegate; @@ -99,6 +101,7 @@ Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate() #if QT_CONFIG(qml_delegate_model) , m_ownModel(false) #endif + , m_requestedIndex(-1) , m_model(QVariant(1)) , m_instanceModel(0) , m_delegate(0) @@ -129,6 +132,14 @@ void Quick3DNodeInstantiatorPrivate::clear() emit q->objectChanged(); } +QObject *Quick3DNodeInstantiatorPrivate::modelObject(int index, bool async) +{ + m_requestedIndex = index; + QObject *o = m_instanceModel->object(index, async ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); + m_requestedIndex = -1; + return o; +} + void Quick3DNodeInstantiatorPrivate::regenerate() { Q_Q(Quick3DNodeInstantiator); @@ -146,8 +157,7 @@ void Quick3DNodeInstantiatorPrivate::regenerate() } for (int i = 0; i < m_instanceModel->count(); i++) { - QObject *object = m_instanceModel->object(i, m_async ? - QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); + QObject *object = modelObject(i, m_async); // If the item was already created we won't get a createdItem if (object) _q_createdItem(i, object); @@ -161,8 +171,19 @@ void Quick3DNodeInstantiatorPrivate::_q_createdItem(int idx, QObject *item) Q_Q(Quick3DNodeInstantiator); if (m_objects.contains(item)) //Case when it was created synchronously in regenerate return; + if (m_requestedIndex != idx) // Asynchronous creation, reference the object | + (void)m_instanceModel->object(idx); static_cast<QNode *>(item)->setParent(q->parentNode()); - m_objects.insert(idx, item); + if (m_objects.size() < idx + 1) { + int modelCount = m_instanceModel->count(); + if (m_objects.capacity() < modelCount) + m_objects.reserve(modelCount); + m_objects.resize(idx + 1); + } + if (QObject *o = m_objects.at(idx)) + m_instanceModel->release(o); + m_objects.replace(idx, item); + if (m_objects.count() == 1) emit q->objectChanged(); emit q->objectAdded(idx, item); @@ -213,11 +234,14 @@ void Quick3DNodeInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &change QVector<QPointer<QObject> > movedObjects = moved.value(insert.moveId); m_objects = m_objects.mid(0, index) + movedObjects + m_objects.mid(index); } else for (int i = 0; i < insert.count; ++i) { - int modelIndex = index + i; - QObject *obj = m_instanceModel->object(modelIndex, m_async ? - QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); - if (obj) - _q_createdItem(modelIndex, obj); + if (insert.index <= m_objects.count()) + m_objects.insert(insert.index, insert.count, nullptr); + for (int i = 0; i < insert.count; ++i) { + int modelIndex = index + i; + QObject *obj = modelObject(modelIndex, m_async); + if (obj) + _q_createdItem(modelIndex, obj); + } } difference += insert.count; } |