feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Update selection box when target mesh changes

Browse Source 
Change-Id: I45d54baa78e9f8547da65358d93c6d376f24ce3b
Fixes: QDS-1840
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-03-20 11:47:52 +02:00
parent 9eceb46739
commit 0496318e9d
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+22 -5
View File
@@ -95,9 +95,9 @@ void SelectionBoxGeometry::setTargetNode(QQuick3DNode *targetNode)
if (auto model = qobject_cast<QQuick3DModel *>(m_targetNode)) {
QObject::connect(model, &QQuick3DModel::sourceChanged,
this, &SelectionBoxGeometry::update, Qt::QueuedConnection);
this, &SelectionBoxGeometry::targetMeshUpdated, Qt::QueuedConnection);
QObject::connect(model, &QQuick3DModel::geometryChanged,
this, &SelectionBoxGeometry::update, Qt::QueuedConnection);
this, &SelectionBoxGeometry::targetMeshUpdated, Qt::QueuedConnection);
}
if (m_targetNode) {
QObject::connect(m_targetNode, &QQuick3DNode::parentChanged,
@@ -132,6 +132,14 @@ void SelectionBoxGeometry::setView3D(QQuick3DViewport *view)
QSSGRenderGraphObject *SelectionBoxGeometry::updateSpatialNode(QSSGRenderGraphObject *node)
{
// If target node mesh has been updated, we need to defer updating the box geometry
// to the next frame to ensure target node geometry has been updated
if (m_meshUpdatePending) {
QTimer::singleShot(0, this, &SelectionBoxGeometry::update);
m_meshUpdatePending = false;
return node;
}
node = QQuick3DGeometry::updateSpatialNode(node);
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
@@ -163,10 +171,13 @@ QSSGRenderGraphObject *SelectionBoxGeometry::updateSpatialNode(QSSGRenderGraphOb
rootRN->localTransform = m;
rootRN->markDirty(QSSGRenderNode::TransformDirtyFlag::TransformNotDirty);
rootRN->calculateGlobalVariables();
m_asyncUpdatePending = false;
} else if (!m_asyncUpdatePending) {
m_asyncUpdatePending = true;
m_spatialNodeUpdatePending = false;
} else if (!m_spatialNodeUpdatePending) {
m_spatialNodeUpdatePending = true;
// A necessary spatial node doesn't yet exist. Defer selection box creation one frame.
// Note: We don't share pending flag with target mesh update, which is checked and
// cleared at the beginning of this method, as there would be potential for an endless
// loop in case we can't ever resolve one of the spatial nodes.
QTimer::singleShot(0, this, &SelectionBoxGeometry::update);
return node;
}
@@ -376,6 +387,12 @@ void SelectionBoxGeometry::trackNodeChanges(QQuick3DNode *node)
this, &SelectionBoxGeometry::update, Qt::QueuedConnection);
}
void SelectionBoxGeometry::targetMeshUpdated()
{
m_meshUpdatePending = true;
update();
}
}
}
share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.h
+3 -1
View File
@@ -74,6 +74,7 @@ private:
void appendVertexData(const QMatrix4x4 &m, QByteArray &vertexData, QByteArray &indexData,
const QVector3D &minBounds, const QVector3D &maxBounds);
void trackNodeChanges(QQuick3DNode *node);
void targetMeshUpdated();
QQuick3DNode *m_targetNode = nullptr;
QQuick3DViewport *m_view3D = nullptr;
@@ -81,7 +82,8 @@ private:
bool m_isEmpty = true;
QVector<QMetaObject::Connection> m_connections;
QSSGBounds3 m_bounds;
bool m_asyncUpdatePending = false;
bool m_spatialNodeUpdatePending = false;
bool m_meshUpdatePending = false;
};
}