RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-20 20:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Direction enum instead of int

Browse Source 
The property is named `scrollingAxis` to distinguish from `direction`, which is of `ScrollingDirection` type (unfortunate name crash).
This commit is contained in:
ekrctb 2021-06-11 23:50:41 +09:00
parent 3389c4830b
commit 8cf4454780
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>(); private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
/// <summary> /// <summary>
/// 0 for horizontal scroll, 1 for vertical scroll. /// Whether the scrolling direction is horizontal or vertical.
/// </summary> /// </summary>
private int scrollingAxis => direction.Value == ScrollingDirection.Left || direction.Value == ScrollingDirection.Right ? 0 : 1; private Direction scrollingAxis => direction.Value == ScrollingDirection.Left || direction.Value == ScrollingDirection.Right ? Direction.Horizontal : Direction.Vertical;
/// <summary> /// <summary>
/// A set of top-level <see cref="DrawableHitObject"/>s which have an up-to-date layout. /// A set of top-level <see cref="DrawableHitObject"/>s which have an up-to-date layout.
@ -68,8 +68,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
/// </summary> /// </summary>
public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition) public double TimeAtScreenSpacePosition(Vector2 screenSpacePosition)
{ {
Vector2 localPosition = ToLocalSpace(screenSpacePosition); Vector2 position = ToLocalSpace(screenSpacePosition);
return TimeAtPosition(localPosition[scrollingAxis], Time.Current); return TimeAtPosition(scrollingAxis == Direction.Horizontal ? position.X : position.Y, Time.Current);
} }
/// <summary> /// <summary>
@ -77,9 +77,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
/// </summary> /// </summary>
public float PositionAtTime(double time, double currentTime) public float PositionAtTime(double time, double currentTime)
{ {
float pos = scrollingInfo.Algorithm.PositionAt(time, currentTime, timeRange.Value, scrollLength); float position = scrollingInfo.Algorithm.PositionAt(time, currentTime, timeRange.Value, scrollLength);
flipPositionIfRequired(ref pos); flipPositionIfRequired(ref position);
return pos; return position;
} }
/// <summary> /// <summary>
@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
public Vector2 ScreenSpacePositionAtTime(double time) public Vector2 ScreenSpacePositionAtTime(double time)
{ {
float position = PositionAtTime(time, Time.Current); float position = PositionAtTime(time, Time.Current);
return scrollingAxis == 0 return scrollingAxis == Direction.Horizontal
? ToScreenSpace(new Vector2(position, DrawHeight / 2)) ? ToScreenSpace(new Vector2(position, DrawHeight / 2))
: ToScreenSpace(new Vector2(DrawWidth / 2, position)); : ToScreenSpace(new Vector2(DrawWidth / 2, position));
} }
@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
return scrollingInfo.Algorithm.GetLength(startTime, endTime, timeRange.Value, scrollLength); return scrollingInfo.Algorithm.GetLength(startTime, endTime, timeRange.Value, scrollLength);
} }
private float scrollLength => DrawSize[scrollingAxis]; private float scrollLength => scrollingAxis == Direction.Horizontal ? DrawWidth : DrawHeight;
private void flipPositionIfRequired(ref float position) private void flipPositionIfRequired(ref float position)
{ {
@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
if (hitObject.HitObject is IHasDuration e) if (hitObject.HitObject is IHasDuration e)
{ {
float length = LengthAtTime(hitObject.HitObject.StartTime, e.EndTime); float length = LengthAtTime(hitObject.HitObject.StartTime, e.EndTime);
if (scrollingAxis == 0) if (scrollingAxis == Direction.Horizontal)
hitObject.Width = length; hitObject.Width = length;
else else
hitObject.Height = length; hitObject.Height = length;
@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
{ {
float position = PositionAtTime(hitObject.HitObject.StartTime, currentTime); float position = PositionAtTime(hitObject.HitObject.StartTime, currentTime);
if (scrollingAxis == 0) if (scrollingAxis == Direction.Horizontal)
hitObject.X = position; hitObject.X = position;
else else
hitObject.Y = position; hitObject.Y = position;