diff --git a/osu-framework b/osu-framework index 8fde46d214..d6ccab3776 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 8fde46d214e4ababb46100d2e4488ca26a9d43a3 +Subproject commit d6ccab37765ea0dfb3f7a589903760e8d7a1e26d diff --git a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs index bf8f9bf7f4..0b4e8a5799 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs @@ -88,10 +88,10 @@ namespace osu.Desktop.VisualTests.Tests { new OsuContextMenuItem(@"Simple option"), new OsuContextMenuItem(@"Simple very very long option"), - new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, EasingTypes.OutQuint) }, - new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, EasingTypes.OutQuint) }, - new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, EasingTypes.OutQuint) }, - new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, EasingTypes.OutQuint) }, + new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint) }, + new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, Easing.OutQuint) }, + new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, Easing.OutQuint) }, + new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint) }, }; } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs index 87a40a76ca..f65dbe7a64 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs @@ -96,7 +96,7 @@ namespace osu.Desktop.VisualTests.Tests { SelectionBox.ScaleTo( new Vector2(value, 1), - 300, EasingTypes.OutQuint); + 300, Easing.OutQuint); } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs index bab471ed6a..ea2f0464c4 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs @@ -17,7 +17,7 @@ namespace osu.Desktop.VisualTests.Tests { Add(new Box { - ColourInfo = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke), + Colour = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke), RelativeSizeAxes = Framework.Graphics.Axes.Both, }); Add(new ButtonSystem()); diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs index eed2fa95c1..43f30a96b0 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs @@ -196,7 +196,7 @@ namespace osu.Desktop.VisualTests.Tests protected override void LoadComplete() { base.LoadComplete(); - this.FadeInFromZero(250, EasingTypes.OutQuint); + this.FadeInFromZero(250, Easing.OutQuint); } protected override void Update() diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index 5b79ecfaf1..71ae5a6697 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -207,7 +207,7 @@ namespace osu.Desktop.Overlays new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow) + Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow) }, new TextAwesome { diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs index 12b6f61a12..94cf6a4337 100644 --- a/osu.Game.Rulesets.Mania/UI/Column.cs +++ b/osu.Game.Rulesets.Mania/UI/Column.cs @@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Mania.UI { Name = "Key gradient", RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)), + Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)), Alpha = 0.5f }, keyIcon = new Container @@ -206,8 +206,8 @@ namespace osu.Game.Rulesets.Mania.UI if (args.Key == Key) { - background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint); - keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint); + background.FadeTo(background.Alpha + 0.2f, 50, Easing.OutQuint); + keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint); } return false; @@ -217,8 +217,8 @@ namespace osu.Game.Rulesets.Mania.UI { if (args.Key == Key) { - background.FadeTo(0.2f, 800, EasingTypes.OutQuart); - keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart); + background.FadeTo(0.2f, 800, Easing.OutQuart); + keyIcon.ScaleTo(1f, 400, Easing.OutQuart); } return false; diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs index e74ad69d23..03b6e18856 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs @@ -220,10 +220,10 @@ namespace osu.Game.Rulesets.Mania.UI switch (args.Key) { case Key.Minus: - transformVisibleTimeRangeTo(visibleTimeRange + time_span_step, 200, EasingTypes.OutQuint); + transformVisibleTimeRangeTo(visibleTimeRange + time_span_step, 200, Easing.OutQuint); break; case Key.Plus: - transformVisibleTimeRangeTo(visibleTimeRange - time_span_step, 200, EasingTypes.OutQuint); + transformVisibleTimeRangeTo(visibleTimeRange - time_span_step, 200, Easing.OutQuint); break; } } @@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Mania.UI return false; } - private void transformVisibleTimeRangeTo(double newTimeRange, double duration = 0, EasingTypes easing = EasingTypes.None) + private void transformVisibleTimeRangeTo(double newTimeRange, double duration = 0, Easing easing = Easing.None) { this.TransformTo(nameof(visibleTimeRange), newTimeRange, duration, easing); } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs index 42c148b525..2396e5d129 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs @@ -94,9 +94,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections using (fp.BeginAbsoluteSequence(fadeInTime)) { fp.FadeIn(DrawableOsuHitObject.TIME_FADEIN); - fp.ScaleTo(1, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out); + fp.ScaleTo(1, DrawableOsuHitObject.TIME_FADEIN, Easing.Out); - fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out); + fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, Easing.Out); fp.Delay(fadeOutTime - fadeInTime).FadeOut(DrawableOsuHitObject.TIME_FADEIN); } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs index a890a0cdb4..f68a7a765b 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables number.FadeOut(); this.FadeOut(800) - .ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad); + .ScaleTo(Scale * 1.5f, 400, Easing.OutQuad); } Expire(); diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs index eaa0bb7d27..892d106b02 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs @@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables protected override void LoadComplete() { if (Judgement.Result != HitResult.Miss) - JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint); + JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint); base.LoadComplete(); } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs index 4220299a25..2a50b23047 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs @@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables d => d.FadeIn(animIn), d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn) ).Then( - d => d.ScaleTo(1, 150, EasingTypes.Out) + d => d.ScaleTo(1, 150, Easing.Out) ); } @@ -82,8 +82,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables .FadeColour(Color4.Red, 80); break; case ArmedState.Hit: - this.FadeOut(120, EasingTypes.OutQuint) - .ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint); + this.FadeOut(120, Easing.OutQuint) + .ScaleTo(Scale * 1.5f, 120, Easing.OutQuint); break; } } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs index c7d838e517..2aae1bb24e 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs @@ -174,9 +174,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables ticks.Rotation = disc.Rotation; float relativeCircleScale = spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight; - disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, EasingTypes.OutQuint); + disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint); - symbol.RotateTo(disc.Rotation / 2, 500, EasingTypes.OutQuint); + symbol.RotateTo(disc.Rotation / 2, 500, Easing.OutQuint); } protected override void UpdatePreemptState() @@ -184,16 +184,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables base.UpdatePreemptState(); circleContainer.ScaleTo(spinner.Scale * 0.3f); - circleContainer.ScaleTo(spinner.Scale, TIME_PREEMPT / 1.4f, EasingTypes.OutQuint); + circleContainer.ScaleTo(spinner.Scale, TIME_PREEMPT / 1.4f, Easing.OutQuint); disc.RotateTo(-720); symbol.RotateTo(-720); mainContainer .ScaleTo(0) - .ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint) + .ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, Easing.OutQuint) .Then() - .ScaleTo(1, 500, EasingTypes.OutQuint); + .ScaleTo(1, 500, Easing.OutQuint); } protected override void UpdateCurrentState(ArmedState state) @@ -203,10 +203,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables switch (state) { case ArmedState.Hit: - sequence.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out); + sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out); break; case ArmedState.Miss: - sequence.ScaleTo(Scale * 0.8f, 320, EasingTypes.In); + sequence.ScaleTo(Scale * 0.8f, 320, Easing.In); break; } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs index 9a114aa72c..dbfd9b291b 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs @@ -106,8 +106,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces tracking = value; - follow.ScaleTo(tracking ? 2.8f : 1, 300, EasingTypes.OutQuint); - follow.FadeTo(tracking ? 0.2f : 0, 300, EasingTypes.OutQuint); + follow.ScaleTo(tracking ? 2.8f : 1, 300, Easing.OutQuint); + follow.FadeTo(tracking ? 0.2f : 0, 300, Easing.OutQuint); } } diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs index 98b243b375..cd808abe9d 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs @@ -128,12 +128,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces { background.FinishTransforms(false, nameof(Alpha)); background - .FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo) + .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo) .Then() - .FadeTo(tracking_alpha, 250, EasingTypes.OutQuint); + .FadeTo(tracking_alpha, 250, Easing.OutQuint); } - this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, EasingTypes.OutExpo); + this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo); } } } diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs index 5ede3f56f5..b92f1bc60a 100644 --- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs +++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs @@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Replays /// /// What easing to use when moving between hitobjects /// - private EasingTypes preferredEasing => DelayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out; + private Easing preferredEasing => DelayedMovements ? Easing.InOutCubic : Easing.Out; #endregion @@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Replays { // Default values for circles/sliders Vector2 startPosition = h.StackedPosition; - EasingTypes easing = preferredEasing; + Easing easing = preferredEasing; float spinnerDirection = -1; // The startPosition for the slider should not be its .Position, but the point on the circle whose tangent crosses the current cursor position @@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Replays if (spinCentreOffset.Length > SPIN_RADIUS) { // If moving in from the outside, don't ease out (default eases out). This means auto will "start" spinning immediately after moving into position. - easing = EasingTypes.In; + easing = Easing.In; } } @@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Replays } } - private void moveToHitObject(double targetTime, Vector2 targetPos, double hitObjectRadius, EasingTypes easing) + private void moveToHitObject(double targetTime, Vector2 targetPos, double hitObjectRadius, Easing easing) { ReplayFrame lastFrame = Frames[Frames.Count - 1]; diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs index 56a747467e..b64bc64d9b 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs @@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables switch (state) { case ArmedState.Hit: - Content.ScaleTo(0, 100, EasingTypes.OutQuint); + Content.ScaleTo(0, 100, Easing.OutQuint); break; } } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs index 1d614b4adb..0d5c8d2a25 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs @@ -90,12 +90,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables const float gravity_time = 300; const float gravity_travel_height = 200; - Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad); + Content.ScaleTo(0.8f, gravity_time * 2, Easing.OutQuad); this.FadeOut(800) - .MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out) + .MoveToY(-gravity_travel_height, gravity_time, Easing.Out) .Then() - .MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In); + .MoveToY(gravity_travel_height * 2, gravity_time * 2, Easing.In); Expire(); break; diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs index 521d225abe..a565f92fac 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs @@ -150,11 +150,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables expandingRing .FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50) .Then() - .FadeTo(completion / 8, 2000, EasingTypes.OutQuint); + .FadeTo(completion / 8, 2000, Easing.OutQuint); - symbol.RotateTo((float)(completion * HitObject.Duration / 8), 4000, EasingTypes.OutQuint); + symbol.RotateTo((float)(completion * HitObject.Duration / 8), 4000, Easing.OutQuint); - expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, EasingTypes.OutQuint); + expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, Easing.OutQuint); if (userHits == HitObject.RequiredHits) { @@ -186,8 +186,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables double untilStartTime = HitObject.StartTime - Time.Current; double untilJudgement = untilStartTime + Judgement.TimeOffset + HitObject.Duration; - targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint); - this.Delay(untilJudgement).FadeOut(out_transition_time, EasingTypes.Out); + targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, Easing.OutQuint); + this.Delay(untilJudgement).FadeOut(out_transition_time, Easing.Out); switch (state) { diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs index a4cd026e4c..698939e278 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs @@ -167,9 +167,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces double duration = timingPoint.BeatLength * 2; background - .FadeEdgeEffectTo(1, pre_beat_transition_time, EasingTypes.OutQuint) + .FadeEdgeEffectTo(1, pre_beat_transition_time, Easing.OutQuint) .Then() - .FadeEdgeEffectTo(edge_alpha_kiai, duration, EasingTypes.OutQuint); + .FadeEdgeEffectTo(edge_alpha_kiai, duration, Easing.OutQuint); } } } \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs index 8766f7b9f5..c372ac1809 100644 --- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs +++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs @@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.UI { base.LoadComplete(); - this.ScaleTo(3f, 1000, EasingTypes.OutQuint); + this.ScaleTo(3f, 1000, Easing.OutQuint); this.FadeOut(500); Expire(); diff --git a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs index a413d77d16..60881f3c24 100644 --- a/osu.Game.Rulesets.Taiko/UI/InputDrum.cs +++ b/osu.Game.Rulesets.Taiko/UI/InputDrum.cs @@ -149,16 +149,16 @@ namespace osu.Game.Rulesets.Taiko.UI const float down_time = 40; const float up_time = 1000; - back.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint) + back.ScaleTo(target.Scale.X - scale_amount, down_time, Easing.OutQuint) .Then() - .ScaleTo(1, up_time, EasingTypes.OutQuint); + .ScaleTo(1, up_time, Easing.OutQuint); target.Animate( - t => t.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint), - t => t.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, EasingTypes.OutQuint) + t => t.ScaleTo(target.Scale.X - scale_amount, down_time, Easing.OutQuint), + t => t.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, Easing.OutQuint) ).Then( - t => t.ScaleTo(1, up_time, EasingTypes.OutQuint), - t => t.FadeOut(up_time, EasingTypes.OutQuint) + t => t.ScaleTo(1, up_time, Easing.OutQuint), + t => t.FadeOut(up_time, Easing.OutQuint) ); } diff --git a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs index 346f435e5d..524490fac3 100644 --- a/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs +++ b/osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs @@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Taiko.UI { base.LoadComplete(); - this.ScaleTo(new Vector2(1, 3f), 500, EasingTypes.OutQuint); + this.ScaleTo(new Vector2(1, 3f), 500, Easing.OutQuint); this.FadeOut(250); Expire(); diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs index bb679e5150..b0fb9d7f28 100644 --- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs +++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs @@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Taiko.UI Anchor = Anchor.TopRight, RelativeSizeAxes = Axes.Y, Width = 10, - ColourInfo = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)), + Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)), }, } }, diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs index cfa98da3c8..8e928391fb 100644 --- a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs @@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps.Drawables GainedSelection?.Invoke(this); - background.ColourInfo = ColourInfo.GradientVertical( + background.Colour = ColourInfo.GradientVertical( new Color4(20, 43, 51, 255), new Color4(40, 86, 102, 255)); diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs index b59dbac722..a2457ba78e 100644 --- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs @@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps.Drawables new PanelBackground(beatmap) { RelativeSizeAxes = Axes.Both, - OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), + OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), } ) { @@ -119,21 +119,21 @@ namespace osu.Game.Beatmaps.Drawables new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientHorizontal( + Colour = ColourInfo.GradientHorizontal( Color4.Black, new Color4(0f, 0f, 0f, 0.9f)), Width = 0.05f, }, new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientHorizontal( + Colour = ColourInfo.GradientHorizontal( new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)), Width = 0.2f, }, new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientHorizontal( + Colour = ColourInfo.GradientHorizontal( new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)), Width = 0.05f, }, diff --git a/osu.Game/Beatmaps/Drawables/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs index 10eeba53e0..d07be88392 100644 --- a/osu.Game/Beatmaps/Drawables/Panel.cs +++ b/osu.Game/Beatmaps/Drawables/Panel.cs @@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps.Drawables } if (state == PanelSelectedState.Hidden) - this.FadeOut(300, EasingTypes.OutQuint); + this.FadeOut(300, Easing.OutQuint); else this.FadeIn(250); } diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 19475b00c9..ec9d30f244 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -42,7 +42,7 @@ namespace osu.Game.Graphics.Containers { if (!parallaxEnabled) { - content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, EasingTypes.OutQuint); + content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, Easing.OutQuint); content.Scale = new Vector2(1 + ParallaxAmount); } }; @@ -57,7 +57,7 @@ namespace osu.Game.Graphics.Containers if (parallaxEnabled) { Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2; - content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint); + content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, Easing.OutQuint); content.Scale = new Vector2(1 + ParallaxAmount); } diff --git a/osu.Game/Graphics/Cursor/GameplayCursor.cs b/osu.Game/Graphics/Cursor/GameplayCursor.cs index da3975f606..e74222f136 100644 --- a/osu.Game/Graphics/Cursor/GameplayCursor.cs +++ b/osu.Game/Graphics/Cursor/GameplayCursor.cs @@ -29,14 +29,14 @@ namespace osu.Game.Graphics.Cursor protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { ActiveCursor.Scale = new Vector2(1); - ActiveCursor.ScaleTo(1.2f, 100, EasingTypes.OutQuad); + ActiveCursor.ScaleTo(1.2f, 100, Easing.OutQuad); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { if (!state.Mouse.HasMainButtonPressed) - ActiveCursor.ScaleTo(1, 200, EasingTypes.OutQuad); + ActiveCursor.ScaleTo(1, 200, Easing.OutQuad); return base.OnMouseUp(state, args); } diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs index 82ae424ab0..9658cfdb09 100644 --- a/osu.Game/Graphics/Cursor/MenuCursor.cs +++ b/osu.Game/Graphics/Cursor/MenuCursor.cs @@ -34,7 +34,7 @@ namespace osu.Game.Graphics.Cursor if (diff > 180) diff -= 360; degrees = ActiveCursor.Rotation + diff; - ActiveCursor.RotateTo(degrees, 600, EasingTypes.OutQuint); + ActiveCursor.RotateTo(degrees, 600, Easing.OutQuint); } return base.OnMouseMove(state); @@ -49,10 +49,10 @@ namespace osu.Game.Graphics.Cursor protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { ActiveCursor.Scale = new Vector2(1); - ActiveCursor.ScaleTo(0.90f, 800, EasingTypes.OutQuint); + ActiveCursor.ScaleTo(0.90f, 800, Easing.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.Alpha = 0; - ((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero(800, EasingTypes.OutQuint); + ((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero(800, Easing.OutQuint); return base.OnMouseDown(state, args); } @@ -62,9 +62,9 @@ namespace osu.Game.Graphics.Cursor { dragging = false; - ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint); - ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), EasingTypes.OutElasticHalf); - ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic); + ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, Easing.OutQuint); + ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), Easing.OutElasticHalf); + ActiveCursor.ScaleTo(1, 500, Easing.OutElastic); } return base.OnMouseUp(state, args); @@ -72,21 +72,21 @@ namespace osu.Game.Graphics.Cursor protected override bool OnClick(InputState state) { - ((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne(500, EasingTypes.OutQuint); + ((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint); return base.OnClick(state); } protected override void PopIn() { - ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint); - ActiveCursor.ScaleTo(1, 400, EasingTypes.OutQuint); + ActiveCursor.FadeTo(1, 250, Easing.OutQuint); + ActiveCursor.ScaleTo(1, 400, Easing.OutQuint); } protected override void PopOut() { - ActiveCursor.FadeTo(0, 900, EasingTypes.OutQuint); - ActiveCursor.ScaleTo(0, 500, EasingTypes.In); + ActiveCursor.FadeTo(0, 900, Easing.OutQuint); + ActiveCursor.ScaleTo(0, 500, Easing.In); } public class Cursor : Container diff --git a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs index d3d01a5bc8..e9d84b28a3 100644 --- a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs +++ b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs @@ -37,7 +37,7 @@ namespace osu.Game.Graphics.Cursor if (IsPresent) { AutoSizeDuration = 250; - background.FlashColour(OsuColour.Gray(0.4f), 1000, EasingTypes.OutQuint); + background.FlashColour(OsuColour.Gray(0.4f), 1000, Easing.OutQuint); } else AutoSizeDuration = 0; @@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Cursor public OsuTooltip() { - AutoSizeEasing = EasingTypes.OutQuint; + AutoSizeEasing = Easing.OutQuint; CornerRadius = 5; Masking = true; @@ -83,10 +83,10 @@ namespace osu.Game.Graphics.Cursor protected override void PopIn() { instantMovement |= !IsPresent; - this.FadeIn(500, EasingTypes.OutQuint); + this.FadeIn(500, Easing.OutQuint); } - protected override void PopOut() => this.Delay(150).FadeOut(500, EasingTypes.OutQuint); + protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint); public override void Move(Vector2 pos) { @@ -97,7 +97,7 @@ namespace osu.Game.Graphics.Cursor } else { - this.MoveTo(pos, 200, EasingTypes.OutQuint); + this.MoveTo(pos, 200, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/IHasAccentColour.cs b/osu.Game/Graphics/IHasAccentColour.cs index 0edd2c3ac4..ac2117c517 100644 --- a/osu.Game/Graphics/IHasAccentColour.cs +++ b/osu.Game/Graphics/IHasAccentColour.cs @@ -26,7 +26,7 @@ namespace osu.Game.Graphics /// The new accent colour. /// The tween duration. /// The tween easing. - public static TransformSequence FadeAccent(this T accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None) + public static TransformSequence FadeAccent(this T accentedDrawable, Color4 newColour, double duration = 0, Easing easing = Easing.None) where T : IHasAccentColour => accentedDrawable.TransformTo(nameof(accentedDrawable.AccentColour), newColour, duration, easing); } diff --git a/osu.Game/Graphics/UserInterface/Bar.cs b/osu.Game/Graphics/UserInterface/Bar.cs index 1da73a60a2..20df553142 100644 --- a/osu.Game/Graphics/UserInterface/Bar.cs +++ b/osu.Game/Graphics/UserInterface/Bar.cs @@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface private const int resize_duration = 250; - private const EasingTypes easing = EasingTypes.InOutCubic; + private const Easing easing = Easing.InOutCubic; private float length; /// diff --git a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs index e69f9e3f42..f61192a1a6 100644 --- a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs +++ b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs @@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface var tabIndex = TabContainer.IndexOf(TabMap[tab]); t.State = tIndex < tabIndex ? Visibility.Hidden : Visibility.Visible; - t.Chevron.FadeTo(tIndex <= tabIndex ? 0f : 1f, 500, EasingTypes.OutQuint); + t.Chevron.FadeTo(tIndex <= tabIndex ? 0f : 1f, 500, Easing.OutQuint); } }; } @@ -54,13 +54,13 @@ namespace osu.Game.Graphics.UserInterface if (State == Visibility.Visible) { - this.FadeIn(transition_duration, EasingTypes.OutQuint); - this.ScaleTo(new Vector2(1f), transition_duration, EasingTypes.OutQuint); + this.FadeIn(transition_duration, Easing.OutQuint); + this.ScaleTo(new Vector2(1f), transition_duration, Easing.OutQuint); } else { - this.FadeOut(transition_duration, EasingTypes.OutQuint); - this.ScaleTo(new Vector2(0.8f, 1f), transition_duration, EasingTypes.OutQuint); + this.FadeOut(transition_duration, Easing.OutQuint); + this.ScaleTo(new Vector2(0.8f, 1f), transition_duration, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs index 460f4cea41..1cbf77d8f2 100644 --- a/osu.Game/Graphics/UserInterface/DialogButton.cs +++ b/osu.Game/Graphics/UserInterface/DialogButton.cs @@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnClick(Framework.Input.InputState state) { didClick = true; - colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In); + colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, Easing.In); flash(); this.Delay(click_duration).Schedule(delegate { @@ -110,10 +110,10 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnHover(Framework.Input.InputState state) { - spriteText.TransformSpacingTo(hoverSpacing, hover_duration, EasingTypes.OutElastic); + spriteText.TransformSpacingTo(hoverSpacing, hover_duration, Easing.OutElastic); - colourContainer.ResizeTo(new Vector2(hover_width, 1f), hover_duration, EasingTypes.OutElastic); - glowContainer.FadeIn(glow_fade_duration, EasingTypes.Out); + colourContainer.ResizeTo(new Vector2(hover_width, 1f), hover_duration, Easing.OutElastic); + glowContainer.FadeIn(glow_fade_duration, Easing.Out); base.OnHover(state); return true; } @@ -122,9 +122,9 @@ namespace osu.Game.Graphics.UserInterface { if (!didClick) { - colourContainer.ResizeTo(new Vector2(0.8f, 1f), hover_duration, EasingTypes.OutElastic); - spriteText.TransformSpacingTo(Vector2.Zero, hover_duration, EasingTypes.OutElastic); - glowContainer.FadeOut(glow_fade_duration, EasingTypes.Out); + colourContainer.ResizeTo(new Vector2(0.8f, 1f), hover_duration, Easing.OutElastic); + spriteText.TransformSpacingTo(Vector2.Zero, hover_duration, Easing.OutElastic); + glowContainer.FadeOut(glow_fade_duration, Easing.Out); } didClick = false; @@ -148,9 +148,9 @@ namespace osu.Game.Graphics.UserInterface private void updateGlow() { - leftGlow.ColourInfo = ColourInfo.GradientHorizontal(new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f), ButtonColour); + leftGlow.Colour = ColourInfo.GradientHorizontal(new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f), ButtonColour); centerGlow.Colour = ButtonColour; - rightGlow.ColourInfo = ColourInfo.GradientHorizontal(ButtonColour, new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f)); + rightGlow.Colour = ColourInfo.GradientHorizontal(ButtonColour, new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f)); } public DialogButton() diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs index 84904c10db..1598ace9df 100644 --- a/osu.Game/Graphics/UserInterface/IconButton.cs +++ b/osu.Game/Graphics/UserInterface/IconButton.cs @@ -84,31 +84,31 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnHover(InputState state) { - hover.FadeIn(500, EasingTypes.OutQuint); + hover.FadeIn(500, Easing.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - hover.FadeOut(500, EasingTypes.OutQuint); + hover.FadeOut(500, Easing.OutQuint); base.OnHoverLost(state); } protected override bool OnClick(InputState state) { - hover.FlashColour(flashColour, 800, EasingTypes.OutQuint); + hover.FlashColour(flashColour, 800, Easing.OutQuint); return base.OnClick(state); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - content.ScaleTo(0.75f, 2000, EasingTypes.OutQuint); + content.ScaleTo(0.75f, 2000, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - content.ScaleTo(1, 1000, EasingTypes.OutElastic); + content.ScaleTo(1, 1000, Easing.OutElastic); return base.OnMouseUp(state, args); } } diff --git a/osu.Game/Graphics/UserInterface/LineGraph.cs b/osu.Game/Graphics/UserInterface/LineGraph.cs index cd8ba96dc8..aa9256e576 100644 --- a/osu.Game/Graphics/UserInterface/LineGraph.cs +++ b/osu.Game/Graphics/UserInterface/LineGraph.cs @@ -49,7 +49,7 @@ namespace osu.Game.Graphics.UserInterface values = value.ToArray(); applyPath(); maskingContainer.Width = 0; - maskingContainer.ResizeWidthTo(1, transform_duration, EasingTypes.OutQuint); + maskingContainer.ResizeWidthTo(1, transform_duration, Easing.OutQuint); } } diff --git a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs index 4f348ebb56..56ee47a7e6 100644 --- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs +++ b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs @@ -39,8 +39,8 @@ namespace osu.Game.Graphics.UserInterface private const float transition_duration = 500; - protected override void PopIn() => this.FadeIn(transition_duration * 5, EasingTypes.OutQuint); + protected override void PopIn() => this.FadeIn(transition_duration * 5, Easing.OutQuint); - protected override void PopOut() => this.FadeOut(transition_duration, EasingTypes.OutQuint); + protected override void PopOut() => this.FadeOut(transition_duration, Easing.OutQuint); } } diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs index 298badcb77..f7df6cd4f4 100644 --- a/osu.Game/Graphics/UserInterface/Nub.cs +++ b/osu.Game/Graphics/UserInterface/Nub.cs @@ -43,9 +43,9 @@ namespace osu.Game.Graphics.UserInterface Current.ValueChanged += newValue => { if (newValue) - fill.FadeIn(200, EasingTypes.OutQuint); + fill.FadeIn(200, Easing.OutQuint); else - fill.FadeTo(0.01f, 200, EasingTypes.OutQuint); //todo: remove once we figure why containers aren't drawing at all times + fill.FadeTo(0.01f, 200, Easing.OutQuint); //todo: remove once we figure why containers aren't drawing at all times }; } @@ -80,8 +80,8 @@ namespace osu.Game.Graphics.UserInterface if (value) { - this.FadeColour(GlowingAccentColour, 500, EasingTypes.OutQuint); - FadeEdgeEffectTo(1, 500, EasingTypes.OutQuint); + this.FadeColour(GlowingAccentColour, 500, Easing.OutQuint); + FadeEdgeEffectTo(1, 500, Easing.OutQuint); } else { @@ -95,7 +95,7 @@ namespace osu.Game.Graphics.UserInterface { set { - this.ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, Easing.OutQuint); } } diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs index 18156f8e76..ecbf51f8b9 100644 --- a/osu.Game/Graphics/UserInterface/OsuButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuButton.cs @@ -91,13 +91,13 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - Content.ScaleTo(0.9f, 4000, EasingTypes.OutQuint); + Content.ScaleTo(0.9f, 4000, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - Content.ScaleTo(1, 1000, EasingTypes.OutElastic); + Content.ScaleTo(1, 1000, Easing.OutElastic); return base.OnMouseUp(state, args); } } diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs index 66c214f6a3..d4882cce1e 100644 --- a/osu.Game/Graphics/UserInterface/OsuContextMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuContextMenu.cs @@ -39,13 +39,13 @@ namespace osu.Game.Graphics.UserInterface Background.Colour = colours.ContextMenuGray; } - protected override void AnimateOpen() => this.FadeIn(fade_duration, EasingTypes.OutQuint); - protected override void AnimateClose() => this.FadeOut(fade_duration, EasingTypes.OutQuint); + protected override void AnimateOpen() => this.FadeIn(fade_duration, Easing.OutQuint); + protected override void AnimateClose() => this.FadeOut(fade_duration, Easing.OutQuint); protected override void UpdateContentHeight() { var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight; - this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs index 5d12dadf5f..196e905bdc 100644 --- a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs +++ b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs @@ -93,15 +93,15 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnHover(InputState state) { sampleHover.Play(); - textBold.FadeIn(transition_length, EasingTypes.OutQuint); - text.FadeOut(transition_length, EasingTypes.OutQuint); + textBold.FadeIn(transition_length, Easing.OutQuint); + text.FadeOut(transition_length, Easing.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - textBold.FadeOut(transition_length, EasingTypes.OutQuint); - text.FadeIn(transition_length, EasingTypes.OutQuint); + textBold.FadeOut(transition_length, Easing.OutQuint); + text.FadeIn(transition_length, Easing.OutQuint); base.OnHoverLost(state); } diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs index 2bcf0a467c..e597bc44b5 100644 --- a/osu.Game/Graphics/UserInterface/OsuMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs @@ -19,14 +19,14 @@ namespace osu.Game.Graphics.UserInterface ItemsContainer.Padding = new MarginPadding(5); } - protected override void AnimateOpen() => this.FadeIn(300, EasingTypes.OutQuint); + protected override void AnimateOpen() => this.FadeIn(300, Easing.OutQuint); - protected override void AnimateClose() => this.FadeOut(300, EasingTypes.OutQuint); + protected override void AnimateClose() => this.FadeOut(300, Easing.OutQuint); protected override void UpdateContentHeight() { var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight; - this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs index dc52fd0f62..b7ca25b95a 100644 --- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs +++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs @@ -47,8 +47,8 @@ namespace osu.Game.Graphics.UserInterface protected override void LoadComplete() { base.LoadComplete(); - circle.FadeIn(500, EasingTypes.OutQuint); - circle.ResizeTo(new Vector2(0.8f), 500, EasingTypes.OutQuint); + circle.FadeIn(500, Easing.OutQuint); + circle.ResizeTo(new Vector2(0.8f), 500, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs index 673a23afac..3dd3596c30 100644 --- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs +++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs @@ -166,7 +166,7 @@ namespace osu.Game.Graphics.UserInterface protected override void UpdateValue(float value) { - Nub.MoveToX(RangePadding + UsableWidth * value, 250, EasingTypes.OutQuint); + Nub.MoveToX(RangePadding + UsableWidth * value, 250, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs index 602aee3c58..8c16c048ea 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs @@ -77,14 +77,14 @@ namespace osu.Game.Graphics.UserInterface private void fadeActive() { - box.FadeIn(transition_length, EasingTypes.OutQuint); - Text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint); + box.FadeIn(transition_length, Easing.OutQuint); + Text.FadeColour(Color4.White, transition_length, Easing.OutQuint); } private void fadeInactive() { - box.FadeOut(transition_length, EasingTypes.OutQuint); - Text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint); + box.FadeOut(transition_length, Easing.OutQuint); + Text.FadeColour(AccentColour, transition_length, Easing.OutQuint); } protected override bool OnHover(InputState state) diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs index 940d9b4943..57a87dc74b 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs @@ -49,14 +49,14 @@ namespace osu.Game.Graphics.UserInterface private void fadeIn() { - box.FadeIn(transition_length, EasingTypes.OutQuint); - text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint); + box.FadeIn(transition_length, Easing.OutQuint); + text.FadeColour(Color4.White, transition_length, Easing.OutQuint); } private void fadeOut() { - box.FadeOut(transition_length, EasingTypes.OutQuint); - text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint); + box.FadeOut(transition_length, Easing.OutQuint); + text.FadeColour(AccentColour, transition_length, Easing.OutQuint); } protected override bool OnHover(InputState state) diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index cb657825de..ce8d190dc0 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -36,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface /// /// Easing for the counter rollover animation. /// - protected virtual EasingTypes RollingEasing => EasingTypes.OutQuint; + protected virtual Easing RollingEasing => Easing.OutQuint; private T displayedCount; diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs index a1fa48e3cd..ee4fc912f3 100644 --- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs +++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs @@ -8,7 +8,7 @@ namespace osu.Game.Graphics.UserInterface public class ScoreCounter : RollingCounter { protected override double RollingDuration => 1000; - protected override EasingTypes RollingEasing => EasingTypes.Out; + protected override Easing RollingEasing => Easing.Out; public bool UseCommaSeparator; diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index c4f98dcbb7..6c5204fed4 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface private double animationDelay => 80; private double scalingDuration => 1000; - private EasingTypes scalingEasing => EasingTypes.OutElasticHalf; + private Easing scalingEasing => Easing.OutElasticHalf; private float minStarScale => 0.4f; private double fadingDuration => 100; diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs index b763cd7971..f290f4fadd 100644 --- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs +++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs @@ -173,20 +173,20 @@ namespace osu.Game.Graphics.UserInterface protected override bool OnHover(InputState state) { - this.ResizeTo(SIZE_EXTENDED, transform_time, EasingTypes.OutElastic); - IconLayer.FadeColour(HoverColour, transform_time, EasingTypes.OutElastic); + this.ResizeTo(SIZE_EXTENDED, transform_time, Easing.OutElastic); + IconLayer.FadeColour(HoverColour, transform_time, Easing.OutElastic); - bouncingIcon.ScaleTo(1.1f, transform_time, EasingTypes.OutElastic); + bouncingIcon.ScaleTo(1.1f, transform_time, Easing.OutElastic); return true; } protected override void OnHoverLost(InputState state) { - this.ResizeTo(SIZE_RETRACTED, transform_time, EasingTypes.OutElastic); - IconLayer.FadeColour(TextLayer.Colour, transform_time, EasingTypes.OutElastic); + this.ResizeTo(SIZE_RETRACTED, transform_time, Easing.OutElastic); + IconLayer.FadeColour(TextLayer.Colour, transform_time, Easing.OutElastic); - bouncingIcon.ScaleTo(1, transform_time, EasingTypes.OutElastic); + bouncingIcon.ScaleTo(1, transform_time, Easing.OutElastic); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) @@ -205,7 +205,7 @@ namespace osu.Game.Graphics.UserInterface Add(flash); flash.Alpha = 1; - flash.FadeOut(500, EasingTypes.OutQuint); + flash.FadeOut(500, Easing.OutQuint); flash.Expire(); return base.OnClick(state); @@ -245,9 +245,9 @@ namespace osu.Game.Graphics.UserInterface if (beatIndex < 0) return; - icon.ScaleTo(1 - 0.1f * amplitudeAdjust, beat_in_time, EasingTypes.Out) + icon.ScaleTo(1 - 0.1f * amplitudeAdjust, beat_in_time, Easing.Out) .Then() - .ScaleTo(1, beatLength * 2, EasingTypes.OutQuint); + .ScaleTo(1, beatLength * 2, Easing.OutQuint); } } } diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs index 57eea71086..41fa60bec2 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs @@ -82,6 +82,6 @@ namespace osu.Game.Graphics.UserInterface.Volume return true; } - private void updateFill() => meterFill.ScaleTo(new Vector2(1, (float)Volume), 300, EasingTypes.OutQuint); + private void updateFill() => meterFill.ScaleTo(new Vector2(1, (float)Volume), 300, Easing.OutQuint); } } \ No newline at end of file diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 881ee891c1..2cfd1f8214 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -234,10 +234,10 @@ namespace osu.Game switch (settings.State) { case Visibility.Hidden: - intro.MoveToX(0, SettingsOverlay.TRANSITION_LENGTH, EasingTypes.OutQuint); + intro.MoveToX(0, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint); break; case Visibility.Visible: - intro.MoveToX(SettingsOverlay.SIDEBAR_WIDTH / 2, SettingsOverlay.TRANSITION_LENGTH, EasingTypes.OutQuint); + intro.MoveToX(SettingsOverlay.SIDEBAR_WIDTH / 2, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint); break; } }; diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs index 7b11ba2de0..791377187b 100644 --- a/osu.Game/Overlays/Chat/ChannelListItem.cs +++ b/osu.Game/Overlays/Chat/ChannelListItem.cs @@ -156,7 +156,7 @@ namespace osu.Game.Overlays.Chat protected override bool OnHover(InputState state) { if (!channel.Joined.Value) - name.FadeColour(hoverColour, 50, EasingTypes.OutQuint); + name.FadeColour(hoverColour, 50, Easing.OutQuint); return base.OnHover(state); } diff --git a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs index 380275475b..368d3cc5ef 100644 --- a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs +++ b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs @@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, LayoutDuration = 200, - LayoutEasing = EasingTypes.OutQuint, + LayoutEasing = Easing.OutQuint, Spacing = new Vector2(0f, 20f), Padding = new MarginPadding { Vertical = 20, Left = WIDTH_PADDING }, }, @@ -160,8 +160,8 @@ namespace osu.Game.Overlays.Chat { if (Alpha == 0) this.MoveToY(DrawHeight); - this.FadeIn(transition_duration, EasingTypes.OutQuint); - this.MoveToY(0, transition_duration, EasingTypes.OutQuint); + this.FadeIn(transition_duration, Easing.OutQuint); + this.MoveToY(0, transition_duration, Easing.OutQuint); search.HoldFocus = true; base.PopIn(); @@ -169,8 +169,8 @@ namespace osu.Game.Overlays.Chat protected override void PopOut() { - this.FadeOut(transition_duration, EasingTypes.InSine); - this.MoveToY(DrawHeight, transition_duration, EasingTypes.InSine); + this.FadeOut(transition_duration, Easing.InSine); + this.MoveToY(DrawHeight, transition_duration, Easing.InSine); search.HoldFocus = false; base.PopOut(); diff --git a/osu.Game/Overlays/Chat/ChatTabControl.cs b/osu.Game/Overlays/Chat/ChatTabControl.cs index cb85bdb0c9..c3c930eba0 100644 --- a/osu.Game/Overlays/Chat/ChatTabControl.cs +++ b/osu.Game/Overlays/Chat/ChatTabControl.cs @@ -86,30 +86,30 @@ namespace osu.Game.Overlays.Chat private void fadeActive() { - this.ResizeTo(new Vector2(Width, 1.1f), transition_length, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(Width, 1.1f), transition_length, Easing.OutQuint); - box.FadeColour(backgroundActive, transition_length, EasingTypes.OutQuint); - highlightBox.FadeIn(transition_length, EasingTypes.OutQuint); + box.FadeColour(backgroundActive, transition_length, Easing.OutQuint); + highlightBox.FadeIn(transition_length, Easing.OutQuint); - text.FadeOut(transition_length, EasingTypes.OutQuint); - textBold.FadeIn(transition_length, EasingTypes.OutQuint); + text.FadeOut(transition_length, Easing.OutQuint); + textBold.FadeIn(transition_length, Easing.OutQuint); } private void fadeInactive() { - this.ResizeTo(new Vector2(Width, 1), transition_length, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(Width, 1), transition_length, Easing.OutQuint); - box.FadeColour(backgroundInactive, transition_length, EasingTypes.OutQuint); - highlightBox.FadeOut(transition_length, EasingTypes.OutQuint); + box.FadeColour(backgroundInactive, transition_length, Easing.OutQuint); + highlightBox.FadeOut(transition_length, Easing.OutQuint); - text.FadeIn(transition_length, EasingTypes.OutQuint); - textBold.FadeOut(transition_length, EasingTypes.OutQuint); + text.FadeIn(transition_length, Easing.OutQuint); + textBold.FadeOut(transition_length, Easing.OutQuint); } protected override bool OnHover(InputState state) { if (!Active) - box.FadeColour(backgroundHover, transition_length, EasingTypes.OutQuint); + box.FadeColour(backgroundHover, transition_length, Easing.OutQuint); return true; } diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs index fd1e78e801..53d926fb4f 100644 --- a/osu.Game/Overlays/ChatOverlay.cs +++ b/osu.Game/Overlays/ChatOverlay.cs @@ -177,8 +177,8 @@ namespace osu.Game.Overlays inputTextBox.HoldFocus = false; if (1f - chatHeight.Value < channel_selection_min_height) { - chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, EasingTypes.OutQuint); - channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, EasingTypes.OutQuint); + chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, Easing.OutQuint); + channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, Easing.OutQuint); channelSelection.Show(); chatHeight.Value = 1f - channel_selection_min_height; } @@ -235,8 +235,8 @@ namespace osu.Game.Overlays protected override void PopIn() { - this.MoveToY(0, transition_length, EasingTypes.OutQuint); - this.FadeIn(transition_length, EasingTypes.OutQuint); + this.MoveToY(0, transition_length, Easing.OutQuint); + this.FadeIn(transition_length, Easing.OutQuint); inputTextBox.HoldFocus = true; base.PopIn(); @@ -244,8 +244,8 @@ namespace osu.Game.Overlays protected override void PopOut() { - this.MoveToY(Height, transition_length, EasingTypes.InSine); - this.FadeOut(transition_length, EasingTypes.InSine); + this.MoveToY(Height, transition_length, Easing.InSine); + this.FadeOut(transition_length, Easing.InSine); inputTextBox.HoldFocus = false; base.PopOut(); @@ -328,7 +328,7 @@ namespace osu.Game.Overlays var loaded = loadedChannels.Find(d => d.Channel == value); if (loaded == null) { - currentChannelContainer.FadeOut(500, EasingTypes.OutQuint); + currentChannelContainer.FadeOut(500, Easing.OutQuint); loading.Show(); loaded = new DrawableChannel(currentChannel); @@ -340,7 +340,7 @@ namespace osu.Game.Overlays currentChannelContainer.Clear(false); currentChannelContainer.Add(loaded); - currentChannelContainer.FadeIn(500, EasingTypes.OutQuint); + currentChannelContainer.FadeIn(500, Easing.OutQuint); }); } else diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs index 39338ba3e1..97aae2f49c 100644 --- a/osu.Game/Overlays/Dialog/PopupDialog.cs +++ b/osu.Game/Overlays/Dialog/PopupDialog.cs @@ -115,17 +115,17 @@ namespace osu.Game.Overlays.Dialog ring.ResizeTo(ringMinifiedSize); } - content.FadeIn(ENTER_DURATION, EasingTypes.OutQuint); - ring.ResizeTo(ringSize, ENTER_DURATION, EasingTypes.OutQuint); - buttonsContainer.TransformSpacingTo(Vector2.Zero, ENTER_DURATION, EasingTypes.OutQuint); - buttonsContainer.MoveToY(0, ENTER_DURATION, EasingTypes.OutQuint); + content.FadeIn(ENTER_DURATION, Easing.OutQuint); + ring.ResizeTo(ringSize, ENTER_DURATION, Easing.OutQuint); + buttonsContainer.TransformSpacingTo(Vector2.Zero, ENTER_DURATION, Easing.OutQuint); + buttonsContainer.MoveToY(0, ENTER_DURATION, Easing.OutQuint); } protected override void PopOut() { base.PopOut(); - content.FadeOut(EXIT_DURATION, EasingTypes.InSine); + content.FadeOut(EXIT_DURATION, Easing.InSine); } public PopupDialog() diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs index b384e110f9..012e93f10d 100644 --- a/osu.Game/Overlays/DialogOverlay.cs +++ b/osu.Game/Overlays/DialogOverlay.cs @@ -44,13 +44,13 @@ namespace osu.Game.Overlays protected override void PopIn() { base.PopIn(); - this.FadeIn(PopupDialog.ENTER_DURATION, EasingTypes.OutQuint); + this.FadeIn(PopupDialog.ENTER_DURATION, Easing.OutQuint); } protected override void PopOut() { base.PopOut(); - this.FadeOut(PopupDialog.EXIT_DURATION, EasingTypes.InSine); + this.FadeOut(PopupDialog.EXIT_DURATION, Easing.InSine); } public DialogOverlay() diff --git a/osu.Game/Overlays/Direct/DirectGridPanel.cs b/osu.Game/Overlays/Direct/DirectGridPanel.cs index cc7d57e04b..b7631d5794 100644 --- a/osu.Game/Overlays/Direct/DirectGridPanel.cs +++ b/osu.Game/Overlays/Direct/DirectGridPanel.cs @@ -41,9 +41,9 @@ namespace osu.Game.Overlays.Direct { base.LoadComplete(); - this.FadeInFromZero(200, EasingTypes.Out); + this.FadeInFromZero(200, Easing.Out); bottomPanel.LayoutDuration = 200; - bottomPanel.LayoutEasing = EasingTypes.Out; + bottomPanel.LayoutEasing = Easing.Out; bottomPanel.Origin = Anchor.BottomLeft; } diff --git a/osu.Game/Overlays/Direct/DirectListPanel.cs b/osu.Game/Overlays/Direct/DirectListPanel.cs index 1b36798639..0a445e49d4 100644 --- a/osu.Game/Overlays/Direct/DirectListPanel.cs +++ b/osu.Game/Overlays/Direct/DirectListPanel.cs @@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Direct { base.LoadComplete(); - this.FadeInFromZero(200, EasingTypes.Out); + this.FadeInFromZero(200, Easing.Out); } [BackgroundDependencyLoader] @@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Direct new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.25f), Color4.Black.Opacity(0.75f)), + Colour = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.25f), Color4.Black.Opacity(0.75f)), }, new Container { @@ -171,25 +171,25 @@ namespace osu.Game.Overlays.Direct protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - icon.ScaleTo(0.9f, 1000, EasingTypes.Out); + icon.ScaleTo(0.9f, 1000, Easing.Out); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - icon.ScaleTo(1f, 500, EasingTypes.OutElastic); + icon.ScaleTo(1f, 500, Easing.OutElastic); return base.OnMouseUp(state, args); } protected override bool OnHover(InputState state) { - icon.ScaleTo(1.1f, 500, EasingTypes.OutElastic); + icon.ScaleTo(1.1f, 500, Easing.OutElastic); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - icon.ScaleTo(1f, 500, EasingTypes.OutElastic); + icon.ScaleTo(1f, 500, Easing.OutElastic); } } } diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs index 4fc9a922a8..09b634de81 100644 --- a/osu.Game/Overlays/Direct/DirectPanel.cs +++ b/osu.Game/Overlays/Direct/DirectPanel.cs @@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Direct Origin = Anchor.Centre, RelativeSizeAxes = Axes.Both, FillMode = FillMode.Fill, - OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), + OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), }) { RelativeSizeAxes = Axes.Both, diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs index 5fa90ab1d6..f10d542830 100644 --- a/osu.Game/Overlays/DirectOverlay.cs +++ b/osu.Game/Overlays/DirectOverlay.cs @@ -169,7 +169,7 @@ namespace osu.Game.Overlays private void updateResultCounts() { - resultCountsContainer.FadeTo(ResultAmounts == null ? 0f : 1f, 200, EasingTypes.OutQuint); + resultCountsContainer.FadeTo(ResultAmounts == null ? 0f : 1f, 200, Easing.OutQuint); if (ResultAmounts == null) return; resultCountsText.Text = pluralize("Artist", ResultAmounts.Artists) + ", " + diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs index 0f53fb2d5c..95e0fef9aa 100644 --- a/osu.Game/Overlays/LoginOverlay.cs +++ b/osu.Game/Overlays/LoginOverlay.cs @@ -40,7 +40,7 @@ namespace osu.Game.Overlays AutoSizeAxes = Axes.Y, Masking = true, AutoSizeDuration = transition_time, - AutoSizeEasing = EasingTypes.OutQuint, + AutoSizeEasing = Easing.OutQuint, Children = new Drawable[] { settingsSection = new LoginSettings @@ -67,7 +67,7 @@ namespace osu.Game.Overlays base.PopIn(); settingsSection.Bounding = true; - this.FadeIn(transition_time, EasingTypes.OutQuint); + this.FadeIn(transition_time, Easing.OutQuint); InputManager.ChangeFocus(settingsSection); } diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs index 6e9ad3fafe..880b607e78 100644 --- a/osu.Game/Overlays/MedalOverlay.cs +++ b/osu.Game/Overlays/MedalOverlay.cs @@ -205,7 +205,7 @@ namespace osu.Game.Overlays using (BeginDelayedSequence(200, true)) { disc.FadeIn(initial_duration) - .ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic); + .ScaleTo(1f, initial_duration * 2, Easing.OutElastic); particleContainer.FadeIn(initial_duration); outerSpin.FadeTo(0.1f, initial_duration * 2); @@ -213,8 +213,8 @@ namespace osu.Game.Overlays using (BeginDelayedSequence(initial_duration + 200, true)) { backgroundStrip.FadeIn(step_duration); - leftStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint); - rightStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint); + leftStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint); + rightStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint); this.Animate().Schedule(() => { @@ -261,7 +261,7 @@ namespace osu.Game.Overlays { RelativeSizeAxes = Axes.Both; Width = 0f; - ColourInfo = ColourInfo.GradientHorizontal(Color4.White.Opacity(start), Color4.White.Opacity(end)); + Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(start), Color4.White.Opacity(end)); Masking = true; Children = new[] diff --git a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs index 89e991f5ef..56b26e7176 100644 --- a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs +++ b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs @@ -149,15 +149,15 @@ namespace osu.Game.Overlays.MedalSplash case DisplayState.Icon: medalContainer .FadeIn(duration) - .ScaleTo(1, duration, EasingTypes.OutElastic); + .ScaleTo(1, duration, Easing.OutElastic); break; case DisplayState.MedalUnlocked: medalContainer .FadeTo(1) .ScaleTo(1); - this.ScaleTo(scale_when_unlocked, duration, EasingTypes.OutExpo); - this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 30, duration, EasingTypes.OutExpo); + this.ScaleTo(scale_when_unlocked, duration, Easing.OutExpo); + this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 30, duration, Easing.OutExpo); unlocked.FadeInFromZero(duration); break; case DisplayState.Full: @@ -165,8 +165,8 @@ namespace osu.Game.Overlays.MedalSplash .FadeTo(1) .ScaleTo(1); - this.ScaleTo(scale_when_full, duration, EasingTypes.OutExpo); - this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 60, duration, EasingTypes.OutExpo); + this.ScaleTo(scale_when_full, duration, Easing.OutExpo); + this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 60, duration, Easing.OutExpo); name.FadeInFromZero(duration + 100); description.FadeInFromZero(duration * 2); break; diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs index bea0aae57e..3ca4a204a5 100644 --- a/osu.Game/Overlays/Mods/ModButton.cs +++ b/osu.Game/Overlays/Mods/ModButton.cs @@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Mods public string TooltipText => (SelectedMod?.Description ?? Mods.FirstOrDefault()?.Description) ?? string.Empty; - private const EasingTypes mod_switch_easing = EasingTypes.InOutSine; + private const Easing mod_switch_easing = Easing.InOutSine; private const double mod_switch_duration = 120; // A selected index of -1 means not selected. @@ -67,8 +67,8 @@ namespace osu.Game.Overlays.Mods if (beforeSelected != Selected) { - iconsContainer.RotateTo(Selected ? 5f : 0f, 300, EasingTypes.OutElastic); - iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic); + iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic); + iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic); } if (modBefore != modAfter) diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index ca74189c86..703deea382 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -66,14 +66,14 @@ namespace osu.Game.Overlays.Mods { base.PopOut(); - rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, EasingTypes.InSine); - rankedMultiplerContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); + rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, Easing.InSine); + rankedMultiplerContainer.FadeOut(APPEAR_DURATION, Easing.InSine); foreach (ModSection section in modSectionsContainer.Children) { - section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, EasingTypes.InSine); - section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, EasingTypes.InSine); - section.ButtonsContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); + section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, Easing.InSine); + section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, Easing.InSine); + section.ButtonsContainer.FadeOut(APPEAR_DURATION, Easing.InSine); } } @@ -81,14 +81,14 @@ namespace osu.Game.Overlays.Mods { base.PopIn(); - rankedMultiplerContainer.MoveToX(0, ranked_multiplier_duration, EasingTypes.OutQuint); - rankedMultiplerContainer.FadeIn(ranked_multiplier_duration, EasingTypes.OutQuint); + rankedMultiplerContainer.MoveToX(0, ranked_multiplier_duration, Easing.OutQuint); + rankedMultiplerContainer.FadeIn(ranked_multiplier_duration, Easing.OutQuint); foreach (ModSection section in modSectionsContainer.Children) { - section.ButtonsContainer.TransformSpacingTo(new Vector2(50f, 0f), button_duration, EasingTypes.OutQuint); - section.ButtonsContainer.MoveToX(0, button_duration, EasingTypes.OutQuint); - section.ButtonsContainer.FadeIn(button_duration, EasingTypes.OutQuint); + section.ButtonsContainer.TransformSpacingTo(new Vector2(50f, 0f), button_duration, Easing.OutQuint); + section.ButtonsContainer.MoveToX(0, button_duration, Easing.OutQuint); + section.ButtonsContainer.FadeIn(button_duration, Easing.OutQuint); } } diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs index ca46bdea95..a0198fe435 100644 --- a/osu.Game/Overlays/Music/PlaylistList.cs +++ b/osu.Game/Overlays/Music/PlaylistList.cs @@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Music public ItemSearchContainer() { LayoutDuration = 200; - LayoutEasing = EasingTypes.OutQuint; + LayoutEasing = Easing.OutQuint; } } } diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs index d6a69c1a80..75503067c8 100644 --- a/osu.Game/Overlays/Music/PlaylistOverlay.cs +++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs @@ -101,15 +101,15 @@ namespace osu.Game.Overlays.Music filter.Search.HoldFocus = true; Schedule(() => inputManager.ChangeFocus(filter.Search)); - this.ResizeTo(new Vector2(1, playlist_height), transition_duration, EasingTypes.OutQuint); - this.FadeIn(transition_duration, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint); + this.FadeIn(transition_duration, Easing.OutQuint); } protected override void PopOut() { filter.Search.HoldFocus = false; - this.ResizeTo(new Vector2(1, 0), transition_duration, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(1, 0), transition_duration, Easing.OutQuint); this.FadeOut(transition_duration); } diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 9d726b3952..b435c505c9 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -82,7 +82,7 @@ namespace osu.Game.Overlays protected override bool OnDragEnd(InputState state) { - dragContainer.MoveTo(Vector2.Zero, 800, EasingTypes.OutElastic); + dragContainer.MoveTo(Vector2.Zero, 800, Easing.OutElastic); return base.OnDragEnd(state); } @@ -204,7 +204,7 @@ namespace osu.Game.Overlays beatmapBacking.BindTo(game.Beatmap); - playlist.StateChanged += (c, s) => playlistButton.FadeColour(s == Visibility.Visible ? colours.Yellow : Color4.White, 200, EasingTypes.OutQuint); + playlist.StateChanged += (c, s) => playlistButton.FadeColour(s == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint); } protected override void LoadComplete() @@ -345,13 +345,13 @@ namespace osu.Game.Overlays { case TransformDirection.Next: d.Position = new Vector2(400, 0); - d.MoveToX(0, 500, EasingTypes.OutCubic); - currentBackground.MoveToX(-400, 500, EasingTypes.OutCubic); + d.MoveToX(0, 500, Easing.OutCubic); + currentBackground.MoveToX(-400, 500, Easing.OutCubic); break; case TransformDirection.Prev: d.Position = new Vector2(-400, 0); - d.MoveToX(0, 500, EasingTypes.OutCubic); - currentBackground.MoveToX(400, 500, EasingTypes.OutCubic); + d.MoveToX(0, 500, Easing.OutCubic); + currentBackground.MoveToX(400, 500, Easing.OutCubic); break; } currentBackground.Expire(); @@ -368,16 +368,16 @@ namespace osu.Game.Overlays { base.PopIn(); - this.FadeIn(transition_length, EasingTypes.OutQuint); - dragContainer.ScaleTo(1, transition_length, EasingTypes.OutElastic); + this.FadeIn(transition_length, Easing.OutQuint); + dragContainer.ScaleTo(1, transition_length, Easing.OutElastic); } protected override void PopOut() { base.PopOut(); - this.FadeOut(transition_length, EasingTypes.OutQuint); - dragContainer.ScaleTo(0.9f, transition_length, EasingTypes.OutQuint); + this.FadeOut(transition_length, Easing.OutQuint); + dragContainer.ScaleTo(0.9f, transition_length, Easing.OutQuint); } private enum TransformDirection diff --git a/osu.Game/Overlays/NotificationManager.cs b/osu.Game/Overlays/NotificationManager.cs index f83aeb1275..ad0236ae1f 100644 --- a/osu.Game/Overlays/NotificationManager.cs +++ b/osu.Game/Overlays/NotificationManager.cs @@ -89,8 +89,8 @@ namespace osu.Game.Overlays { base.PopIn(); - scrollContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); - this.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); + scrollContainer.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint); + this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint); this.FadeTo(1, TRANSITION_LENGTH / 2); } @@ -105,7 +105,7 @@ namespace osu.Game.Overlays markAllRead(); - this.MoveToX(width, TRANSITION_LENGTH, EasingTypes.OutQuint); + this.MoveToX(width, TRANSITION_LENGTH, Easing.OutQuint); this.FadeTo(0, TRANSITION_LENGTH / 2); } } diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs index 4337989a13..a590507f41 100644 --- a/osu.Game/Overlays/Notifications/Notification.cs +++ b/osu.Game/Overlays/Notifications/Notification.cs @@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Notifications base.LoadComplete(); this.FadeInFromZero(200); NotificationContent.MoveToX(DrawSize.X); - NotificationContent.MoveToX(0, 500, EasingTypes.OutQuint); + NotificationContent.MoveToX(0, 500, Easing.OutQuint); } private bool wasClosed; @@ -213,7 +213,7 @@ namespace osu.Game.Overlays.Notifications { const float length = 1000; pulsateLayer.Loop(length / 2, - p => p.FadeTo(0.4f, length, EasingTypes.In).Then().FadeTo(1, length, EasingTypes.Out) + p => p.FadeTo(0.4f, length, Easing.In).Then().FadeTo(1, length, Easing.Out) ); } } diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs index 831b09e7e9..efd3b39ee2 100644 --- a/osu.Game/Overlays/Notifications/NotificationSection.cs +++ b/osu.Game/Overlays/Notifications/NotificationSection.cs @@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Notifications AutoSizeAxes = Axes.Y, RelativeSizeAxes = Axes.X, LayoutDuration = 150, - LayoutEasing = EasingTypes.OutQuart, + LayoutEasing = Easing.OutQuart, Spacing = new Vector2(3), } }); diff --git a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs index cd1ce56011..d70868046b 100644 --- a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs +++ b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs @@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Notifications [BackgroundDependencyLoader] private void load(OsuColour colours) { - IconBackgound.ColourInfo = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight); + IconBackgound.Colour = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight); } } } \ No newline at end of file diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs index bd7b8bf844..98aac3a02d 100644 --- a/osu.Game/Overlays/Notifications/ProgressNotification.cs +++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs @@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Notifications switch (state) { case ProgressNotificationState.Completed: - NotificationContent.MoveToY(-DrawSize.Y / 2, 200, EasingTypes.OutQuint); + NotificationContent.MoveToY(-DrawSize.Y / 2, 200, Easing.OutQuint); this.FadeOut(200).Finally(d => Completed()); break; } @@ -181,7 +181,7 @@ namespace osu.Game.Overlays.Notifications if (progress == value) return; progress = value; - box.ResizeTo(new Vector2(progress, 1), 100, EasingTypes.OutQuad); + box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad); } } diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs index 42604658de..44e6d92aef 100644 --- a/osu.Game/Overlays/Notifications/SimpleNotification.cs +++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs @@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Notifications IconBackgound = new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.6f)) + Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.6f)) }, iconDrawable = new TextAwesome { diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index 65bef22295..746b6dd50f 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -155,11 +155,11 @@ namespace osu.Game.Overlays textLine3.Text = shortcut.ToUpper(); box.Animate( - b => b.FadeIn(500, EasingTypes.OutQuint), - b => b.ResizeHeightTo(height, 500, EasingTypes.OutQuint) + b => b.FadeIn(500, Easing.OutQuint), + b => b.ResizeHeightTo(height, 500, Easing.OutQuint) ).Then( - b => b.FadeOutFromOne(1500, EasingTypes.InQuint), - b => b.ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint) + b => b.FadeOutFromOne(1500, Easing.InQuint), + b => b.ResizeHeightTo(height_contracted, 1500, Easing.InQuint) ); int optionCount = 0; @@ -231,13 +231,13 @@ namespace osu.Game.Overlays { if (glowing) { - fill.FadeColour(glowingColour, transition_speed, EasingTypes.OutQuint); - FadeEdgeEffectTo(glow_strength, transition_speed, EasingTypes.OutQuint); + fill.FadeColour(glowingColour, transition_speed, Easing.OutQuint); + FadeEdgeEffectTo(glow_strength, transition_speed, Easing.OutQuint); } else { - FadeEdgeEffectTo(0, transition_speed, EasingTypes.OutQuint); - fill.FadeColour(idleColour, transition_speed, EasingTypes.OutQuint); + FadeEdgeEffectTo(0, transition_speed, Easing.OutQuint); + fill.FadeColour(idleColour, transition_speed, Easing.OutQuint); } } diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs index aa57816701..ab4cb8e965 100644 --- a/osu.Game/Overlays/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Profile new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(Color4.Black.Opacity(0.1f), Color4.Black.Opacity(0.75f)) + Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.1f), Color4.Black.Opacity(0.75f)) }, new Container { @@ -517,13 +517,13 @@ namespace osu.Game.Overlays.Profile protected override bool OnHover(InputState state) { - this.FadeColour(hoverColour, 500, EasingTypes.OutQuint); + this.FadeColour(hoverColour, 500, Easing.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - this.FadeColour(Color4.White, 500, EasingTypes.OutQuint); + this.FadeColour(Color4.White, 500, Easing.OutQuint); base.OnHoverLost(state); } diff --git a/osu.Game/Overlays/Profile/RankChart.cs b/osu.Game/Overlays/Profile/RankChart.cs index dfd2219e1f..416bcedfea 100644 --- a/osu.Game/Overlays/Profile/RankChart.cs +++ b/osu.Game/Overlays/Profile/RankChart.cs @@ -138,7 +138,7 @@ namespace osu.Game.Overlays.Profile public void ResetBall() { - ball.MoveTo(new Vector2(1, GetYPosition(Values.Last())), ballShown ? transform_duration : 0, EasingTypes.OutQuint); + ball.MoveTo(new Vector2(1, GetYPosition(Values.Last())), ballShown ? transform_duration : 0, Easing.OutQuint); ball.Show(); BallRelease(); ballShown = true; @@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Profile float y = GetYPosition(values[i]); if (Math.Abs(y * DrawHeight - position.Y) <= 8f) { - ball.MoveTo(new Vector2(index / (float)(count - 1), y), transform_duration, EasingTypes.OutQuint); + ball.MoveTo(new Vector2(index / (float)(count - 1), y), transform_duration, Easing.OutQuint); BallMove(i); } } diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs index bbecdff29a..6268a9753a 100644 --- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs @@ -291,7 +291,7 @@ namespace osu.Game.Overlays.Settings.Sections.General { set { - statusIcon.FadeColour(value, 500, EasingTypes.OutQuint); + statusIcon.FadeColour(value, 500, Easing.OutQuint); } } diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs index 5f8900449a..c4ce742153 100644 --- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs @@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, AutoSizeDuration = transition_duration, - AutoSizeEasing = EasingTypes.OutQuint, + AutoSizeEasing = Easing.OutQuint, Masking = true, Children = new Drawable[] @@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None; if (!isVisible) - letterboxSettings.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint); + letterboxSettings.ResizeHeightTo(0, transition_duration, Easing.OutQuint); }; letterboxing.TriggerChange(); } diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs index f5ab3b301b..6eafc65d12 100644 --- a/osu.Game/Overlays/Settings/Sidebar.cs +++ b/osu.Game/Overlays/Settings/Sidebar.cs @@ -94,10 +94,10 @@ namespace osu.Game.Overlays.Settings switch (state) { default: - this.ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, Easing.OutQuint); break; case ExpandedState.Expanded: - this.ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, EasingTypes.OutQuint); + this.ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, Easing.OutQuint); break; } } diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs index 1fdab08112..1dcabbfa15 100644 --- a/osu.Game/Overlays/SettingsOverlay.cs +++ b/osu.Game/Overlays/SettingsOverlay.cs @@ -125,8 +125,8 @@ namespace osu.Game.Overlays { base.PopIn(); - sectionsContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); - sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); + sectionsContainer.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint); + sidebar.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint); this.FadeTo(1, TRANSITION_LENGTH / 2); searchTextBox.HoldFocus = true; @@ -136,8 +136,8 @@ namespace osu.Game.Overlays { base.PopOut(); - sectionsContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint); - sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint); + sectionsContainer.MoveToX(-width, TRANSITION_LENGTH, Easing.OutQuint); + sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, Easing.OutQuint); this.FadeTo(0, TRANSITION_LENGTH / 2); searchTextBox.HoldFocus = false; diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs index 9070bc45ad..1ecfe90aa1 100644 --- a/osu.Game/Overlays/Toolbar/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar/Toolbar.cs @@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Toolbar Anchor = Anchor.BottomLeft, Alpha = 0, Height = 90, - ColourInfo = ColourInfo.GradientVertical( + Colour = ColourInfo.GradientVertical( OsuColour.Gray(0.1f).Opacity(0.5f), OsuColour.Gray(0.1f).Opacity(0)), }, }; @@ -107,29 +107,29 @@ namespace osu.Game.Overlays.Toolbar protected override bool OnHover(InputState state) { - solidBackground.FadeTo(alpha_hovering, transition_time, EasingTypes.OutQuint); - gradientBackground.FadeIn(transition_time, EasingTypes.OutQuint); + solidBackground.FadeTo(alpha_hovering, transition_time, Easing.OutQuint); + gradientBackground.FadeIn(transition_time, Easing.OutQuint); return true; } protected override void OnHoverLost(InputState state) { - solidBackground.FadeTo(alpha_normal, transition_time, EasingTypes.OutQuint); - gradientBackground.FadeOut(transition_time, EasingTypes.OutQuint); + solidBackground.FadeTo(alpha_normal, transition_time, Easing.OutQuint); + gradientBackground.FadeOut(transition_time, Easing.OutQuint); } } protected override void PopIn() { - this.MoveToY(0, transition_time, EasingTypes.OutQuint); - this.FadeIn(transition_time / 2, EasingTypes.OutQuint); + this.MoveToY(0, transition_time, Easing.OutQuint); + this.FadeIn(transition_time / 2, Easing.OutQuint); } protected override void PopOut() { userArea?.LoginOverlay.Hide(); - this.MoveToY(-DrawSize.Y, transition_time, EasingTypes.OutQuint); + this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint); this.FadeOut(transition_time); } } diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs index 38fd954fe3..b5e832d381 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs @@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Toolbar protected override bool OnClick(InputState state) { - HoverBackground.FlashColour(Color4.White.Opacity(100), 500, EasingTypes.OutQuint); + HoverBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint); return base.OnClick(state); } diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs index 3ecf0fd83c..f48cb681a8 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs @@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Toolbar if (!activeMode.IsValid) { - modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint); + modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, Easing.OutQuint); activeMode.Validate(); } } diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs index f26b143088..f604eb5cd2 100644 --- a/osu.Game/Overlays/UserProfileOverlay.cs +++ b/osu.Game/Overlays/UserProfileOverlay.cs @@ -73,13 +73,13 @@ namespace osu.Game.Overlays protected override void PopIn() { base.PopIn(); - FadeEdgeEffectTo(0.5f, APPEAR_DURATION, EasingTypes.In); + FadeEdgeEffectTo(0.5f, APPEAR_DURATION, Easing.In); } protected override void PopOut() { base.PopOut(); - FadeEdgeEffectTo(0, DISAPPEAR_DURATION, EasingTypes.Out); + FadeEdgeEffectTo(0, DISAPPEAR_DURATION, Easing.Out); } public void ShowUser(User user, bool fetchOnline = true) diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs index ce587c9ed2..fd89dcfbc4 100644 --- a/osu.Game/Overlays/WaveOverlayContainer.cs +++ b/osu.Game/Overlays/WaveOverlayContainer.cs @@ -17,8 +17,8 @@ namespace osu.Game.Overlays protected const float APPEAR_DURATION = 800; protected const float DISAPPEAR_DURATION = 500; - private const EasingTypes easing_show = EasingTypes.OutSine; - private const EasingTypes easing_hide = EasingTypes.InSine; + private const Easing easing_show = Easing.OutSine; + private const Easing easing_hide = Easing.InSine; private readonly Wave firstWave; private readonly Wave secondWave; @@ -137,23 +137,23 @@ namespace osu.Game.Overlays foreach (var w in wavesContainer.Children) w.State = Visibility.Visible; - this.FadeIn(100, EasingTypes.OutQuint); - contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint); + this.FadeIn(100, Easing.OutQuint); + contentContainer.MoveToY(0, APPEAR_DURATION, Easing.OutQuint); - this.FadeIn(100, EasingTypes.OutQuint); + this.FadeIn(100, Easing.OutQuint); } protected override void PopOut() { base.PopOut(); - this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint); - contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In); + this.FadeOut(DISAPPEAR_DURATION, Easing.InQuint); + contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, Easing.In); foreach (var w in wavesContainer.Children) w.State = Visibility.Hidden; - this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint); + this.FadeOut(DISAPPEAR_DURATION, Easing.InQuint); } protected override void UpdateAfterChildren() diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs index ac8a8e2005..f0a53d677b 100644 --- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs +++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs @@ -64,22 +64,22 @@ namespace osu.Game.Rulesets.Judgements { base.LoadComplete(); - this.FadeInFromZero(100, EasingTypes.OutQuint); + this.FadeInFromZero(100, Easing.OutQuint); switch (Judgement.Result) { case HitResult.Miss: this.ScaleTo(1.6f); - this.ScaleTo(1, 100, EasingTypes.In); + this.ScaleTo(1, 100, Easing.In); - this.MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint); - this.RotateTo(40, 800, EasingTypes.InQuint); + this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint); + this.RotateTo(40, 800, Easing.InQuint); this.Delay(600).FadeOut(200); break; case HitResult.Hit: this.ScaleTo(0.9f); - this.ScaleTo(1, 500, EasingTypes.OutElastic); + this.ScaleTo(1, 500, Easing.OutElastic); this.Delay(100).FadeOut(400); break; diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs index a9cb93876c..c5bbf04075 100644 --- a/osu.Game/Screens/BackgroundScreen.cs +++ b/osu.Game/Screens/BackgroundScreen.cs @@ -56,29 +56,29 @@ namespace osu.Game.Screens Content.FadeOut(); Content.MoveToX(x_movement_amount); - Content.FadeIn(transition_length, EasingTypes.InOutQuart); - Content.MoveToX(0, transition_length, EasingTypes.InOutQuart); + Content.FadeIn(transition_length, Easing.InOutQuart); + Content.MoveToX(0, transition_length, Easing.InOutQuart); base.OnEntering(last); } protected override void OnSuspending(Screen next) { - Content.MoveToX(-x_movement_amount, transition_length, EasingTypes.InOutQuart); + Content.MoveToX(-x_movement_amount, transition_length, Easing.InOutQuart); base.OnSuspending(next); } protected override bool OnExiting(Screen next) { - Content.FadeOut(transition_length, EasingTypes.OutExpo); - Content.MoveToX(x_movement_amount, transition_length, EasingTypes.OutExpo); + Content.FadeOut(transition_length, Easing.OutExpo); + Content.MoveToX(x_movement_amount, transition_length, Easing.OutExpo); return base.OnExiting(next); } protected override void OnResuming(Screen last) { - Content.MoveToX(0, transition_length, EasingTypes.OutExpo); + Content.MoveToX(0, transition_length, Easing.OutExpo); base.OnResuming(last); } } diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs index ac5ea04ecc..29a422892f 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs @@ -58,7 +58,7 @@ namespace osu.Game.Screens.Backgrounds Beatmap = beatmap; } - public void BlurTo(Vector2 sigma, double duration, EasingTypes easing = EasingTypes.None) + public void BlurTo(Vector2 sigma, double duration, Easing easing = Easing.None) { background?.BlurTo(sigma, duration, easing); blurTarget = sigma; diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs index bab267a24a..de84e90baf 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs @@ -24,7 +24,7 @@ namespace osu.Game.Screens.Backgrounds private void display(Background newBackground) { - current?.FadeOut(800, EasingTypes.OutQuint); + current?.FadeOut(800, Easing.OutQuint); current?.Expire(); Add(current = newBackground); diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs index e04e3ce66b..e55c4ef4fe 100644 --- a/osu.Game/Screens/Menu/Button.cs +++ b/osu.Game/Screens/Menu/Button.cs @@ -128,14 +128,14 @@ namespace osu.Game.Screens.Menu bool rightward = beatIndex % 2 == 1; double duration = timingPoint.BeatLength / 2; - icon.RotateTo(rightward ? 10 : -10, duration * 2, EasingTypes.InOutSine); + icon.RotateTo(rightward ? 10 : -10, duration * 2, Easing.InOutSine); icon.Animate( - i => i.MoveToY(-10, duration, EasingTypes.Out), - i => i.ScaleTo(1, duration, EasingTypes.Out) + i => i.MoveToY(-10, duration, Easing.Out), + i => i.ScaleTo(1, duration, Easing.Out) ).Then( - i => i.MoveToY(0, duration, EasingTypes.In), - i => i.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.In) + i => i.MoveToY(0, duration, Easing.In), + i => i.ScaleTo(new Vector2(1, 0.9f), duration, Easing.In) ); } @@ -145,25 +145,25 @@ namespace osu.Game.Screens.Menu sampleHover?.Play(); - box.ScaleTo(new Vector2(1.5f, 1), 500, EasingTypes.OutElastic); + box.ScaleTo(new Vector2(1.5f, 1), 500, Easing.OutElastic); double duration = TimeUntilNextBeat; icon.ClearTransforms(); - icon.RotateTo(10, duration, EasingTypes.InOutSine); - icon.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.Out); + icon.RotateTo(10, duration, Easing.InOutSine); + icon.ScaleTo(new Vector2(1, 0.9f), duration, Easing.Out); return true; } protected override void OnHoverLost(InputState state) { icon.ClearTransforms(); - icon.RotateTo(0, 500, EasingTypes.Out); - icon.MoveTo(Vector2.Zero, 500, EasingTypes.Out); - icon.ScaleTo(Vector2.One, 200, EasingTypes.Out); + icon.RotateTo(0, 500, Easing.Out); + icon.MoveTo(Vector2.Zero, 500, Easing.Out); + icon.ScaleTo(Vector2.One, 200, Easing.Out); if (State == ButtonState.Expanded) - box.ScaleTo(new Vector2(1, 1), 500, EasingTypes.OutElastic); + box.ScaleTo(new Vector2(1, 1), 500, Easing.OutElastic); } [BackgroundDependencyLoader] @@ -176,13 +176,13 @@ namespace osu.Game.Screens.Menu protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - boxHoverLayer.FadeTo(0.1f, 1000, EasingTypes.OutQuint); + boxHoverLayer.FadeTo(0.1f, 1000, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - boxHoverLayer.FadeTo(0, 1000, EasingTypes.OutQuint); + boxHoverLayer.FadeTo(0, 1000, Easing.OutQuint); return base.OnMouseUp(state, args); } @@ -214,7 +214,7 @@ namespace osu.Game.Screens.Menu boxHoverLayer.ClearTransforms(); boxHoverLayer.Alpha = 0.9f; - boxHoverLayer.FadeOut(800, EasingTypes.OutExpo); + boxHoverLayer.FadeOut(800, Easing.OutExpo); } public override bool HandleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f; @@ -246,23 +246,23 @@ namespace osu.Game.Screens.Menu switch (ContractStyle) { default: - box.ScaleTo(new Vector2(0, 1), 500, EasingTypes.OutExpo); + box.ScaleTo(new Vector2(0, 1), 500, Easing.OutExpo); this.FadeOut(500); break; case 1: - box.ScaleTo(new Vector2(0, 1), 400, EasingTypes.InSine); + box.ScaleTo(new Vector2(0, 1), 400, Easing.InSine); this.FadeOut(800); break; } break; case ButtonState.Expanded: const int expand_duration = 500; - box.ScaleTo(new Vector2(1, 1), expand_duration, EasingTypes.OutExpo); + box.ScaleTo(new Vector2(1, 1), expand_duration, Easing.OutExpo); this.FadeIn(expand_duration / 6f); break; case ButtonState.Exploded: const int explode_duration = 200; - box.ScaleTo(new Vector2(2, 1), explode_duration, EasingTypes.OutExpo); + box.ScaleTo(new Vector2(2, 1), explode_duration, Easing.OutExpo); this.FadeOut(explode_duration / 4f * 3); break; } diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs index 65ba555630..71f2a16c09 100644 --- a/osu.Game/Screens/Menu/ButtonSystem.cs +++ b/osu.Game/Screens/Menu/ButtonSystem.cs @@ -224,13 +224,13 @@ namespace osu.Game.Screens.Menu { case MenuState.Exit: case MenuState.Initial: - buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out); + buttonAreaBackground.ScaleTo(Vector2.One, 500, Easing.Out); buttonArea.FadeOut(300); osuLogo.Delay(150) .Schedule(() => toolbar?.Hide()) - .ScaleTo(1, 800, EasingTypes.OutExpo) - .MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo); + .ScaleTo(1, 800, Easing.OutExpo) + .MoveTo(Vector2.Zero, 800, Easing.OutExpo); foreach (Button b in buttonsTopLevel) b.State = ButtonState.Contracted; @@ -247,11 +247,11 @@ namespace osu.Game.Screens.Menu sampleBack?.Play(); break; case MenuState.TopLevel: - buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out); + buttonAreaBackground.ScaleTo(Vector2.One, 200, Easing.Out); var sequence = osuLogo - .ScaleTo(0.5f, 200, EasingTypes.In) - .MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In); + .ScaleTo(0.5f, 200, Easing.In) + .MoveTo(buttonFlow.DrawPosition, 200, Easing.In); if (fromInitial && osuLogo.Scale.X > 0.5f) sequence.OnComplete(o => @@ -276,7 +276,7 @@ namespace osu.Game.Screens.Menu b.State = ButtonState.Expanded; break; case MenuState.EnteringMode: - buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, EasingTypes.InSine); + buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, Easing.InSine); buttonsTopLevel.ForEach(b => b.ContractStyle = 1); buttonsPlay.ForEach(b => b.ContractStyle = 1); diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 6e42a1bae9..7b16e7e7ad 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -134,8 +134,8 @@ namespace osu.Game.Screens.Menu logo.ScaleTo(0.4f); logo.FadeOut(); - logo.ScaleTo(1, 4400, EasingTypes.OutQuint); - logo.FadeIn(20000, EasingTypes.OutQuint); + logo.ScaleTo(1, 4400, Easing.OutQuint); + logo.FadeIn(20000, Easing.OutQuint); } protected override void OnSuspending(Screen next) diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index def9c13c10..2544cc2837 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -118,10 +118,10 @@ namespace osu.Game.Screens.Menu buttons.State = MenuState.EnteringMode; - Content.FadeOut(length, EasingTypes.InSine); - Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine); + Content.FadeOut(length, Easing.InSine); + Content.MoveTo(new Vector2(-800, 0), length, Easing.InSine); - sideFlashes.FadeOut(length / 4, EasingTypes.OutQuint); + sideFlashes.FadeOut(length / 4, Easing.OutQuint); } protected override void OnResuming(Screen last) @@ -137,10 +137,10 @@ namespace osu.Game.Screens.Menu buttons.State = MenuState.TopLevel; - Content.FadeIn(length, EasingTypes.OutQuint); - Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint); + Content.FadeIn(length, Easing.OutQuint); + Content.MoveTo(new Vector2(0, 0), length, Easing.OutQuint); - sideFlashes.FadeIn(length / 4, EasingTypes.InQuint); + sideFlashes.FadeIn(length / 4, Easing.InQuint); } protected override bool OnExiting(Screen next) diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs index fdacccd913..49c777f09a 100644 --- a/osu.Game/Screens/Menu/MenuSideFlashes.cs +++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs @@ -73,8 +73,8 @@ namespace osu.Game.Screens.Menu Color4 gradientDark = colours.Blue.Opacity(0).ToLinear(); Color4 gradientLight = colours.Blue.Opacity(0.3f).ToLinear(); - leftBox.ColourInfo = ColourInfo.GradientHorizontal(gradientLight, gradientDark); - rightBox.ColourInfo = ColourInfo.GradientHorizontal(gradientDark, gradientLight); + leftBox.Colour = ColourInfo.GradientHorizontal(gradientLight, gradientDark); + rightBox.Colour = ColourInfo.GradientHorizontal(gradientDark, gradientLight); } protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes) @@ -92,7 +92,7 @@ namespace osu.Game.Screens.Menu { d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time) .Then() - .FadeOut(beatLength, EasingTypes.In); + .FadeOut(beatLength, Easing.In); } } } diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index 0b05b68080..64c28816d8 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -240,27 +240,27 @@ namespace osu.Game.Screens.Menu this.Delay(early_activation).Schedule(() => sampleBeat.Play()); logoBeatContainer - .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out) + .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out) .Then() - .ScaleTo(1, beatLength * 2, EasingTypes.OutQuint); + .ScaleTo(1, beatLength * 2, Easing.OutQuint); ripple.ClearTransforms(); ripple .ScaleTo(logoAmplitudeContainer.Scale) - .ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, EasingTypes.OutQuint) - .FadeTo(0.15f * amplitudeAdjust).FadeOut(beatLength, EasingTypes.OutQuint); + .ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, Easing.OutQuint) + .FadeTo(0.15f * amplitudeAdjust).FadeOut(beatLength, Easing.OutQuint); if (effectPoint.KiaiMode && flashLayer.Alpha < 0.4f) { flashLayer.ClearTransforms(); flashLayer - .FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out) + .FadeTo(0.2f * amplitudeAdjust, early_activation, Easing.Out) .Then() .FadeOut(beatLength); visualizer.ClearTransforms(); visualizer - .FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out) + .FadeTo(0.9f * amplitudeAdjust, early_activation, Easing.Out) .Then() .FadeTo(0.5f, beatLength); } @@ -274,7 +274,7 @@ namespace osu.Game.Screens.Menu const float velocity_adjust_cutoff = 0.98f; var maxAmplitude = lastBeatIndex >= 0 ? Beatmap.Value.Track?.CurrentAmplitudes.Maximum ?? 0 : 0; - logoAmplitudeContainer.ScaleTo(1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 75, EasingTypes.OutQuint); + logoAmplitudeContainer.ScaleTo(1 - Math.Max(0, maxAmplitude - scale_adjust_cutoff) * 0.04f, 75, Easing.OutQuint); if (maxAmplitude > velocity_adjust_cutoff) triangles.Velocity = 1 + Math.Max(0, maxAmplitude - velocity_adjust_cutoff) * 50; @@ -286,13 +286,13 @@ namespace osu.Game.Screens.Menu { if (!Interactive) return false; - logoBounceContainer.ScaleTo(0.9f, 1000, EasingTypes.Out); + logoBounceContainer.ScaleTo(0.9f, 1000, Easing.Out); return true; } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - logoBounceContainer.ScaleTo(1f, 500, EasingTypes.OutElastic); + logoBounceContainer.ScaleTo(1f, 500, Easing.OutElastic); return true; } @@ -304,7 +304,7 @@ namespace osu.Game.Screens.Menu flashLayer.ClearTransforms(); flashLayer.Alpha = 0.4f; - flashLayer.FadeOut(1500, EasingTypes.OutExpo); + flashLayer.FadeOut(1500, Easing.OutExpo); Action?.Invoke(); return true; @@ -314,18 +314,18 @@ namespace osu.Game.Screens.Menu { if (!Interactive) return false; - logoHoverContainer.ScaleTo(1.1f, 500, EasingTypes.OutElastic); + logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic); return true; } protected override void OnHoverLost(InputState state) { - logoHoverContainer.ScaleTo(1, 500, EasingTypes.OutElastic); + logoHoverContainer.ScaleTo(1, 500, Easing.OutElastic); } public void Impact() { - impactContainer.FadeOutFromOne(250, EasingTypes.In); + impactContainer.FadeOutFromOne(250, Easing.In); impactContainer.ScaleTo(0.96f); impactContainer.ScaleTo(1.12f, 250); } diff --git a/osu.Game/Screens/Multiplayer/DrawableRoom.cs b/osu.Game/Screens/Multiplayer/DrawableRoom.cs index d8963be116..8e2d9e0200 100644 --- a/osu.Game/Screens/Multiplayer/DrawableRoom.cs +++ b/osu.Game/Screens/Multiplayer/DrawableRoom.cs @@ -235,7 +235,7 @@ namespace osu.Game.Screens.Multiplayer Anchor = Anchor.Centre, Origin = Anchor.Centre, FillMode = FillMode.Fill, - OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), + OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), }) { RelativeSizeAxes = Axes.Both }, }; diff --git a/osu.Game/Screens/Multiplayer/RoomInspector.cs b/osu.Game/Screens/Multiplayer/RoomInspector.cs index 83950b4387..18fad53b51 100644 --- a/osu.Game/Screens/Multiplayer/RoomInspector.cs +++ b/osu.Game/Screens/Multiplayer/RoomInspector.cs @@ -112,7 +112,7 @@ namespace osu.Game.Screens.Multiplayer new Box { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)), + Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)), }, new Container { @@ -337,7 +337,7 @@ namespace osu.Game.Screens.Multiplayer Anchor = Anchor.Centre, Origin = Anchor.Centre, FillMode = FillMode.Fill, - OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), + OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), }) { RelativeSizeAxes = Axes.Both }, }; diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs index c6b1bbcf31..47099f96e9 100644 --- a/osu.Game/Screens/Play/HUD/ComboCounter.cs +++ b/osu.Game/Screens/Play/HUD/ComboCounter.cs @@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD protected virtual double PopOutDuration => 150; protected virtual float PopOutScale => 2.0f; - protected virtual EasingTypes PopOutEasing => EasingTypes.None; + protected virtual Easing PopOutEasing => Easing.None; protected virtual float PopOutInitialAlpha => 0.75f; protected virtual double FadeOutDuration => 100; @@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play.HUD /// /// Easing for the counter rollover animation. /// - protected EasingTypes RollingEasing => EasingTypes.None; + protected Easing RollingEasing => Easing.None; protected SpriteText DisplayedCountSpriteText; diff --git a/osu.Game/Screens/Play/HUD/ComboResultCounter.cs b/osu.Game/Screens/Play/HUD/ComboResultCounter.cs index 1686b6174d..a4732f6796 100644 --- a/osu.Game/Screens/Play/HUD/ComboResultCounter.cs +++ b/osu.Game/Screens/Play/HUD/ComboResultCounter.cs @@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.HUD public class ComboResultCounter : RollingCounter { protected override double RollingDuration => 500; - protected override EasingTypes RollingEasing => EasingTypes.Out; + protected override Easing RollingEasing => Easing.Out; protected override double GetProportionalDuration(long currentValue, long newValue) { diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs index e72310f1fe..18a3096d7c 100644 --- a/osu.Game/Screens/Play/HUD/ModDisplay.cs +++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs @@ -76,20 +76,20 @@ namespace osu.Game.Screens.Play.HUD private void appearTransform() { if (mods.Value.Any(m => !m.Ranked)) - unrankedText.FadeInFromZero(fade_duration, EasingTypes.OutQuint); + unrankedText.FadeInFromZero(fade_duration, Easing.OutQuint); else unrankedText.Hide(); iconsContainer.FinishTransforms(); - iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint); + iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint); expand(); using (iconsContainer.BeginDelayedSequence(1200)) contract(); } - private void expand() => iconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, EasingTypes.OutQuint); + private void expand() => iconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint); - private void contract() => iconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, EasingTypes.OutQuint); + private void contract() => iconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint); protected override bool OnHover(InputState state) { diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs index b4b3bd885e..06ef87276a 100644 --- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs +++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs @@ -97,11 +97,11 @@ namespace osu.Game.Screens.Play.HUD if (judgement.Result == HitResult.Miss) return; - fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, EasingTypes.OutQuint) + fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint) .Delay(glow_fade_delay) - .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, EasingTypes.OutQuint); + .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint); } - protected override void SetHealth(float value) => fill.ResizeTo(new Vector2(value, 1), 200, EasingTypes.OutQuint); + protected override void SetHealth(float value) => fill.ResizeTo(new Vector2(value, 1), 200, Easing.OutQuint); } } diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs index c4d956ebce..11f9a484dd 100644 --- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs +++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs @@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play if (args.Key == Key.Tilde) { - overlay.FadeIn(activate_delay, EasingTypes.Out); + overlay.FadeIn(activate_delay, Easing.Out); return true; } @@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play { if (args.Key == Key.Tilde && !fired) { - overlay.FadeOut(fadeout_delay, EasingTypes.Out); + overlay.FadeOut(fadeout_delay, Easing.Out); return true; } diff --git a/osu.Game/Screens/Play/MenuOverlay.cs b/osu.Game/Screens/Play/MenuOverlay.cs index ee08bcc031..a0f867d248 100644 --- a/osu.Game/Screens/Play/MenuOverlay.cs +++ b/osu.Game/Screens/Play/MenuOverlay.cs @@ -76,8 +76,8 @@ namespace osu.Game.Screens.Play public override bool HandleInput => State == Visibility.Visible; - protected override void PopIn() => this.FadeIn(transition_duration, EasingTypes.In); - protected override void PopOut() => this.FadeOut(transition_duration, EasingTypes.In); + protected override void PopIn() => this.FadeIn(transition_duration, Easing.In); + protected override void PopOut() => this.FadeOut(transition_duration, Easing.In); // Don't let mouse down events through the overlay or people can click circles while paused. protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true; diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index c22a02ed35..cda4713575 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -262,8 +262,8 @@ namespace osu.Game.Screens.Play if (!loadedSuccessfully) return; - (Background as BackgroundScreenBeatmap)?.BlurTo(Vector2.Zero, 1500, EasingTypes.OutQuint); - Background?.FadeTo(1 - (float)dimLevel, 1500, EasingTypes.OutQuint); + (Background as BackgroundScreenBeatmap)?.BlurTo(Vector2.Zero, 1500, Easing.OutQuint); + Background?.FadeTo(1 - (float)dimLevel, 1500, Easing.OutQuint); Content.Alpha = 0; @@ -271,7 +271,7 @@ namespace osu.Game.Screens.Play Content .ScaleTo(0.7f) - .ScaleTo(1, 750, EasingTypes.OutQuint) + .ScaleTo(1, 750, Easing.OutQuint) .Delay(250) .FadeIn(250); @@ -282,7 +282,7 @@ namespace osu.Game.Screens.Play }); pauseContainer.Alpha = 0; - pauseContainer.FadeIn(750, EasingTypes.OutQuint); + pauseContainer.FadeIn(750, Easing.OutQuint); } protected override void OnSuspending(Screen next) @@ -314,7 +314,7 @@ namespace osu.Game.Screens.Play HitRenderer?.FadeOut(fade_out_duration); Content.FadeOut(fade_out_duration); - hudOverlay?.ScaleTo(0.7f, fade_out_duration * 3, EasingTypes.In); + hudOverlay?.ScaleTo(0.7f, fade_out_duration * 3, Easing.In); Background?.FadeTo(1f, fade_out_duration); } diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index bd4ca768b8..d9bdb50ef0 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -82,13 +82,13 @@ namespace osu.Game.Screens.Play private void contentIn() { - Content.ScaleTo(1, 650, EasingTypes.OutQuint); + Content.ScaleTo(1, 650, Easing.OutQuint); Content.FadeInFromZero(400); } private void contentOut() { - Content.ScaleTo(0.7f, 300, EasingTypes.InQuint); + Content.ScaleTo(0.7f, 300, Easing.InQuint); Content.FadeOut(250); } @@ -102,7 +102,7 @@ namespace osu.Game.Screens.Play contentIn(); - logo.Delay(500).MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo); + logo.Delay(500).MoveToOffset(new Vector2(0, -180), 500, Easing.InOutExpo); info.Delay(750).FadeIn(500); this.Delay(2150).Schedule(pushWhenLoaded); } @@ -131,7 +131,7 @@ namespace osu.Game.Screens.Play protected override bool OnExiting(Screen next) { - Content.ScaleTo(0.7f, 150, EasingTypes.InQuint); + Content.ScaleTo(0.7f, 150, Easing.InQuint); this.FadeOut(150); return base.OnExiting(next); diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs b/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs index a2494d3a69..06cd783cae 100644 --- a/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs +++ b/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs @@ -94,7 +94,7 @@ namespace osu.Game.Screens.Play.ReplaySettings Direction = FillDirection.Vertical, RelativeSizeAxes = Axes.X, AutoSizeDuration = transition_duration, - AutoSizeEasing = EasingTypes.OutQuint, + AutoSizeEasing = Easing.OutQuint, AutoSizeAxes = Axes.Y, Padding = new MarginPadding(15), Spacing = new Vector2(0, 15), @@ -123,10 +123,10 @@ namespace osu.Game.Screens.Play.ReplaySettings else { content.AutoSizeAxes = Axes.None; - content.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint); + content.ResizeHeightTo(0, transition_duration, Easing.OutQuint); } - button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, EasingTypes.OutQuint); + button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, Easing.OutQuint); } } } diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index 6637680c15..b2d5abe71a 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -114,7 +114,7 @@ namespace osu.Game.Screens.Play protected override void Update() { base.Update(); - remainingTimeBox.ResizeWidthTo((float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)), 120, EasingTypes.OutQuint); + remainingTimeBox.ResizeWidthTo((float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)), 120, Easing.OutQuint); } protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) @@ -154,14 +154,14 @@ namespace osu.Game.Screens.Play { case Visibility.Visible: if (lastState == Visibility.Hidden) - this.FadeIn(500, EasingTypes.OutExpo); + this.FadeIn(500, Easing.OutExpo); if (!IsHovered) using (BeginDelayedSequence(1000)) scheduledHide = Schedule(() => State = Visibility.Hidden); break; case Visibility.Hidden: - this.FadeOut(1000, EasingTypes.OutExpo); + this.FadeOut(1000, Easing.OutExpo); break; } } @@ -249,29 +249,29 @@ namespace osu.Game.Screens.Play protected override bool OnHover(InputState state) { - flow.TransformSpacingTo(new Vector2(5), 500, EasingTypes.OutQuint); - box.FadeColour(colourHover, 500, EasingTypes.OutQuint); - background.FadeTo(0.4f, 500, EasingTypes.OutQuint); + flow.TransformSpacingTo(new Vector2(5), 500, Easing.OutQuint); + box.FadeColour(colourHover, 500, Easing.OutQuint); + background.FadeTo(0.4f, 500, Easing.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(InputState state) { - flow.TransformSpacingTo(new Vector2(0), 500, EasingTypes.OutQuint); - box.FadeColour(colourNormal, 500, EasingTypes.OutQuint); - background.FadeTo(0.2f, 500, EasingTypes.OutQuint); + flow.TransformSpacingTo(new Vector2(0), 500, Easing.OutQuint); + box.FadeColour(colourNormal, 500, Easing.OutQuint); + background.FadeTo(0.2f, 500, Easing.OutQuint); base.OnHoverLost(state); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - aspect.ScaleTo(0.75f, 2000, EasingTypes.OutQuint); + aspect.ScaleTo(0.75f, 2000, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - aspect.ScaleTo(1, 1000, EasingTypes.OutElastic); + aspect.ScaleTo(1, 1000, Easing.OutElastic); return base.OnMouseUp(state, args); } @@ -280,8 +280,8 @@ namespace osu.Game.Screens.Play if (!Enabled) return false; - box.FlashColour(Color4.White, 500, EasingTypes.OutQuint); - aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint); + box.FlashColour(Color4.White, 500, Easing.OutQuint); + aspect.ScaleTo(1.2f, 2000, Easing.OutQuint); bool result = base.OnClick(state); diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index b0684b80cc..c513daf3d9 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -121,14 +121,14 @@ namespace osu.Game.Screens.Play private void updateBarVisibility() { - bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, EasingTypes.In); - this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, EasingTypes.In); + bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, Easing.In); + this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, Easing.In); } protected override void PopIn() { updateBarVisibility(); - this.FadeIn(500, EasingTypes.OutQuint); + this.FadeIn(500, Easing.OutQuint); } protected override void PopOut() diff --git a/osu.Game/Screens/Ranking/ResultModeButton.cs b/osu.Game/Screens/Ranking/ResultModeButton.cs index 4789a5abb7..50be5c8d00 100644 --- a/osu.Game/Screens/Ranking/ResultModeButton.cs +++ b/osu.Game/Screens/Ranking/ResultModeButton.cs @@ -92,8 +92,8 @@ namespace osu.Game.Screens.Ranking }; } - protected override void OnActivated() => colouredPart.FadeColour(activeColour, 200, EasingTypes.OutQuint); + protected override void OnActivated() => colouredPart.FadeColour(activeColour, 200, Easing.OutQuint); - protected override void OnDeactivated() => colouredPart.FadeColour(inactiveColour, 200, EasingTypes.OutQuint); + protected override void OnDeactivated() => colouredPart.FadeColour(inactiveColour, 200, Easing.OutQuint); } } diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs index a0bf42599b..60ad484673 100644 --- a/osu.Game/Screens/Ranking/Results.cs +++ b/osu.Game/Screens/Ranking/Results.cs @@ -55,7 +55,7 @@ namespace osu.Game.Screens.Ranking protected override void OnEntering(Screen last) { base.OnEntering(last); - (Background as BackgroundScreenBeatmap)?.BlurTo(background_blur, 2500, EasingTypes.OutQuint); + (Background as BackgroundScreenBeatmap)?.BlurTo(background_blur, 2500, Easing.OutQuint); allCircles.ForEach(c => { @@ -68,27 +68,27 @@ namespace osu.Game.Screens.Ranking currentPage.FadeOut(); circleOuterBackground - .FadeIn(transition_time, EasingTypes.OutQuint) - .ScaleTo(1, transition_time, EasingTypes.OutQuint); + .FadeIn(transition_time, Easing.OutQuint) + .ScaleTo(1, transition_time, Easing.OutQuint); using (BeginDelayedSequence(transition_time * 0.25f, true)) { circleOuter - .FadeIn(transition_time, EasingTypes.OutQuint) - .ScaleTo(1, transition_time, EasingTypes.OutQuint); + .FadeIn(transition_time, Easing.OutQuint) + .ScaleTo(1, transition_time, Easing.OutQuint); using (BeginDelayedSequence(transition_time * 0.3f, true)) { - backgroundParallax.FadeIn(transition_time, EasingTypes.OutQuint); + backgroundParallax.FadeIn(transition_time, Easing.OutQuint); circleInner - .FadeIn(transition_time, EasingTypes.OutQuint) - .ScaleTo(1, transition_time, EasingTypes.OutQuint); + .FadeIn(transition_time, Easing.OutQuint) + .ScaleTo(1, transition_time, Easing.OutQuint); using (BeginDelayedSequence(transition_time * 0.4f, true)) { - modeChangeButtons.FadeIn(transition_time, EasingTypes.OutQuint); - currentPage.FadeIn(transition_time, EasingTypes.OutQuint); + modeChangeButtons.FadeIn(transition_time, Easing.OutQuint); + currentPage.FadeIn(transition_time, Easing.OutQuint); } } } @@ -98,7 +98,7 @@ namespace osu.Game.Screens.Ranking { allCircles.ForEach(c => { - c.ScaleTo(0, transition_time, EasingTypes.OutSine); + c.ScaleTo(0, transition_time, Easing.OutSine); }); Content.FadeOut(transition_time / 4); diff --git a/osu.Game/Screens/Ranking/ResultsPageScore.cs b/osu.Game/Screens/Ranking/ResultsPageScore.cs index 09db835144..00cc031ec6 100644 --- a/osu.Game/Screens/Ranking/ResultsPageScore.cs +++ b/osu.Game/Screens/Ranking/ResultsPageScore.cs @@ -133,7 +133,7 @@ namespace osu.Game.Screens.Ranking { new Box { - ColourInfo = ColourInfo.GradientHorizontal( + Colour = ColourInfo.GradientHorizontal( colours.GrayC.Opacity(0), colours.GrayC.Opacity(0.9f)), RelativeSizeAxes = Axes.Both, @@ -143,7 +143,7 @@ namespace osu.Game.Screens.Ranking { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, - ColourInfo = ColourInfo.GradientHorizontal( + Colour = ColourInfo.GradientHorizontal( colours.GrayC.Opacity(0.9f), colours.GrayC.Opacity(0)), RelativeSizeAxes = Axes.Both, @@ -158,7 +158,7 @@ namespace osu.Game.Screens.Ranking Origin = Anchor.TopCentre, Direction = FillDirection.Horizontal, LayoutDuration = 200, - LayoutEasing = EasingTypes.OutQuint + LayoutEasing = Easing.OutQuint } } } @@ -180,7 +180,7 @@ namespace osu.Game.Screens.Ranking { s.FadeOut() .Then(delay += 200) - .FadeIn(300 + delay, EasingTypes.Out); + .FadeIn(300 + delay, Easing.Out); } }); } @@ -372,7 +372,7 @@ namespace osu.Game.Screens.Ranking { protected override double RollingDuration => 3000; - protected override EasingTypes RollingEasing => EasingTypes.OutPow10; + protected override Easing RollingEasing => Easing.OutPow10; public SlowScoreCounter(uint leading = 0) : base(leading) { diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs index 7eac2407e9..5596f345d5 100644 --- a/osu.Game/Screens/ScreenWhiteBox.cs +++ b/osu.Game/Screens/ScreenWhiteBox.cs @@ -46,18 +46,18 @@ namespace osu.Game.Screens using (Content.BeginDelayedSequence(300, true)) { - boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic); - boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint); + boxContainer.ScaleTo(1, transition_time, Easing.OutElastic); + boxContainer.RotateTo(0, transition_time / 2, Easing.OutQuint); - textContainer.MoveTo(Vector2.Zero, transition_time, EasingTypes.OutExpo); - Content.FadeIn(transition_time, EasingTypes.OutExpo); + textContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo); + Content.FadeIn(transition_time, Easing.OutExpo); } } protected override bool OnExiting(Screen next) { - textContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, EasingTypes.OutExpo); - Content.FadeOut(transition_time, EasingTypes.OutExpo); + textContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, Easing.OutExpo); + Content.FadeOut(transition_time, Easing.OutExpo); return base.OnExiting(next); } @@ -66,16 +66,16 @@ namespace osu.Game.Screens { base.OnSuspending(next); - textContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, EasingTypes.OutExpo); - Content.FadeOut(transition_time, EasingTypes.OutExpo); + textContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, Easing.OutExpo); + Content.FadeOut(transition_time, Easing.OutExpo); } protected override void OnResuming(Screen last) { base.OnResuming(last); - textContainer.MoveTo(Vector2.Zero, transition_time, EasingTypes.OutExpo); - Content.FadeIn(transition_time, EasingTypes.OutExpo); + textContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo); + Content.FadeIn(transition_time, Easing.OutExpo); } public ScreenWhiteBox() diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs index b696d637e6..7f49109bd0 100644 --- a/osu.Game/Screens/Select/BeatmapCarousel.cs +++ b/osu.Game/Screens/Select/BeatmapCarousel.cs @@ -341,7 +341,7 @@ namespace osu.Game.Screens.Select if (group.State == BeatmapGroupState.Expanded) { - group.Header.MoveToX(-100, 500, EasingTypes.OutExpo); + group.Header.MoveToX(-100, 500, Easing.OutExpo); var headerY = group.Header.Position.Y; foreach (BeatmapPanel panel in group.BeatmapPanels) @@ -349,7 +349,7 @@ namespace osu.Game.Screens.Select if (panel == selectedPanel) selectedY = currentY + panel.DrawHeight / 2 - DrawHeight / 2; - panel.MoveToX(-50, 500, EasingTypes.OutExpo); + panel.MoveToX(-50, 500, Easing.OutExpo); //on first display we want to begin hidden under our group's header. if (panel.Alpha == 0) @@ -360,11 +360,11 @@ namespace osu.Game.Screens.Select } else { - group.Header.MoveToX(0, 500, EasingTypes.OutExpo); + group.Header.MoveToX(0, 500, Easing.OutExpo); foreach (BeatmapPanel panel in group.BeatmapPanels) { - panel.MoveToX(0, 500, EasingTypes.OutExpo); + panel.MoveToX(0, 500, Easing.OutExpo); movePanel(panel, false, animated, ref currentY); } } @@ -379,7 +379,7 @@ namespace osu.Game.Screens.Select private void movePanel(Panel panel, bool advance, bool animated, ref float currentY) { yPositions.Add(currentY); - panel.MoveToY(currentY, animated ? 750 : 0, EasingTypes.OutExpo); + panel.MoveToY(currentY, animated ? 750 : 0, Easing.OutExpo); if (advance) currentY += panel.DrawHeight + 5; diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs index 9ad932ff26..972d563ca5 100644 --- a/osu.Game/Screens/Select/BeatmapDetails.cs +++ b/osu.Game/Screens/Select/BeatmapDetails.cs @@ -119,12 +119,12 @@ namespace osu.Game.Screens.Select ratingsGraph.Values = ratings.Select(rating => (float)rating); - ratingsContainer.FadeColour(Color4.White, 500, EasingTypes.Out); + ratingsContainer.FadeColour(Color4.White, 500, Easing.Out); } else if (failOnMissing) ratingsGraph.Values = new float[10]; else - ratingsContainer.FadeColour(Color4.Gray, 500, EasingTypes.Out); + ratingsContainer.FadeColour(Color4.Gray, 500, Easing.Out); if (hasRetriesFails) { @@ -139,7 +139,7 @@ namespace osu.Game.Screens.Select failGraph.Values = fails.Select(fail => (float)fail); retryGraph.Values = retries.Zip(fails, (retry, fail) => retry + MathHelper.Clamp(fail, 0, maxValue)); - retryFailContainer.FadeColour(Color4.White, 500, EasingTypes.Out); + retryFailContainer.FadeColour(Color4.White, 500, Easing.Out); } else if (failOnMissing) { @@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select retryGraph.Values = new float[100]; } else - retryFailContainer.FadeColour(Color4.Gray, 500, EasingTypes.Out); + retryFailContainer.FadeColour(Color4.Gray, 500, Easing.Out); } public BeatmapDetails() @@ -169,7 +169,7 @@ namespace osu.Game.Screens.Select Width = 0.4f, Direction = FillDirection.Vertical, LayoutDuration = 200, - LayoutEasing = EasingTypes.OutQuint, + LayoutEasing = Easing.OutQuint, Children = new[] { description = new MetadataSegment("Description"), diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index fbe0015d52..8aa2796189 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -57,14 +57,14 @@ namespace osu.Game.Screens.Select protected override void PopIn() { - this.MoveToX(0, 800, EasingTypes.OutQuint); - this.RotateTo(0, 800, EasingTypes.OutQuint); + this.MoveToX(0, 800, Easing.OutQuint); + this.RotateTo(0, 800, Easing.OutQuint); } protected override void PopOut() { - this.MoveToX(-100, 800, EasingTypes.InQuint); - this.RotateTo(10, 800, EasingTypes.InQuint); + this.MoveToX(-100, 800, Easing.InQuint); + this.RotateTo(10, 800, Easing.InQuint); } public void UpdateBeatmap(WorkingBeatmap beatmap) @@ -140,7 +140,7 @@ namespace osu.Game.Screens.Select new Container { RelativeSizeAxes = Axes.Both, - ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)), + Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)), Children = new[] { // Zoomed-in and cropped beatmap background diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs index 33252f78f8..bb6d16da0f 100644 --- a/osu.Game/Screens/Select/Footer.cs +++ b/osu.Game/Screens/Select/Footer.cs @@ -58,7 +58,7 @@ namespace osu.Game.Screens.Select Action = action, }); - private void updateModeLight() => modeLight.FadeColour(buttons.FirstOrDefault(b => b.IsHovered)?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, EasingTypes.OutQuint); + private void updateModeLight() => modeLight.FadeColour(buttons.FirstOrDefault(b => b.IsHovered)?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, Easing.OutQuint); public Footer() { diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs index 536bf3971a..ae6c7d3c1e 100644 --- a/osu.Game/Screens/Select/FooterButton.cs +++ b/osu.Game/Screens/Select/FooterButton.cs @@ -89,27 +89,27 @@ namespace osu.Game.Screens.Select protected override bool OnHover(InputState state) { Hovered?.Invoke(); - light.ScaleTo(new Vector2(1, 2), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); - light.FadeColour(SelectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); + light.ScaleTo(new Vector2(1, 2), Footer.TRANSITION_LENGTH, Easing.OutQuint); + light.FadeColour(SelectedColour, Footer.TRANSITION_LENGTH, Easing.OutQuint); return true; } protected override void OnHoverLost(InputState state) { HoverLost?.Invoke(); - light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); - light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); + light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, Easing.OutQuint); + light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, Easing.OutQuint); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - box.FadeTo(0.3f, Footer.TRANSITION_LENGTH * 2, EasingTypes.OutQuint); + box.FadeTo(0.3f, Footer.TRANSITION_LENGTH * 2, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); + box.FadeOut(Footer.TRANSITION_LENGTH, Easing.OutQuint); return base.OnMouseUp(state, args); } @@ -117,7 +117,7 @@ namespace osu.Game.Screens.Select { box.ClearTransforms(); box.Alpha = 1; - box.FadeOut(Footer.TRANSITION_LENGTH * 3, EasingTypes.OutQuint); + box.FadeOut(Footer.TRANSITION_LENGTH * 3, Easing.OutQuint); return base.OnClick(state); } diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs index 91bc55f143..57c333138f 100644 --- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs @@ -163,7 +163,7 @@ namespace osu.Game.Screens.Select.Leaderboards c.Colour = Color4.Transparent; else { - c.ColourInfo = ColourInfo.GradientVertical( + c.Colour = ColourInfo.GradientVertical( Color4.White.Opacity(Math.Min(1 - (topY - fadeStart) / LeaderboardScore.HEIGHT, 1)), Color4.White.Opacity(Math.Min(1 - (bottomY - fadeStart) / LeaderboardScore.HEIGHT, 1))); } diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs index b0e234e5a2..c2d2f82b5c 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs @@ -62,15 +62,15 @@ namespace osu.Game.Screens.Select.Leaderboards break; case Visibility.Visible: this.FadeIn(200); - content.MoveToY(0, 800, EasingTypes.OutQuint); + content.MoveToY(0, 800, Easing.OutQuint); using (BeginDelayedSequence(100, true)) { - avatar.FadeIn(300, EasingTypes.OutQuint); - nameLabel.FadeIn(350, EasingTypes.OutQuint); + avatar.FadeIn(300, Easing.OutQuint); + nameLabel.FadeIn(350, Easing.OutQuint); - avatar.MoveToX(0, 300, EasingTypes.OutQuint); - nameLabel.MoveToX(0, 350, EasingTypes.OutQuint); + avatar.MoveToX(0, 300, Easing.OutQuint); + nameLabel.MoveToX(0, 350, Easing.OutQuint); using (BeginDelayedSequence(250, true)) { @@ -269,13 +269,13 @@ namespace osu.Game.Screens.Select.Leaderboards protected override bool OnHover(Framework.Input.InputState state) { - background.FadeTo(0.5f, 300, EasingTypes.OutQuint); + background.FadeTo(0.5f, 300, Easing.OutQuint); return base.OnHover(state); } protected override void OnHoverLost(Framework.Input.InputState state) { - background.FadeTo(background_alpha, 200, EasingTypes.OutQuint); + background.FadeTo(background_alpha, 200, Easing.OutQuint); base.OnHoverLost(state); } diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs index 58ce5ac564..ab02e8678f 100644 --- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs @@ -54,13 +54,13 @@ namespace osu.Game.Screens.Select.Options protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - flash.FadeTo(0.1f, 1000, EasingTypes.OutQuint); + flash.FadeTo(0.1f, 1000, Easing.OutQuint); return base.OnMouseDown(state, args); } protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { - flash.FadeTo(0, 1000, EasingTypes.OutQuint); + flash.FadeTo(0, 1000, Easing.OutQuint); return base.OnMouseUp(state, args); } @@ -68,7 +68,7 @@ namespace osu.Game.Screens.Select.Options { flash.ClearTransforms(); flash.Alpha = 0.9f; - flash.FadeOut(800, EasingTypes.OutExpo); + flash.FadeOut(800, Easing.OutExpo); return base.OnClick(state); } diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs index 4b9a85f7f8..0a410f0e0f 100644 --- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs @@ -29,27 +29,27 @@ namespace osu.Game.Screens.Select.Options { base.PopIn(); - this.FadeIn(transition_duration, EasingTypes.OutQuint); + this.FadeIn(transition_duration, Easing.OutQuint); if (buttonsContainer.Position.X == 1 || Alpha == 0) buttonsContainer.MoveToX(x_position - x_movement); - holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, EasingTypes.OutQuint); + holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, Easing.OutQuint); - buttonsContainer.MoveToX(x_position, transition_duration, EasingTypes.OutQuint); - buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, EasingTypes.OutQuint); + buttonsContainer.MoveToX(x_position, transition_duration, Easing.OutQuint); + buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, Easing.OutQuint); } protected override void PopOut() { base.PopOut(); - holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, EasingTypes.InSine); + holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, Easing.InSine); - buttonsContainer.MoveToX(x_position + x_movement, transition_duration, EasingTypes.InSine); - buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, EasingTypes.InSine); + buttonsContainer.MoveToX(x_position + x_movement, transition_duration, Easing.InSine); + buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, Easing.InSine); - this.FadeOut(transition_duration, EasingTypes.InQuint); + this.FadeOut(transition_duration, Easing.InQuint); } public BeatmapOptionsOverlay() diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index baa0f180f5..09fd22ecbe 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -312,14 +312,14 @@ namespace osu.Game.Screens.Select Content.FadeIn(250); - Content.ScaleTo(1, 250, EasingTypes.OutSine); + Content.ScaleTo(1, 250, Easing.OutSine); FilterControl.Activate(); } protected override void OnSuspending(Screen next) { - Content.ScaleTo(1.1f, 250, EasingTypes.InSine); + Content.ScaleTo(1.1f, 250, Easing.InSine); Content.FadeOut(250); diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs index ae0f6e4b3f..2eb0dacec3 100644 --- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs +++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs @@ -68,7 +68,7 @@ namespace osu.Game.Screens.Tournament Origin = Anchor.BottomCentre, Size = new Vector2(2, 55), - ColourInfo = ColourInfo.GradientVertical(Color4.Transparent, Color4.White) + Colour = ColourInfo.GradientVertical(Color4.Transparent, Color4.White) }, new Box { @@ -76,7 +76,7 @@ namespace osu.Game.Screens.Tournament Origin = Anchor.TopCentre, Size = new Vector2(2, 55), - ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.Transparent) + Colour = ColourInfo.GradientVertical(Color4.White, Color4.Transparent) } } } @@ -300,7 +300,7 @@ namespace osu.Game.Screens.Tournament } } - private void speedTo(float value, double duration = 0, EasingTypes easing = EasingTypes.None) => + private void speedTo(float value, double duration = 0, Easing easing = Easing.None) => this.TransformTo(nameof(speed), value, duration, easing); private enum ScrollState diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs index b3c227855d..d51df8ccaa 100644 --- a/osu.Game/Users/UserPanel.cs +++ b/osu.Game/Users/UserPanel.cs @@ -169,7 +169,7 @@ namespace osu.Game.Users private void load(OsuColour colours, UserProfileOverlay profile) { Status.ValueChanged += displayStatus; - Status.ValueChanged += status => statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, EasingTypes.OutQuint); + Status.ValueChanged += status => statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint); base.Action = () => { @@ -190,15 +190,15 @@ namespace osu.Game.Users if (status == null) { - statusBar.ResizeHeightTo(0f, transition_duration, EasingTypes.OutQuint); - statusBar.FadeOut(transition_duration, EasingTypes.OutQuint); - this.ResizeHeightTo(height - status_height, transition_duration, EasingTypes.OutQuint); + statusBar.ResizeHeightTo(0f, transition_duration, Easing.OutQuint); + statusBar.FadeOut(transition_duration, Easing.OutQuint); + this.ResizeHeightTo(height - status_height, transition_duration, Easing.OutQuint); } else { - statusBar.ResizeHeightTo(status_height, transition_duration, EasingTypes.OutQuint); - statusBar.FadeIn(transition_duration, EasingTypes.OutQuint); - this.ResizeHeightTo(height, transition_duration, EasingTypes.OutQuint); + statusBar.ResizeHeightTo(status_height, transition_duration, Easing.OutQuint); + statusBar.FadeIn(transition_duration, Easing.OutQuint); + this.ResizeHeightTo(height, transition_duration, Easing.OutQuint); statusMessage.Text = status.Message; }