File 0003-Fixed-moving-pieces-while-editing-submodels-in-place.patch of Package leocad
From 371c248f103a06ac169cf4e0b77ad1ef76f58f35 Mon Sep 17 00:00:00 2001
From: Leonardo Zide <leozide@gmail.com>
Date: Sun, 25 Apr 2021 11:36:35 -0700
Subject: [PATCH 3/4] Fixed moving pieces while editing submodels in place.
---
common/lc_view.cpp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/common/lc_view.cpp b/common/lc_view.cpp
index 92a9d408..8a6abb13 100644
--- a/common/lc_view.cpp
+++ b/common/lc_view.cpp
@@ -3561,9 +3561,16 @@ void lcView::OnMouseMove()
const lcVector3& MouseDownStart = Points[2];
const lcVector3& MouseDownEnd = Points[3];
- lcVector3 Center;
+ lcVector3 OverlayCenter;
lcMatrix33 RelativeRotation;
- ActiveModel->GetMoveRotateTransform(Center, RelativeRotation);
+ ActiveModel->GetMoveRotateTransform(OverlayCenter, RelativeRotation);
+
+ lcMatrix44 WorldMatrix = lcMatrix44(RelativeRotation, OverlayCenter);
+
+ if (ActiveModel != mModel)
+ WorldMatrix = lcMul(WorldMatrix, mActiveSubmodelTransform);
+
+ const lcVector3 Center = WorldMatrix.GetTranslation();
if (mTrackTool == lcTrackTool::MoveX || mTrackTool == lcTrackTool::MoveY || mTrackTool == lcTrackTool::MoveZ)
{
@@ -3575,7 +3582,7 @@ void lcView::OnMouseMove()
else
Direction = lcVector3(0.0f, 0.0f, 1.0f);
- Direction = lcMul(Direction, RelativeRotation);
+ Direction = lcMul30(Direction, WorldMatrix);
lcVector3 Intersection;
lcClosestPointsBetweenLines(Center, Center + Direction, CurrentStart, CurrentEnd, &Intersection, nullptr);
@@ -3584,7 +3591,7 @@ void lcView::OnMouseMove()
lcClosestPointsBetweenLines(Center, Center + Direction, MouseDownStart, MouseDownEnd, &MoveStart, nullptr);
lcVector3 Distance = Intersection - MoveStart;
- Distance = lcMul(Distance, lcMatrix33AffineInverse(RelativeRotation));
+ Distance = lcMul(Distance, lcMatrix33AffineInverse(lcMatrix33(WorldMatrix)));
ActiveModel->UpdateMoveTool(Distance, true, mTrackButton != lcTrackButton::Left);
}
else if (mTrackTool == lcTrackTool::MoveXY || mTrackTool == lcTrackTool::MoveXZ || mTrackTool == lcTrackTool::MoveYZ)
--
2.31.1
