diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index 1c7d024d85..6b6c82b76b 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -42,8 +42,8 @@ namespace osu.Game.Graphics.UserInterface public bool IsRollingProportional = false; /// - /// If IsRollingProportional = false, duration in milliseconds for the counter roll-up animation for each element. - /// If IsRollingProportional = true, duration in milliseconds for the counter roll-up animation in total. + /// If IsRollingProportional = false, duration in milliseconds for the counter roll-up animation for each + /// element; else duration in milliseconds for the counter roll-up animation in total. /// public ulong RollingDuration = 0; @@ -103,7 +103,10 @@ namespace osu.Game.Graphics.UserInterface protected RollingCounter() { - Debug.Assert(transformType.IsSubclassOf(typeof(Transform)) || transformType == typeof(Transform), @"transformType should be a subclass of Transform."); + Debug.Assert( + transformType.IsSubclassOf(typeof(Transform)) || transformType == typeof(Transform), + @"transformType should be a subclass of Transform." + ); } public override void Load() diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index b4576e6104..dad3bbd05a 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -97,7 +97,9 @@ namespace osu.Game.Graphics.UserInterface if (t.GetType() == typeof(TransformAlpha) || t.GetType() == typeof(TransformScaleVector)) t.Apply(stars[i]); - stars[i].Transforms.RemoveAll(t => t.GetType() == typeof(TransformScaleVector) || t.GetType() == typeof(TransformAlpha)); + stars[i].Transforms.RemoveAll(t => + t.GetType() == typeof(TransformScaleVector) || t.GetType() == typeof(TransformAlpha) + ); } protected void transformStarScale(int i, TransformScaleVector transform, bool isIncrement, double startTime) @@ -105,7 +107,15 @@ namespace osu.Game.Graphics.UserInterface transform.StartTime = startTime; transform.EndTime = transform.StartTime + StarAnimationDuration; transform.StartValue = stars[i].Scale; - transform.EndValue = new Vector2(Interpolation.ValueAt((isIncrement ? Math.Min(i + 1, Count) : Math.Max(i, Count)), MinStarSize, 1.0f, i, i + 1)); + transform.EndValue = new Vector2( + Interpolation.ValueAt( + (isIncrement ? Math.Min(i + 1, Count) : Math.Max(i, Count)), + MinStarSize, + 1.0f, + i, + i + 1 + ) + ); transform.Easing = EasingTypes.OutElasticHalf; stars[i].Transforms.Add(transform); @@ -136,10 +146,12 @@ namespace osu.Game.Graphics.UserInterface double startTime = Time; // If incrementing, animation should had started when VisibleCount crossed start of star (i) if (isIncrement) - startTime -= i == (int)Math.Floor(prevCount) ? getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i, VisibleCount); + startTime -= i == (int)Math.Floor(prevCount) ? + getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i, VisibleCount); // If decrementing, animation should had started when VisibleCount crossed end of star (i + 1) else - startTime -= i == (int)Math.Floor(prevCount) ? getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i + 1, VisibleCount); + startTime -= i == (int)Math.Floor(prevCount) ? + getProportionalDuration(prevCount, VisibleCount) : getProportionalDuration(i + 1, VisibleCount); updateTransformStar(i);