From 0d6e5f7d1775ee7be5fe62558d4c42996f49b9df Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Thu, 7 Sep 2023 12:04:59 +0300
Subject: [PATCH] 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: Eike Ziller <eike.ziller@qt.io>
---
 src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp | 6 ++----
 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 52a3f6d74aa..21720ae6dea 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 2e78d84ac82..fed5656e241 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