Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Bounds Control With Non Uniform Scale Issues #10133

Merged
merged 1 commit into from Aug 31, 2021
Merged

Fix for Bounds Control With Non Uniform Scale Issues #10133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs
View file
Open in desktop
Expand Up @@ -1242,8 +1242,8 @@ private void TransformTarget(HandleType transformType)
else // non-uniform scaling
{
// get diff from center point of box
Vector3 initialDist = (initialGrabPoint - oppositeCorner);
Vector3 currentDist = (currentGrabPoint - oppositeCorner);
Vector3 initialDist = Target.transform.InverseTransformVector(initialGrabPoint - oppositeCorner);
Vector3 currentDist = Target.transform.InverseTransformVector(currentGrabPoint - oppositeCorner);
Vector3 grabDiff = (currentDist - initialDist);
scaleFactor = Vector3.one + grabDiff.Div(initialDist);
}
Expand Down Expand Up @@ -1284,8 +1284,8 @@ private void TransformTarget(HandleType transformType)
clampedTransform.Scale;
}

var originalRelativePosition = initialPositionOnGrabStart - oppositeCorner;
var newPosition = originalRelativePosition.Div(initialScaleOnGrabStart).Mul(Target.transform.localScale) + oppositeCorner;
var originalRelativePosition = Target.transform.InverseTransformDirection(initialPositionOnGrabStart - oppositeCorner);
var newPosition = Target.transform.TransformDirection(originalRelativePosition.Mul(scaleFactor)) + oppositeCorner;
Target.transform.position = smoothingActive ? Smoothing.SmoothTo(Target.transform.position, newPosition, scaleLerpTime, Time.deltaTime) : newPosition;
}
else if (transformType == HandleType.Translation)
Expand Down