PR re-nits

Zee2 · Zee2 · commit d736610f30c8 · 2021-06-22T13:19:17.000-07:00
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs b/Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs
@@ -1255,11 +1255,11 @@ private void TransformTarget(HandleType transformType)
                         {
                             scaleFactor.x = 1;
                         }
-                        if (currentActualFlattenAxis == FlattenModeType.FlattenY)
+                        else if (currentActualFlattenAxis == FlattenModeType.FlattenY)
                         {
                             scaleFactor.y = 1;
                         }
-                        if (currentActualFlattenAxis == FlattenModeType.FlattenZ)
+                        else if (currentActualFlattenAxis == FlattenModeType.FlattenZ)
                         {
                             scaleFactor.z = 1;
                         }
@@ -1490,15 +1490,18 @@ private void ResetVisuals()
                 return;
             }
 
+            // Cache computed flatten axis for subsequent calls to Reset()
+            var actualAxis = ActualFlattenAxis;
+
             boxDisplay.Reset(active);
-            boxDisplay.UpdateFlattenAxis(ActualFlattenAxis);
+            boxDisplay.UpdateFlattenAxis(actualAxis);
 
             bool isVisible = (active == true && wireframeOnly == false);
 
-            rotationHandles.Reset(isVisible, ActualFlattenAxis);
-            links.Reset(active, ActualFlattenAxis);
-            scaleHandles.Reset(isVisible, ActualFlattenAxis);
-            translationHandles.Reset(isVisible, ActualFlattenAxis);
+            rotationHandles.Reset(isVisible, actualAxis);
+            links.Reset(active, actualAxis);
+            scaleHandles.Reset(isVisible, actualAxis);
+            translationHandles.Reset(isVisible, actualAxis);
         }
 
         private void CreateVisuals()

Original file line number	Diff line number	Diff line change
`@@ -1255,11 +1255,11 @@ private void TransformTarget(HandleType transformType)`
`1255`	`1255`	`{`
`1256`	`1256`	`scaleFactor.x = 1;`
`1257`	`1257`	`}`
`1258`		`- if (currentActualFlattenAxis == FlattenModeType.FlattenY)`
	`1258`	`+ else if (currentActualFlattenAxis == FlattenModeType.FlattenY)`
`1259`	`1259`	`{`
`1260`	`1260`	`scaleFactor.y = 1;`
`1261`	`1261`	`}`
`1262`		`- if (currentActualFlattenAxis == FlattenModeType.FlattenZ)`
	`1262`	`+ else if (currentActualFlattenAxis == FlattenModeType.FlattenZ)`
`1263`	`1263`	`{`
`1264`	`1264`	`scaleFactor.z = 1;`
`1265`	`1265`	`}`
`@@ -1490,15 +1490,18 @@ private void ResetVisuals()`
`1490`	`1490`	`return;`
`1491`	`1491`	`}`
`1492`	`1492`
	`1493`	`+ // Cache computed flatten axis for subsequent calls to Reset()`
	`1494`	`+ var actualAxis = ActualFlattenAxis;`
	`1495`	`+`
`1493`	`1496`	`boxDisplay.Reset(active);`
`1494`		`- boxDisplay.UpdateFlattenAxis(ActualFlattenAxis);`
	`1497`	`+ boxDisplay.UpdateFlattenAxis(actualAxis);`
`1495`	`1498`
`1496`	`1499`	`bool isVisible = (active == true && wireframeOnly == false);`
`1497`	`1500`
`1498`		`- rotationHandles.Reset(isVisible, ActualFlattenAxis);`
`1499`		`- links.Reset(active, ActualFlattenAxis);`
`1500`		`- scaleHandles.Reset(isVisible, ActualFlattenAxis);`
`1501`		`- translationHandles.Reset(isVisible, ActualFlattenAxis);`
	`1501`	`+ rotationHandles.Reset(isVisible, actualAxis);`
	`1502`	`+ links.Reset(active, actualAxis);`
	`1503`	`+ scaleHandles.Reset(isVisible, actualAxis);`
	`1504`	`+ translationHandles.Reset(isVisible, actualAxis);`
`1502`	`1505`	`}`
`1503`	`1506`
`1504`	`1507`	`private void CreateVisuals()`