diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2023-09-07 12:04:59 +0300 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-09-21 11:44:11 +0000 |
| commit | 87a3d9e063230dfb678ee3f427baba7ab63c7d1e (patch) | |
| tree | 4c616334d3c0de9a92f3239f484db33d2fcd740f | |
| parent | 2f80ef7f23e25acd109eb696e0caffe29c448584 (diff) | |
QmlDesigner: Adapt to quick3d private API change
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 291e3096cd5d0763370238252143c3bb4fe93839)
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp | 6 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp index 52a3f6d74a..21720ae6de 100644 --- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp +++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp @@ -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. diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp index 2e78d84ac8..fed5656e24 100644 --- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp +++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp @@ -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 |