Fix selection box and drag scaling for off-center custom meshes

Change-Id: Ic122846cdc7e82166a46e5846665f9fdf19821b5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/editorlib/src/editorscene.cpp b/editorlib/src/editorscene.cpp
index 8533394..a5b09c2 100644
--- a/editorlib/src/editorscene.cpp
+++ b/editorlib/src/editorscene.cpp
@@ -944,9 +944,12 @@ void EditorScene::dragScaleSelectedEntity(const QPoint &newPos, bool shiftDown,
 
         // Calculate the translate needed to keep opposite corner anchored
         QMatrix4x4 ancestralTransform = EditorUtils::totalAncestralTransform(m_selectedEntity);
-        QVector3D newHandleCornerTranslation =
-                EditorUtils::totalAncestralScale(m_selectedEntity)
-                * m_lockToAxisScale * m_dragHandleCornerTranslation;
+        QVector3D ancestralScale =
+                EditorUtils::totalAncestralScale(m_selectedEntity) * m_lockToAxisScale;
+        QVector3D newHandleCornerTranslation = ancestralScale * m_dragHandleCornerTranslation;
+        EditorSceneItem *selectedItem = m_sceneItems.value(m_selectedEntity->id(), nullptr);
+        if (selectedItem)
+            newHandleCornerTranslation -= ancestralScale * selectedItem->entityMeshCenter();
         QVector3D newTranslation = ancestralTransform.inverted() * m_dragInitialHandleMatrix
                 * (newHandleCornerTranslation - m_dragInitialHandleCornerTranslation);