Merge branch 'Tryibion-re-enable-scale-center'
This commit is contained in:
@@ -169,12 +169,12 @@ namespace FlaxEditor.Gizmo
|
||||
closestIntersection = intersection;
|
||||
}
|
||||
|
||||
/*// Center
|
||||
if (CenterBoxRaw.Intersects(ref localRay, out intersection) && intersection < closestIntersection)
|
||||
// Center
|
||||
if (CenterBoxRaw.Intersects(ref localRay, out intersection) && intersection > closestIntersection)
|
||||
{
|
||||
_activeAxis = Axis.Center;
|
||||
closestIntersection = intersection;
|
||||
}*/
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace FlaxEditor.Gizmo
|
||||
/// <summary>
|
||||
/// Offset to move axis away from center
|
||||
/// </summary>
|
||||
private const float AxisOffset = 0.8f;
|
||||
private const float AxisOffset = 1.2f;
|
||||
|
||||
/// <summary>
|
||||
/// How thick the axis should be
|
||||
|
||||
@@ -501,7 +501,7 @@ namespace FlaxEditor.Gizmo
|
||||
_scaleDelta = Vector3.Zero;
|
||||
|
||||
if (ActiveAxis == Axis.Center)
|
||||
scaleDelta = new Vector3(scaleDelta.AvgValue);
|
||||
scaleDelta = new Vector3(scaleDelta.ValuesSum);
|
||||
}
|
||||
|
||||
// Apply transformation (but to the parents, not whole selection pool)
|
||||
|
||||
Reference in New Issue
Block a user