Fix RotateAboutObjectCentre bug

MenelvagorMilsom · MenelvagorMilsom · commit b444145fab5f · 2019-12-16T17:40:25.000Z
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/Manipulation/ManipulationMoveLogic.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/Manipulation/ManipulationMoveLogic.cs
@@ -69,7 +69,7 @@ public Vector3 Update(MixedRealityPose pointerCentroidPose, Quaternion objectRot
             }
             else
             {
-                return pointerCentroidPose.Position + pointerCentroidPose.Rotation * pointerLocalGrabPoint + grabToObject * distanceRatio;
+                return pointerCentroidPose.Position + pointerCentroidPose.Rotation * (pointerLocalGrabPoint + grabToObject) * distanceRatio;
             }
         }
 
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/MinMaxScaleConstraint.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/MinMaxScaleConstraint.cs
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.UI
     /// Component for setting the min/max scale values for ManipulationHandler
     /// or BoundingBox
     /// </summary>
-    [AddComponentMenu("Scripts/MRTK/SDK/TransformScaleHandler")]
+    [AddComponentMenu("Scripts/MRTK/SDK/MinMaxScaleConstraint")]
     public class MinMaxScaleConstraint : TransformConstraint
     {
         #region Properties

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public Vector3 Update(MixedRealityPose pointerCentroidPose, Quaternion objectRot`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`		`- return pointerCentroidPose.Position + pointerCentroidPose.Rotation * pointerLocalGrabPoint + grabToObject * distanceRatio;`
	`72`	`+ return pointerCentroidPose.Position + pointerCentroidPose.Rotation * (pointerLocalGrabPoint + grabToObject) * distanceRatio;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.UI`
`10`	`10`	`/// Component for setting the min/max scale values for ManipulationHandler`
`11`	`11`	`/// or BoundingBox`
`12`	`12`	`/// </summary>`
`13`		`- [AddComponentMenu("Scripts/MRTK/SDK/TransformScaleHandler")]`
	`13`	`+ [AddComponentMenu("Scripts/MRTK/SDK/MinMaxScaleConstraint")]`
`14`	`14`	`public class MinMaxScaleConstraint : TransformConstraint`
`15`	`15`	`{`
`16`	`16`	`#region Properties`