Skip to content

Commit 873f7d4

Browse files
committed
Renaming ActualFlattenAxis property
1 parent fd2bf70 commit 873f7d4

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ public ElasticsManager ElasticsManager
565565
public Vector3[] BoundsCorners { get; private set; }
566566

567567
// Current actual flattening axis, derived from FlattenAuto, if set
568-
private FlattenModeType actualFlattenAxis {
568+
private FlattenModeType ActualFlattenAxis {
569569
get
570570
{
571571
if(FlattenAxis == FlattenModeType.FlattenAuto)
@@ -1250,15 +1250,15 @@ private void TransformTarget(HandleType transformType)
12501250
// If non-uniform scaling or uniform scaling only on the non-flattened axes
12511251
if (ScaleHandlesConfig.ScaleBehavior != HandleScaleMode.Uniform || !UniformScaleOnFlattenedAxis)
12521252
{
1253-
if (actualFlattenAxis == FlattenModeType.FlattenX)
1253+
if (ActualFlattenAxis == FlattenModeType.FlattenX)
12541254
{
12551255
scaleFactor.x = 1;
12561256
}
1257-
if (actualFlattenAxis == FlattenModeType.FlattenY)
1257+
if (ActualFlattenAxis == FlattenModeType.FlattenY)
12581258
{
12591259
scaleFactor.y = 1;
12601260
}
1261-
if (actualFlattenAxis == FlattenModeType.FlattenZ)
1261+
if (ActualFlattenAxis == FlattenModeType.FlattenZ)
12621262
{
12631263
scaleFactor.z = 1;
12641264
}
@@ -1490,14 +1490,14 @@ private void ResetVisuals()
14901490
}
14911491

14921492
boxDisplay.Reset(active);
1493-
boxDisplay.UpdateFlattenAxis(actualFlattenAxis);
1493+
boxDisplay.UpdateFlattenAxis(ActualFlattenAxis);
14941494

14951495
bool isVisible = (active == true && wireframeOnly == false);
14961496

1497-
rotationHandles.Reset(isVisible, actualFlattenAxis);
1498-
links.Reset(active, actualFlattenAxis);
1499-
scaleHandles.Reset(isVisible, actualFlattenAxis);
1500-
translationHandles.Reset(isVisible, actualFlattenAxis);
1497+
rotationHandles.Reset(isVisible, ActualFlattenAxis);
1498+
links.Reset(active, ActualFlattenAxis);
1499+
scaleHandles.Reset(isVisible, ActualFlattenAxis);
1500+
translationHandles.Reset(isVisible, ActualFlattenAxis);
15011501
}
15021502

15031503
private void CreateVisuals()
@@ -1557,7 +1557,7 @@ private void UpdateVisuals()
15571557
translationHandles.CalculateHandlePositions(ref boundsCorners);
15581558
scaleHandles.CalculateHandlePositions(ref boundsCorners);
15591559

1560-
boxDisplay.UpdateDisplay(currentBoundsExtents, actualFlattenAxis);
1560+
boxDisplay.UpdateDisplay(currentBoundsExtents, ActualFlattenAxis);
15611561

15621562
// move rig into position and rotation
15631563
rigRoot.position = TargetBounds.bounds.center;

0 commit comments

Comments
 (0)