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

QmlDesigner: Remember each import preview camera position/rotation

Browse Source 
When importing multiple 3D assets at the same time, the import preview
camera rotation and position are now stored and restored when previewed
asset changes.

Fixes: QDS-12999
Change-Id: Ib65578e246ba4344188e97540546521b0cb39e5f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-06-14 17:28:23 +03:00
parent 0ca93004ed
commit c220599e2f
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
View File

@@ -94,12 +94,14 @@ void Qt5Import3dNodeInstanceServer::view3DAction([[maybe_unused]] const View3DAc
QQmlProperty sceneNodeProp(obj, "sceneNode", context()); QQmlProperty sceneNodeProp(obj, "sceneNode", context());
auto sceneNode = sceneNodeProp.read().value<QQuick3DNode *>(); auto sceneNode = sceneNodeProp.read().value<QQuick3DNode *>();
if (sceneNode && m_previewData.contains(m_currentNode)) { if (sceneNode && m_previewData.contains(m_currentNode)) {
const PreviewData &data = m_previewData[m_currentNode]; PreviewData &data = m_previewData[m_currentNode];
QPointF delta = command.value().toPointF(); QPointF delta = command.value().toPointF();
m_generalHelper->orbitCamera(m_view3D->camera(), m_view3D->camera()->eulerRotation(), m_generalHelper->orbitCamera(m_view3D->camera(), m_view3D->camera()->eulerRotation(),
data.lookAt, {}, {float(delta.x()), float(delta.y()), 0.f}); data.lookAt, {}, {float(delta.x()), float(delta.y()), 0.f});
// Add 2 renders to keep render timer alive for smooth rotation // Add 2 renders to keep render timer alive for smooth rotation
addCurrentNodeToRenderQueue(2); addCurrentNodeToRenderQueue(2);
data.cameraRotation = m_view3D->camera()->rotation();
data.cameraPosition = m_view3D->camera()->position();
} }
break; break;
} }
@@ -108,7 +110,8 @@ void Qt5Import3dNodeInstanceServer::view3DAction([[maybe_unused]] const View3DAc
const QString name = cmd["name"].toString(); const QString name = cmd["name"].toString();
const QString folder = cmd["folder"].toString(); const QString folder = cmd["folder"].toString();
if (m_previewData.contains(name)) { bool isUpdate = m_previewData.contains(name);
if (isUpdate) {
QQuick3DNode *node = m_previewData[name].node; QQuick3DNode *node = m_previewData[name].node;
if (node) { if (node) {
node->setParentItem({}); node->setParentItem({});
@@ -120,6 +123,10 @@ void Qt5Import3dNodeInstanceServer::view3DAction([[maybe_unused]] const View3DAc
PreviewData &data = m_previewData[name]; PreviewData &data = m_previewData[name];
data.name = name; data.name = name;
data.lookAt = {}; data.lookAt = {};
if (!isUpdate) {
data.cameraRotation = m_defaultCameraRotation;
data.cameraPosition = m_defaultCameraPosition;
}
QFileInfo fi(fileUrl().toLocalFile()); QFileInfo fi(fileUrl().toLocalFile());
QString compPath = fi.absolutePath() + '/' + folder + '/' + name + ".qml"; QString compPath = fi.absolutePath() + '/' + folder + '/' + name + ".qml";
@@ -143,7 +150,16 @@ void Qt5Import3dNodeInstanceServer::view3DAction([[maybe_unused]] const View3DAc
case View3DActionType::Import3dSetCurrentPreviewModel: { case View3DActionType::Import3dSetCurrentPreviewModel: {
QString newName = command.value().toString(); QString newName = command.value().toString();
if (m_previewData.contains(newName) && m_currentNode != newName) { if (m_previewData.contains(newName) && m_currentNode != newName) {
QQuick3DCamera *camera = m_view3D->camera();
if (m_previewData.contains(m_currentNode)) {
PreviewData &oldData = m_previewData[m_currentNode];
oldData.cameraPosition = camera->position();
oldData.cameraRotation = camera->rotation();
}
m_currentNode = newName; m_currentNode = newName;
const PreviewData &newData = m_previewData[m_currentNode];
camera->setPosition(newData.cameraPosition);
camera->setRotation(newData.cameraRotation);
addInitToRenderQueue(); addInitToRenderQueue();
addCurrentNodeToRenderQueue(); addCurrentNodeToRenderQueue();
} }

2
src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h
View File

@@ -50,6 +50,8 @@ private:
QVector3D lookAt; QVector3D lookAt;
QVector3D extents; QVector3D extents;
QQuick3DNode *node = {}; QQuick3DNode *node = {};
QQuaternion cameraRotation;
QVector3D cameraPosition;
}; };
QHash<QString, PreviewData> m_previewData; QHash<QString, PreviewData> m_previewData;