Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-14 08:01:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed moving pieces while editing submodels in place.

Browse source
This commit is contained in:
Leonardo Zide 2021-04-25 11:36:35 -07:00
parent 249fa262f7
commit 371c248f10
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/lc_view.cpp
View file

@ -3561,9 +3561,16 @@ void lcView::OnMouseMove()
const lcVector3& MouseDownStart = Points[2]; const lcVector3& MouseDownStart = Points[2];
const lcVector3& MouseDownEnd = Points[3]; const lcVector3& MouseDownEnd = Points[3];
lcVector3 Center; lcVector3 OverlayCenter;
lcMatrix33 RelativeRotation; 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) if (mTrackTool == lcTrackTool::MoveX || mTrackTool == lcTrackTool::MoveY || mTrackTool == lcTrackTool::MoveZ)
{ {
@ -3575,7 +3582,7 @@ void lcView::OnMouseMove()
else else
Direction = lcVector3(0.0f, 0.0f, 1.0f); Direction = lcVector3(0.0f, 0.0f, 1.0f);
Direction = lcMul(Direction, RelativeRotation); Direction = lcMul30(Direction, WorldMatrix);
lcVector3 Intersection; lcVector3 Intersection;
lcClosestPointsBetweenLines(Center, Center + Direction, CurrentStart, CurrentEnd, &Intersection, nullptr); lcClosestPointsBetweenLines(Center, Center + Direction, CurrentStart, CurrentEnd, &Intersection, nullptr);
@ -3584,7 +3591,7 @@ void lcView::OnMouseMove()
lcClosestPointsBetweenLines(Center, Center + Direction, MouseDownStart, MouseDownEnd, &MoveStart, nullptr); lcClosestPointsBetweenLines(Center, Center + Direction, MouseDownStart, MouseDownEnd, &MoveStart, nullptr);
lcVector3 Distance = Intersection - MoveStart; lcVector3 Distance = Intersection - MoveStart;
Distance = lcMul(Distance, lcMatrix33AffineInverse(RelativeRotation)); Distance = lcMul(Distance, lcMatrix33AffineInverse(lcMatrix33(WorldMatrix)));
ActiveModel->UpdateMoveTool(Distance, true, mTrackButton != lcTrackButton::Left); ActiveModel->UpdateMoveTool(Distance, true, mTrackButton != lcTrackButton::Left);
} }
else if (mTrackTool == lcTrackTool::MoveXY || mTrackTool == lcTrackTool::MoveXZ || mTrackTool == lcTrackTool::MoveYZ) else if (mTrackTool == lcTrackTool::MoveXY || mTrackTool == lcTrackTool::MoveXZ || mTrackTool == lcTrackTool::MoveYZ)