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

QmlDesigner: Adapt to quick3d private API change

Browse Source 
Some quick3d utility functions were moved under QSSGUtils namespace.
We only used one one-liner function from there, so just copied the
implementation into puppet to avoid this dependency.

Change-Id: I0b08157732161c750b3e53873fd10e1b20137b04
(cherry picked from commit 291e3096cd)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-09-07 12:04:59 +03:00
committed by hjk
parent 7054a2ae5f
commit 0d6e5f7d17
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
View File

@ -19,7 +19,6 @@
#include <QtQuick3DRuntimeRender/private/qssgrenderbuffermanager_p.h>
#include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
#include <QtQuick3DUtils/private/qssgbounds3_p.h>
#include <QtQuick3DUtils/private/qssgutils_p.h>
#include <QtQml/qqml.h>
#include <QtQuick/qquickwindow.h>
#include <QtQuick/qquickitem.h>
@ -800,9 +799,8 @@ QVector3D GeneralHelper::pivotScenePosition(QQuick3DNode *node) const
QMatrix4x4 localTransform;
localTransform.translate(node->position());
const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform;
return mat44::getPosition(sceneTransform);
const QMatrix4x4 m = parent->sceneTransform() * localTransform;
return QVector3D(m(0, 3), m(1, 3), m(2, 3));
}
// Calculate bounds for given node, including all child nodes.

6
src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
View File

@ -10,7 +10,6 @@
#include <QtQuick3D/private/qquick3dcamera_p.h>
#include <QtQuick3D/private/qquick3dorthographiccamera_p.h>
#include <QtQuick3DRuntimeRender/private/qssgrendercamera_p.h>
#include <QtQuick3DUtils/private/qssgutils_p.h>
#include <QtCore/qmath.h>
namespace QmlDesigner {
@ -735,9 +734,8 @@ QVector3D MouseArea3D::pivotScenePosition(QQuick3DNode *node) const
QMatrix4x4 localTransform;
localTransform.translate(node->position());
const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform;
return mat44::getPosition(sceneTransform);
const QMatrix4x4 m = parent->sceneTransform() * localTransform;
return QVector3D(m(0, 3), m(1, 3), m(2, 3));
}
double MouseArea3D::getRelativeScale(QQuick3DNode *node) const