h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 17:27:48 +08:00
Code Issues Releases Wiki Activity

Rename EasingTypes to Easing

Browse Source
This commit is contained in:
Thomas Müller 2017-07-22 20:50:25 +02:00
parent c08cb43b9c
commit e68675f970
121 changed files with 450 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 8fde46d214e4ababb46100d2e4488ca26a9d43a3 Subproject commit eda38950b57fe0693e1faa6ad8e55f2da9665f91

8
osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs
View File

@ -88,10 +88,10 @@ namespace osu.Desktop.VisualTests.Tests
{ {
new OsuContextMenuItem(@"Simple option"), new OsuContextMenuItem(@"Simple option"),
new OsuContextMenuItem(@"Simple very very long 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 width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint) },
new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, EasingTypes.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, EasingTypes.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, EasingTypes.OutQuint) }, new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint) },
}; };
} }
} }

2
osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
View File

@ -96,7 +96,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
SelectionBox.ScaleTo( SelectionBox.ScaleTo(
new Vector2(value, 1), new Vector2(value, 1),
300, EasingTypes.OutQuint); 300, Easing.OutQuint);
} }
} }
} }

2
osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs
View File

@ -196,7 +196,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(250, EasingTypes.OutQuint); this.FadeInFromZero(250, Easing.OutQuint);
} }
protected override void Update() protected override void Update()

8
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -206,8 +206,8 @@ namespace osu.Game.Rulesets.Mania.UI
if (args.Key == Key) if (args.Key == Key)
{ {
background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint); background.FadeTo(background.Alpha + 0.2f, 50, Easing.OutQuint);
keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint); keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint);
} }
return false; return false;
@ -217,8 +217,8 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
if (args.Key == Key) if (args.Key == Key)
{ {
background.FadeTo(0.2f, 800, EasingTypes.OutQuart); background.FadeTo(0.2f, 800, Easing.OutQuart);
keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart); keyIcon.ScaleTo(1f, 400, Easing.OutQuart);
} }
return false; return false;

6
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -220,10 +220,10 @@ namespace osu.Game.Rulesets.Mania.UI
switch (args.Key) switch (args.Key)
{ {
case Key.Minus: case Key.Minus:
transformVisibleTimeRangeTo(visibleTimeRange + time_span_step, 200, EasingTypes.OutQuint); transformVisibleTimeRangeTo(visibleTimeRange + time_span_step, 200, Easing.OutQuint);
break; break;
case Key.Plus: case Key.Plus:
transformVisibleTimeRangeTo(visibleTimeRange - time_span_step, 200, EasingTypes.OutQuint); transformVisibleTimeRangeTo(visibleTimeRange - time_span_step, 200, Easing.OutQuint);
break; break;
} }
} }
@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Mania.UI
return false; 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); this.TransformTo(nameof(visibleTimeRange), newTimeRange, duration, easing);
} }

4
osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
View File

@ -94,9 +94,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
using (fp.BeginAbsoluteSequence(fadeInTime)) using (fp.BeginAbsoluteSequence(fadeInTime))
{ {
fp.FadeIn(DrawableOsuHitObject.TIME_FADEIN); 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); fp.Delay(fadeOutTime - fadeInTime).FadeOut(DrawableOsuHitObject.TIME_FADEIN);
} }

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
number.FadeOut(); number.FadeOut();
this.FadeOut(800) this.FadeOut(800)
.ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad); .ScaleTo(Scale * 1.5f, 400, Easing.OutQuad);
} }
Expire(); Expire();

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected override void LoadComplete() protected override void LoadComplete()
{ {
if (Judgement.Result != HitResult.Miss) 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(); base.LoadComplete();
} }

6
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
d => d.FadeIn(animIn), d => d.FadeIn(animIn),
d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn) d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn)
).Then( ).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); .FadeColour(Color4.Red, 80);
break; break;
case ArmedState.Hit: case ArmedState.Hit:
this.FadeOut(120, EasingTypes.OutQuint) this.FadeOut(120, Easing.OutQuint)
.ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint); .ScaleTo(Scale * 1.5f, 120, Easing.OutQuint);
break; break;
} }
} }

14
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -174,9 +174,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
ticks.Rotation = disc.Rotation; ticks.Rotation = disc.Rotation;
float relativeCircleScale = spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight; 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() protected override void UpdatePreemptState()
@ -184,16 +184,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.UpdatePreemptState(); base.UpdatePreemptState();
circleContainer.ScaleTo(spinner.Scale * 0.3f); 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); disc.RotateTo(-720);
symbol.RotateTo(-720); symbol.RotateTo(-720);
mainContainer mainContainer
.ScaleTo(0) .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() .Then()
.ScaleTo(1, 500, EasingTypes.OutQuint); .ScaleTo(1, 500, Easing.OutQuint);
} }
protected override void UpdateCurrentState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)
@ -203,10 +203,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
switch (state) switch (state)
{ {
case ArmedState.Hit: case ArmedState.Hit:
sequence.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out); sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out);
break; break;
case ArmedState.Miss: case ArmedState.Miss:
sequence.ScaleTo(Scale * 0.8f, 320, EasingTypes.In); sequence.ScaleTo(Scale * 0.8f, 320, Easing.In);
break; break;
} }

4
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
View File

@ -106,8 +106,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
tracking = value; tracking = value;
follow.ScaleTo(tracking ? 2.8f : 1, 300, EasingTypes.OutQuint); follow.ScaleTo(tracking ? 2.8f : 1, 300, Easing.OutQuint);
follow.FadeTo(tracking ? 0.2f : 0, 300, EasingTypes.OutQuint); follow.FadeTo(tracking ? 0.2f : 0, 300, Easing.OutQuint);
} }
} }

6
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -128,12 +128,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{ {
background.FinishTransforms(false, nameof(Alpha)); background.FinishTransforms(false, nameof(Alpha));
background background
.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo) .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
.Then() .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);
} }
} }
} }

8
osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Replays
/// <summary> /// <summary>
/// What easing to use when moving between hitobjects /// What easing to use when moving between hitobjects
/// </summary> /// </summary>
private EasingTypes preferredEasing => DelayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out; private Easing preferredEasing => DelayedMovements ? Easing.InOutCubic : Easing.Out;
#endregion #endregion
@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Replays
{ {
// Default values for circles/sliders // Default values for circles/sliders
Vector2 startPosition = h.StackedPosition; Vector2 startPosition = h.StackedPosition;
EasingTypes easing = preferredEasing; Easing easing = preferredEasing;
float spinnerDirection = -1; 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 // 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 (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. // 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]; ReplayFrame lastFrame = Frames[Frames.Count - 1];

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
switch (state) switch (state)
{ {
case ArmedState.Hit: case ArmedState.Hit:
Content.ScaleTo(0, 100, EasingTypes.OutQuint); Content.ScaleTo(0, 100, Easing.OutQuint);
break; break;
} }
} }

6
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -90,12 +90,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
const float gravity_time = 300; const float gravity_time = 300;
const float gravity_travel_height = 200; 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) this.FadeOut(800)
.MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out) .MoveToY(-gravity_travel_height, gravity_time, Easing.Out)
.Then() .Then()
.MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In); .MoveToY(gravity_travel_height * 2, gravity_time * 2, Easing.In);
Expire(); Expire();
break; break;

10
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -150,11 +150,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
expandingRing expandingRing
.FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50) .FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50)
.Then() .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) if (userHits == HitObject.RequiredHits)
{ {
@ -186,8 +186,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
double untilStartTime = HitObject.StartTime - Time.Current; double untilStartTime = HitObject.StartTime - Time.Current;
double untilJudgement = untilStartTime + Judgement.TimeOffset + HitObject.Duration; double untilJudgement = untilStartTime + Judgement.TimeOffset + HitObject.Duration;
targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint); targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, Easing.OutQuint);
this.Delay(untilJudgement).FadeOut(out_transition_time, EasingTypes.Out); this.Delay(untilJudgement).FadeOut(out_transition_time, Easing.Out);
switch (state) switch (state)
{ {

4
osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -167,9 +167,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
double duration = timingPoint.BeatLength * 2; double duration = timingPoint.BeatLength * 2;
background background
.FadeEdgeEffectTo(1, pre_beat_transition_time, EasingTypes.OutQuint) .FadeEdgeEffectTo(1, pre_beat_transition_time, Easing.OutQuint)
.Then() .Then()
.FadeEdgeEffectTo(edge_alpha_kiai, duration, EasingTypes.OutQuint); .FadeEdgeEffectTo(edge_alpha_kiai, duration, Easing.OutQuint);
} }
} }
} }

2
osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
View File

@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.UI
{ {
base.LoadComplete(); base.LoadComplete();
this.ScaleTo(3f, 1000, EasingTypes.OutQuint); this.ScaleTo(3f, 1000, Easing.OutQuint);
this.FadeOut(500); this.FadeOut(500);
Expire(); Expire();

12
osu.Game.Rulesets.Taiko/UI/InputDrum.cs
View File

@ -149,16 +149,16 @@ namespace osu.Game.Rulesets.Taiko.UI
const float down_time = 40; const float down_time = 40;
const float up_time = 1000; 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() .Then()
.ScaleTo(1, up_time, EasingTypes.OutQuint); .ScaleTo(1, up_time, Easing.OutQuint);
target.Animate( target.Animate(
t => t.ScaleTo(target.Scale.X - scale_amount, 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, EasingTypes.OutQuint) t => t.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, Easing.OutQuint)
).Then( ).Then(
t => t.ScaleTo(1, up_time, EasingTypes.OutQuint), t => t.ScaleTo(1, up_time, Easing.OutQuint),
t => t.FadeOut(up_time, EasingTypes.OutQuint) t => t.FadeOut(up_time, Easing.OutQuint)
); );
} }

2
osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Taiko.UI
{ {
base.LoadComplete(); base.LoadComplete();
this.ScaleTo(new Vector2(1, 3f), 500, EasingTypes.OutQuint); this.ScaleTo(new Vector2(1, 3f), 500, Easing.OutQuint);
this.FadeOut(250); this.FadeOut(250);
Expire(); Expire();

2
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps.Drawables
new PanelBackground(beatmap) new PanelBackground(beatmap)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
} }
) )
{ {

2
osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps.Drawables
} }
if (state == PanelSelectedState.Hidden) if (state == PanelSelectedState.Hidden)
this.FadeOut(300, EasingTypes.OutQuint); this.FadeOut(300, Easing.OutQuint);
else else
this.FadeIn(250); this.FadeIn(250);
} }

4
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Graphics.Containers
{ {
if (!parallaxEnabled) 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); content.Scale = new Vector2(1 + ParallaxAmount);
} }
}; };
@ -57,7 +57,7 @@ namespace osu.Game.Graphics.Containers
if (parallaxEnabled) if (parallaxEnabled)
{ {
Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2; 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); content.Scale = new Vector2(1 + ParallaxAmount);
} }

4
osu.Game/Graphics/Cursor/GameplayCursor.cs
View File

@ -29,14 +29,14 @@ namespace osu.Game.Graphics.Cursor
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{ {
ActiveCursor.Scale = new Vector2(1); ActiveCursor.Scale = new Vector2(1);
ActiveCursor.ScaleTo(1.2f, 100, EasingTypes.OutQuad); ActiveCursor.ScaleTo(1.2f, 100, Easing.OutQuad);
return base.OnMouseDown(state, args); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
if (!state.Mouse.HasMainButtonPressed) if (!state.Mouse.HasMainButtonPressed)
ActiveCursor.ScaleTo(1, 200, EasingTypes.OutQuad); ActiveCursor.ScaleTo(1, 200, Easing.OutQuad);
return base.OnMouseUp(state, args); return base.OnMouseUp(state, args);
} }

22
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Graphics.Cursor
if (diff > 180) diff -= 360; if (diff > 180) diff -= 360;
degrees = ActiveCursor.Rotation + diff; degrees = ActiveCursor.Rotation + diff;
ActiveCursor.RotateTo(degrees, 600, EasingTypes.OutQuint); ActiveCursor.RotateTo(degrees, 600, Easing.OutQuint);
} }
return base.OnMouseMove(state); return base.OnMouseMove(state);
@ -49,10 +49,10 @@ namespace osu.Game.Graphics.Cursor
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{ {
ActiveCursor.Scale = new Vector2(1); 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.Alpha = 0;
((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero(800, EasingTypes.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
return base.OnMouseDown(state, args); return base.OnMouseDown(state, args);
} }
@ -62,9 +62,9 @@ namespace osu.Game.Graphics.Cursor
{ {
dragging = false; dragging = false;
((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, Easing.OutQuint);
ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), EasingTypes.OutElasticHalf); ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), Easing.OutElasticHalf);
ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic); ActiveCursor.ScaleTo(1, 500, Easing.OutElastic);
} }
return base.OnMouseUp(state, args); return base.OnMouseUp(state, args);
@ -72,21 +72,21 @@ namespace osu.Game.Graphics.Cursor
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne(500, EasingTypes.OutQuint); ((Cursor)ActiveCursor).AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
return base.OnClick(state); return base.OnClick(state);
} }
protected override void PopIn() protected override void PopIn()
{ {
ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint); ActiveCursor.FadeTo(1, 250, Easing.OutQuint);
ActiveCursor.ScaleTo(1, 400, EasingTypes.OutQuint); ActiveCursor.ScaleTo(1, 400, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
ActiveCursor.FadeTo(0, 900, EasingTypes.OutQuint); ActiveCursor.FadeTo(0, 900, Easing.OutQuint);
ActiveCursor.ScaleTo(0, 500, EasingTypes.In); ActiveCursor.ScaleTo(0, 500, Easing.In);
} }
public class Cursor : Container public class Cursor : Container

10
osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Graphics.Cursor
if (IsPresent) if (IsPresent)
{ {
AutoSizeDuration = 250; AutoSizeDuration = 250;
background.FlashColour(OsuColour.Gray(0.4f), 1000, EasingTypes.OutQuint); background.FlashColour(OsuColour.Gray(0.4f), 1000, Easing.OutQuint);
} }
else else
AutoSizeDuration = 0; AutoSizeDuration = 0;
@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Cursor
public OsuTooltip() public OsuTooltip()
{ {
AutoSizeEasing = EasingTypes.OutQuint; AutoSizeEasing = Easing.OutQuint;
CornerRadius = 5; CornerRadius = 5;
Masking = true; Masking = true;
@ -83,10 +83,10 @@ namespace osu.Game.Graphics.Cursor
protected override void PopIn() protected override void PopIn()
{ {
instantMovement |= !IsPresent; 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) public override void Move(Vector2 pos)
{ {
@ -97,7 +97,7 @@ namespace osu.Game.Graphics.Cursor
} }
else else
{ {
this.MoveTo(pos, 200, EasingTypes.OutQuint); this.MoveTo(pos, 200, Easing.OutQuint);
} }
} }
} }

2
osu.Game/Graphics/IHasAccentColour.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Graphics
/// <param name="newColour">The new accent colour.</param> /// <param name="newColour">The new accent colour.</param>
/// <param name="duration">The tween duration.</param> /// <param name="duration">The tween duration.</param>
/// <param name="easing">The tween easing.</param> /// <param name="easing">The tween easing.</param>
public static TransformSequence<T> FadeAccent<T>(this T accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None) public static TransformSequence<T> FadeAccent<T>(this T accentedDrawable, Color4 newColour, double duration = 0, Easing easing = Easing.None)
where T : IHasAccentColour where T : IHasAccentColour
=> accentedDrawable.TransformTo(nameof(accentedDrawable.AccentColour), newColour, duration, easing); => accentedDrawable.TransformTo(nameof(accentedDrawable.AccentColour), newColour, duration, easing);
} }

2
osu.Game/Graphics/UserInterface/Bar.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
private const int resize_duration = 250; private const int resize_duration = 250;
private const EasingTypes easing = EasingTypes.InOutCubic; private const Easing easing = Easing.InOutCubic;
private float length; private float length;
/// <summary> /// <summary>

10
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface
var tabIndex = TabContainer.IndexOf(TabMap[tab]); var tabIndex = TabContainer.IndexOf(TabMap[tab]);
t.State = tIndex < tabIndex ? Visibility.Hidden : Visibility.Visible; 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) if (State == Visibility.Visible)
{ {
this.FadeIn(transition_duration, EasingTypes.OutQuint); this.FadeIn(transition_duration, Easing.OutQuint);
this.ScaleTo(new Vector2(1f), transition_duration, EasingTypes.OutQuint); this.ScaleTo(new Vector2(1f), transition_duration, Easing.OutQuint);
} }
else else
{ {
this.FadeOut(transition_duration, EasingTypes.OutQuint); this.FadeOut(transition_duration, Easing.OutQuint);
this.ScaleTo(new Vector2(0.8f, 1f), transition_duration, EasingTypes.OutQuint); this.ScaleTo(new Vector2(0.8f, 1f), transition_duration, Easing.OutQuint);
} }
} }
} }

14
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnClick(Framework.Input.InputState state) protected override bool OnClick(Framework.Input.InputState state)
{ {
didClick = true; 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(); flash();
this.Delay(click_duration).Schedule(delegate { this.Delay(click_duration).Schedule(delegate {
@ -110,10 +110,10 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(Framework.Input.InputState state) 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); colourContainer.ResizeTo(new Vector2(hover_width, 1f), hover_duration, Easing.OutElastic);
glowContainer.FadeIn(glow_fade_duration, EasingTypes.Out); glowContainer.FadeIn(glow_fade_duration, Easing.Out);
base.OnHover(state); base.OnHover(state);
return true; return true;
} }
@ -122,9 +122,9 @@ namespace osu.Game.Graphics.UserInterface
{ {
if (!didClick) if (!didClick)
{ {
colourContainer.ResizeTo(new Vector2(0.8f, 1f), hover_duration, EasingTypes.OutElastic); colourContainer.ResizeTo(new Vector2(0.8f, 1f), hover_duration, Easing.OutElastic);
spriteText.TransformSpacingTo(Vector2.Zero, hover_duration, EasingTypes.OutElastic); spriteText.TransformSpacingTo(Vector2.Zero, hover_duration, Easing.OutElastic);
glowContainer.FadeOut(glow_fade_duration, EasingTypes.Out); glowContainer.FadeOut(glow_fade_duration, Easing.Out);
} }
didClick = false; didClick = false;

10
osu.Game/Graphics/UserInterface/IconButton.cs
View File

@ -84,31 +84,31 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
hover.FadeIn(500, EasingTypes.OutQuint); hover.FadeIn(500, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
hover.FadeOut(500, EasingTypes.OutQuint); hover.FadeOut(500, Easing.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(state);
} }
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
hover.FlashColour(flashColour, 800, EasingTypes.OutQuint); hover.FlashColour(flashColour, 800, Easing.OutQuint);
return base.OnClick(state); return base.OnClick(state);
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) 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); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs 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); return base.OnMouseUp(state, args);
} }
} }

2
osu.Game/Graphics/UserInterface/LineGraph.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Graphics.UserInterface
values = value.ToArray(); values = value.ToArray();
applyPath(); applyPath();
maskingContainer.Width = 0; maskingContainer.Width = 0;
maskingContainer.ResizeWidthTo(1, transform_duration, EasingTypes.OutQuint); maskingContainer.ResizeWidthTo(1, transform_duration, Easing.OutQuint);
} }
} }

4
osu.Game/Graphics/UserInterface/LoadingAnimation.cs
View File

@ -39,8 +39,8 @@ namespace osu.Game.Graphics.UserInterface
private const float transition_duration = 500; 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);
} }
} }

10
osu.Game/Graphics/UserInterface/Nub.cs
View File

@ -43,9 +43,9 @@ namespace osu.Game.Graphics.UserInterface
Current.ValueChanged += newValue => Current.ValueChanged += newValue =>
{ {
if (newValue) if (newValue)
fill.FadeIn(200, EasingTypes.OutQuint); fill.FadeIn(200, Easing.OutQuint);
else 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) if (value)
{ {
this.FadeColour(GlowingAccentColour, 500, EasingTypes.OutQuint); this.FadeColour(GlowingAccentColour, 500, Easing.OutQuint);
FadeEdgeEffectTo(1, 500, EasingTypes.OutQuint); FadeEdgeEffectTo(1, 500, Easing.OutQuint);
} }
else else
{ {
@ -95,7 +95,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
set 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);
} }
} }

4
osu.Game/Graphics/UserInterface/OsuButton.cs
View File

@ -91,13 +91,13 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) 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); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs 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); return base.OnMouseUp(state, args);
} }
} }

6
osu.Game/Graphics/UserInterface/OsuContextMenu.cs
View File

@ -39,13 +39,13 @@ namespace osu.Game.Graphics.UserInterface
Background.Colour = colours.ContextMenuGray; Background.Colour = colours.ContextMenuGray;
} }
protected override void AnimateOpen() => this.FadeIn(fade_duration, EasingTypes.OutQuint); protected override void AnimateOpen() => this.FadeIn(fade_duration, Easing.OutQuint);
protected override void AnimateClose() => this.FadeOut(fade_duration, EasingTypes.OutQuint); protected override void AnimateClose() => this.FadeOut(fade_duration, Easing.OutQuint);
protected override void UpdateContentHeight() protected override void UpdateContentHeight()
{ {
var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight; 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);
} }
} }
} }

8
osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
View File

@ -93,15 +93,15 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
sampleHover.Play(); sampleHover.Play();
textBold.FadeIn(transition_length, EasingTypes.OutQuint); textBold.FadeIn(transition_length, Easing.OutQuint);
text.FadeOut(transition_length, EasingTypes.OutQuint); text.FadeOut(transition_length, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
textBold.FadeOut(transition_length, EasingTypes.OutQuint); textBold.FadeOut(transition_length, Easing.OutQuint);
text.FadeIn(transition_length, EasingTypes.OutQuint); text.FadeIn(transition_length, Easing.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(state);
} }

6
osu.Game/Graphics/UserInterface/OsuMenu.cs
View File

@ -19,14 +19,14 @@ namespace osu.Game.Graphics.UserInterface
ItemsContainer.Padding = new MarginPadding(5); 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() protected override void UpdateContentHeight()
{ {
var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight; 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);
} }
} }
} }

4
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -47,8 +47,8 @@ namespace osu.Game.Graphics.UserInterface
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
circle.FadeIn(500, EasingTypes.OutQuint); circle.FadeIn(500, Easing.OutQuint);
circle.ResizeTo(new Vector2(0.8f), 500, EasingTypes.OutQuint); circle.ResizeTo(new Vector2(0.8f), 500, Easing.OutQuint);
} }
} }
} }

2
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -166,7 +166,7 @@ namespace osu.Game.Graphics.UserInterface
protected override void UpdateValue(float value) protected override void UpdateValue(float value)
{ {
Nub.MoveToX(RangePadding + UsableWidth * value, 250, EasingTypes.OutQuint); Nub.MoveToX(RangePadding + UsableWidth * value, 250, Easing.OutQuint);
} }
} }
} }

8
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -77,14 +77,14 @@ namespace osu.Game.Graphics.UserInterface
private void fadeActive() private void fadeActive()
{ {
box.FadeIn(transition_length, EasingTypes.OutQuint); box.FadeIn(transition_length, Easing.OutQuint);
Text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint); Text.FadeColour(Color4.White, transition_length, Easing.OutQuint);
} }
private void fadeInactive() private void fadeInactive()
{ {
box.FadeOut(transition_length, EasingTypes.OutQuint); box.FadeOut(transition_length, Easing.OutQuint);
Text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint); Text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
} }
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)

8
osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
View File

@ -49,14 +49,14 @@ namespace osu.Game.Graphics.UserInterface
private void fadeIn() private void fadeIn()
{ {
box.FadeIn(transition_length, EasingTypes.OutQuint); box.FadeIn(transition_length, Easing.OutQuint);
text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint); text.FadeColour(Color4.White, transition_length, Easing.OutQuint);
} }
private void fadeOut() private void fadeOut()
{ {
box.FadeOut(transition_length, EasingTypes.OutQuint); box.FadeOut(transition_length, Easing.OutQuint);
text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint); text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
} }
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)

2
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface
/// <summary> /// <summary>
/// Easing for the counter rollover animation. /// Easing for the counter rollover animation.
/// </summary> /// </summary>
protected virtual EasingTypes RollingEasing => EasingTypes.OutQuint; protected virtual Easing RollingEasing => Easing.OutQuint;
private T displayedCount; private T displayedCount;

2
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Graphics.UserInterface
public class ScoreCounter : RollingCounter<double> public class ScoreCounter : RollingCounter<double>
{ {
protected override double RollingDuration => 1000; protected override double RollingDuration => 1000;
protected override EasingTypes RollingEasing => EasingTypes.Out; protected override Easing RollingEasing => Easing.Out;
public bool UseCommaSeparator; public bool UseCommaSeparator;

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
private double animationDelay => 80; private double animationDelay => 80;
private double scalingDuration => 1000; private double scalingDuration => 1000;
private EasingTypes scalingEasing => EasingTypes.OutElasticHalf; private Easing scalingEasing => Easing.OutElasticHalf;
private float minStarScale => 0.4f; private float minStarScale => 0.4f;
private double fadingDuration => 100; private double fadingDuration => 100;

18
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -173,20 +173,20 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
this.ResizeTo(SIZE_EXTENDED, transform_time, EasingTypes.OutElastic); this.ResizeTo(SIZE_EXTENDED, transform_time, Easing.OutElastic);
IconLayer.FadeColour(HoverColour, transform_time, EasingTypes.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; return true;
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
this.ResizeTo(SIZE_RETRACTED, transform_time, EasingTypes.OutElastic); this.ResizeTo(SIZE_RETRACTED, transform_time, Easing.OutElastic);
IconLayer.FadeColour(TextLayer.Colour, transform_time, EasingTypes.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) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -205,7 +205,7 @@ namespace osu.Game.Graphics.UserInterface
Add(flash); Add(flash);
flash.Alpha = 1; flash.Alpha = 1;
flash.FadeOut(500, EasingTypes.OutQuint); flash.FadeOut(500, Easing.OutQuint);
flash.Expire(); flash.Expire();
return base.OnClick(state); return base.OnClick(state);
@ -245,9 +245,9 @@ namespace osu.Game.Graphics.UserInterface
if (beatIndex < 0) return; 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() .Then()
.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint); .ScaleTo(1, beatLength * 2, Easing.OutQuint);
} }
} }
} }

2
osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
View File

@ -82,6 +82,6 @@ namespace osu.Game.Graphics.UserInterface.Volume
return true; 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);
} }
} }

4
osu.Game/OsuGame.cs
View File

@ -234,10 +234,10 @@ namespace osu.Game
switch (settings.State) switch (settings.State)
{ {
case Visibility.Hidden: case Visibility.Hidden:
intro.MoveToX(0, SettingsOverlay.TRANSITION_LENGTH, EasingTypes.OutQuint); intro.MoveToX(0, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
break; break;
case Visibility.Visible: 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; break;
} }
}; };

2
osu.Game/Overlays/Chat/ChannelListItem.cs
View File

@ -156,7 +156,7 @@ namespace osu.Game.Overlays.Chat
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
if (!channel.Joined.Value) if (!channel.Joined.Value)
name.FadeColour(hoverColour, 50, EasingTypes.OutQuint); name.FadeColour(hoverColour, 50, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(state);
} }

10
osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Chat
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
LayoutDuration = 200, LayoutDuration = 200,
LayoutEasing = EasingTypes.OutQuint, LayoutEasing = Easing.OutQuint,
Spacing = new Vector2(0f, 20f), Spacing = new Vector2(0f, 20f),
Padding = new MarginPadding { Vertical = 20, Left = WIDTH_PADDING }, Padding = new MarginPadding { Vertical = 20, Left = WIDTH_PADDING },
}, },
@ -160,8 +160,8 @@ namespace osu.Game.Overlays.Chat
{ {
if (Alpha == 0) this.MoveToY(DrawHeight); if (Alpha == 0) this.MoveToY(DrawHeight);
this.FadeIn(transition_duration, EasingTypes.OutQuint); this.FadeIn(transition_duration, Easing.OutQuint);
this.MoveToY(0, transition_duration, EasingTypes.OutQuint); this.MoveToY(0, transition_duration, Easing.OutQuint);
search.HoldFocus = true; search.HoldFocus = true;
base.PopIn(); base.PopIn();
@ -169,8 +169,8 @@ namespace osu.Game.Overlays.Chat
protected override void PopOut() protected override void PopOut()
{ {
this.FadeOut(transition_duration, EasingTypes.InSine); this.FadeOut(transition_duration, Easing.InSine);
this.MoveToY(DrawHeight, transition_duration, EasingTypes.InSine); this.MoveToY(DrawHeight, transition_duration, Easing.InSine);
search.HoldFocus = false; search.HoldFocus = false;
base.PopOut(); base.PopOut();

22
osu.Game/Overlays/Chat/ChatTabControl.cs
View File

@ -86,30 +86,30 @@ namespace osu.Game.Overlays.Chat
private void fadeActive() 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); box.FadeColour(backgroundActive, transition_length, Easing.OutQuint);
highlightBox.FadeIn(transition_length, EasingTypes.OutQuint); highlightBox.FadeIn(transition_length, Easing.OutQuint);
text.FadeOut(transition_length, EasingTypes.OutQuint); text.FadeOut(transition_length, Easing.OutQuint);
textBold.FadeIn(transition_length, EasingTypes.OutQuint); textBold.FadeIn(transition_length, Easing.OutQuint);
} }
private void fadeInactive() 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); box.FadeColour(backgroundInactive, transition_length, Easing.OutQuint);
highlightBox.FadeOut(transition_length, EasingTypes.OutQuint); highlightBox.FadeOut(transition_length, Easing.OutQuint);
text.FadeIn(transition_length, EasingTypes.OutQuint); text.FadeIn(transition_length, Easing.OutQuint);
textBold.FadeOut(transition_length, EasingTypes.OutQuint); textBold.FadeOut(transition_length, Easing.OutQuint);
} }
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
if (!Active) if (!Active)
box.FadeColour(backgroundHover, transition_length, EasingTypes.OutQuint); box.FadeColour(backgroundHover, transition_length, Easing.OutQuint);
return true; return true;
} }

16
osu.Game/Overlays/ChatOverlay.cs
View File

@ -177,8 +177,8 @@ namespace osu.Game.Overlays
inputTextBox.HoldFocus = false; inputTextBox.HoldFocus = false;
if (1f - chatHeight.Value < channel_selection_min_height) if (1f - chatHeight.Value < channel_selection_min_height)
{ {
chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, EasingTypes.OutQuint); chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, Easing.OutQuint);
channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, EasingTypes.OutQuint); channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, Easing.OutQuint);
channelSelection.Show(); channelSelection.Show();
chatHeight.Value = 1f - channel_selection_min_height; chatHeight.Value = 1f - channel_selection_min_height;
} }
@ -235,8 +235,8 @@ namespace osu.Game.Overlays
protected override void PopIn() protected override void PopIn()
{ {
this.MoveToY(0, transition_length, EasingTypes.OutQuint); this.MoveToY(0, transition_length, Easing.OutQuint);
this.FadeIn(transition_length, EasingTypes.OutQuint); this.FadeIn(transition_length, Easing.OutQuint);
inputTextBox.HoldFocus = true; inputTextBox.HoldFocus = true;
base.PopIn(); base.PopIn();
@ -244,8 +244,8 @@ namespace osu.Game.Overlays
protected override void PopOut() protected override void PopOut()
{ {
this.MoveToY(Height, transition_length, EasingTypes.InSine); this.MoveToY(Height, transition_length, Easing.InSine);
this.FadeOut(transition_length, EasingTypes.InSine); this.FadeOut(transition_length, Easing.InSine);
inputTextBox.HoldFocus = false; inputTextBox.HoldFocus = false;
base.PopOut(); base.PopOut();
@ -328,7 +328,7 @@ namespace osu.Game.Overlays
var loaded = loadedChannels.Find(d => d.Channel == value); var loaded = loadedChannels.Find(d => d.Channel == value);
if (loaded == null) if (loaded == null)
{ {
currentChannelContainer.FadeOut(500, EasingTypes.OutQuint); currentChannelContainer.FadeOut(500, Easing.OutQuint);
loading.Show(); loading.Show();
loaded = new DrawableChannel(currentChannel); loaded = new DrawableChannel(currentChannel);
@ -340,7 +340,7 @@ namespace osu.Game.Overlays
currentChannelContainer.Clear(false); currentChannelContainer.Clear(false);
currentChannelContainer.Add(loaded); currentChannelContainer.Add(loaded);
currentChannelContainer.FadeIn(500, EasingTypes.OutQuint); currentChannelContainer.FadeIn(500, Easing.OutQuint);
}); });
} }
else else

10
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -115,17 +115,17 @@ namespace osu.Game.Overlays.Dialog
ring.ResizeTo(ringMinifiedSize); ring.ResizeTo(ringMinifiedSize);
} }
content.FadeIn(ENTER_DURATION, EasingTypes.OutQuint); content.FadeIn(ENTER_DURATION, Easing.OutQuint);
ring.ResizeTo(ringSize, ENTER_DURATION, EasingTypes.OutQuint); ring.ResizeTo(ringSize, ENTER_DURATION, Easing.OutQuint);
buttonsContainer.TransformSpacingTo(Vector2.Zero, ENTER_DURATION, EasingTypes.OutQuint); buttonsContainer.TransformSpacingTo(Vector2.Zero, ENTER_DURATION, Easing.OutQuint);
buttonsContainer.MoveToY(0, ENTER_DURATION, EasingTypes.OutQuint); buttonsContainer.MoveToY(0, ENTER_DURATION, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
content.FadeOut(EXIT_DURATION, EasingTypes.InSine); content.FadeOut(EXIT_DURATION, Easing.InSine);
} }
public PopupDialog() public PopupDialog()

4
osu.Game/Overlays/DialogOverlay.cs
View File

@ -44,13 +44,13 @@ namespace osu.Game.Overlays
protected override void PopIn() protected override void PopIn()
{ {
base.PopIn(); base.PopIn();
this.FadeIn(PopupDialog.ENTER_DURATION, EasingTypes.OutQuint); this.FadeIn(PopupDialog.ENTER_DURATION, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
this.FadeOut(PopupDialog.EXIT_DURATION, EasingTypes.InSine); this.FadeOut(PopupDialog.EXIT_DURATION, Easing.InSine);
} }
public DialogOverlay() public DialogOverlay()

4
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -41,9 +41,9 @@ namespace osu.Game.Overlays.Direct
{ {
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(200, EasingTypes.Out); this.FadeInFromZero(200, Easing.Out);
bottomPanel.LayoutDuration = 200; bottomPanel.LayoutDuration = 200;
bottomPanel.LayoutEasing = EasingTypes.Out; bottomPanel.LayoutEasing = Easing.Out;
bottomPanel.Origin = Anchor.BottomLeft; bottomPanel.Origin = Anchor.BottomLeft;
} }

10
osu.Game/Overlays/Direct/DirectListPanel.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Direct
{ {
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(200, EasingTypes.Out); this.FadeInFromZero(200, Easing.Out);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -171,25 +171,25 @@ namespace osu.Game.Overlays.Direct
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) 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); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs 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); return base.OnMouseUp(state, args);
} }
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
icon.ScaleTo(1.1f, 500, EasingTypes.OutElastic); icon.ScaleTo(1.1f, 500, Easing.OutElastic);
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
icon.ScaleTo(1f, 500, EasingTypes.OutElastic); icon.ScaleTo(1f, 500, Easing.OutElastic);
} }
} }
} }

2
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Direct
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}) })
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,

2
osu.Game/Overlays/DirectOverlay.cs
View File

@ -169,7 +169,7 @@ namespace osu.Game.Overlays
private void updateResultCounts() 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; if (ResultAmounts == null) return;
resultCountsText.Text = pluralize("Artist", ResultAmounts.Artists) + ", " + resultCountsText.Text = pluralize("Artist", ResultAmounts.Artists) + ", " +

4
osu.Game/Overlays/LoginOverlay.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Overlays
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Masking = true, Masking = true,
AutoSizeDuration = transition_time, AutoSizeDuration = transition_time,
AutoSizeEasing = EasingTypes.OutQuint, AutoSizeEasing = Easing.OutQuint,
Children = new Drawable[] Children = new Drawable[]
{ {
settingsSection = new LoginSettings settingsSection = new LoginSettings
@ -67,7 +67,7 @@ namespace osu.Game.Overlays
base.PopIn(); base.PopIn();
settingsSection.Bounding = true; settingsSection.Bounding = true;
this.FadeIn(transition_time, EasingTypes.OutQuint); this.FadeIn(transition_time, Easing.OutQuint);
InputManager.ChangeFocus(settingsSection); InputManager.ChangeFocus(settingsSection);
} }

6
osu.Game/Overlays/MedalOverlay.cs
View File

@ -205,7 +205,7 @@ namespace osu.Game.Overlays
using (BeginDelayedSequence(200, true)) using (BeginDelayedSequence(200, true))
{ {
disc.FadeIn(initial_duration) disc.FadeIn(initial_duration)
.ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic); .ScaleTo(1f, initial_duration * 2, Easing.OutElastic);
particleContainer.FadeIn(initial_duration); particleContainer.FadeIn(initial_duration);
outerSpin.FadeTo(0.1f, initial_duration * 2); outerSpin.FadeTo(0.1f, initial_duration * 2);
@ -213,8 +213,8 @@ namespace osu.Game.Overlays
using (BeginDelayedSequence(initial_duration + 200, true)) using (BeginDelayedSequence(initial_duration + 200, true))
{ {
backgroundStrip.FadeIn(step_duration); backgroundStrip.FadeIn(step_duration);
leftStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint); leftStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint);
rightStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint); rightStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint);
this.Animate().Schedule(() => this.Animate().Schedule(() =>
{ {

10
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -149,15 +149,15 @@ namespace osu.Game.Overlays.MedalSplash
case DisplayState.Icon: case DisplayState.Icon:
medalContainer medalContainer
.FadeIn(duration) .FadeIn(duration)
.ScaleTo(1, duration, EasingTypes.OutElastic); .ScaleTo(1, duration, Easing.OutElastic);
break; break;
case DisplayState.MedalUnlocked: case DisplayState.MedalUnlocked:
medalContainer medalContainer
.FadeTo(1) .FadeTo(1)
.ScaleTo(1); .ScaleTo(1);
this.ScaleTo(scale_when_unlocked, duration, EasingTypes.OutExpo); this.ScaleTo(scale_when_unlocked, duration, Easing.OutExpo);
this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 30, duration, EasingTypes.OutExpo); this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 30, duration, Easing.OutExpo);
unlocked.FadeInFromZero(duration); unlocked.FadeInFromZero(duration);
break; break;
case DisplayState.Full: case DisplayState.Full:
@ -165,8 +165,8 @@ namespace osu.Game.Overlays.MedalSplash
.FadeTo(1) .FadeTo(1)
.ScaleTo(1); .ScaleTo(1);
this.ScaleTo(scale_when_full, duration, EasingTypes.OutExpo); this.ScaleTo(scale_when_full, duration, Easing.OutExpo);
this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 60, duration, EasingTypes.OutExpo); this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 60, duration, Easing.OutExpo);
name.FadeInFromZero(duration + 100); name.FadeInFromZero(duration + 100);
description.FadeInFromZero(duration * 2); description.FadeInFromZero(duration * 2);
break; break;

6
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Mods
public string TooltipText => (SelectedMod?.Description ?? Mods.FirstOrDefault()?.Description) ?? string.Empty; 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; private const double mod_switch_duration = 120;
// A selected index of -1 means not selected. // A selected index of -1 means not selected.
@ -67,8 +67,8 @@ namespace osu.Game.Overlays.Mods
if (beforeSelected != Selected) if (beforeSelected != Selected)
{ {
iconsContainer.RotateTo(Selected ? 5f : 0f, 300, EasingTypes.OutElastic); iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic); iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
} }
if (modBefore != modAfter) if (modBefore != modAfter)

20
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -66,14 +66,14 @@ namespace osu.Game.Overlays.Mods
{ {
base.PopOut(); base.PopOut();
rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, EasingTypes.InSine); rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, Easing.InSine);
rankedMultiplerContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); rankedMultiplerContainer.FadeOut(APPEAR_DURATION, Easing.InSine);
foreach (ModSection section in modSectionsContainer.Children) foreach (ModSection section in modSectionsContainer.Children)
{ {
section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, EasingTypes.InSine); section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, Easing.InSine);
section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, EasingTypes.InSine); section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, Easing.InSine);
section.ButtonsContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine); section.ButtonsContainer.FadeOut(APPEAR_DURATION, Easing.InSine);
} }
} }
@ -81,14 +81,14 @@ namespace osu.Game.Overlays.Mods
{ {
base.PopIn(); base.PopIn();
rankedMultiplerContainer.MoveToX(0, ranked_multiplier_duration, EasingTypes.OutQuint); rankedMultiplerContainer.MoveToX(0, ranked_multiplier_duration, Easing.OutQuint);
rankedMultiplerContainer.FadeIn(ranked_multiplier_duration, EasingTypes.OutQuint); rankedMultiplerContainer.FadeIn(ranked_multiplier_duration, Easing.OutQuint);
foreach (ModSection section in modSectionsContainer.Children) foreach (ModSection section in modSectionsContainer.Children)
{ {
section.ButtonsContainer.TransformSpacingTo(new Vector2(50f, 0f), button_duration, EasingTypes.OutQuint); section.ButtonsContainer.TransformSpacingTo(new Vector2(50f, 0f), button_duration, Easing.OutQuint);
section.ButtonsContainer.MoveToX(0, button_duration, EasingTypes.OutQuint); section.ButtonsContainer.MoveToX(0, button_duration, Easing.OutQuint);
section.ButtonsContainer.FadeIn(button_duration, EasingTypes.OutQuint); section.ButtonsContainer.FadeIn(button_duration, Easing.OutQuint);
} }
} }

2
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Music
public ItemSearchContainer() public ItemSearchContainer()
{ {
LayoutDuration = 200; LayoutDuration = 200;
LayoutEasing = EasingTypes.OutQuint; LayoutEasing = Easing.OutQuint;
} }
} }
} }

6
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -101,15 +101,15 @@ namespace osu.Game.Overlays.Music
filter.Search.HoldFocus = true; filter.Search.HoldFocus = true;
Schedule(() => inputManager.ChangeFocus(filter.Search)); Schedule(() => inputManager.ChangeFocus(filter.Search));
this.ResizeTo(new Vector2(1, playlist_height), transition_duration, EasingTypes.OutQuint); this.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint);
this.FadeIn(transition_duration, EasingTypes.OutQuint); this.FadeIn(transition_duration, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
filter.Search.HoldFocus = false; 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); this.FadeOut(transition_duration);
} }

20
osu.Game/Overlays/MusicController.cs
View File

@ -82,7 +82,7 @@ namespace osu.Game.Overlays
protected override bool OnDragEnd(InputState state) protected override bool OnDragEnd(InputState state)
{ {
dragContainer.MoveTo(Vector2.Zero, 800, EasingTypes.OutElastic); dragContainer.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
return base.OnDragEnd(state); return base.OnDragEnd(state);
} }
@ -204,7 +204,7 @@ namespace osu.Game.Overlays
beatmapBacking.BindTo(game.Beatmap); 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() protected override void LoadComplete()
@ -345,13 +345,13 @@ namespace osu.Game.Overlays
{ {
case TransformDirection.Next: case TransformDirection.Next:
d.Position = new Vector2(400, 0); d.Position = new Vector2(400, 0);
d.MoveToX(0, 500, EasingTypes.OutCubic); d.MoveToX(0, 500, Easing.OutCubic);
currentBackground.MoveToX(-400, 500, EasingTypes.OutCubic); currentBackground.MoveToX(-400, 500, Easing.OutCubic);
break; break;
case TransformDirection.Prev: case TransformDirection.Prev:
d.Position = new Vector2(-400, 0); d.Position = new Vector2(-400, 0);
d.MoveToX(0, 500, EasingTypes.OutCubic); d.MoveToX(0, 500, Easing.OutCubic);
currentBackground.MoveToX(400, 500, EasingTypes.OutCubic); currentBackground.MoveToX(400, 500, Easing.OutCubic);
break; break;
} }
currentBackground.Expire(); currentBackground.Expire();
@ -368,16 +368,16 @@ namespace osu.Game.Overlays
{ {
base.PopIn(); base.PopIn();
this.FadeIn(transition_length, EasingTypes.OutQuint); this.FadeIn(transition_length, Easing.OutQuint);
dragContainer.ScaleTo(1, transition_length, EasingTypes.OutElastic); dragContainer.ScaleTo(1, transition_length, Easing.OutElastic);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
this.FadeOut(transition_length, EasingTypes.OutQuint); this.FadeOut(transition_length, Easing.OutQuint);
dragContainer.ScaleTo(0.9f, transition_length, EasingTypes.OutQuint); dragContainer.ScaleTo(0.9f, transition_length, Easing.OutQuint);
} }
private enum TransformDirection private enum TransformDirection

6
osu.Game/Overlays/NotificationManager.cs
View File

@ -89,8 +89,8 @@ namespace osu.Game.Overlays
{ {
base.PopIn(); base.PopIn();
scrollContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); scrollContainer.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
this.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(1, TRANSITION_LENGTH / 2); this.FadeTo(1, TRANSITION_LENGTH / 2);
} }
@ -105,7 +105,7 @@ namespace osu.Game.Overlays
markAllRead(); markAllRead();
this.MoveToX(width, TRANSITION_LENGTH, EasingTypes.OutQuint); this.MoveToX(width, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(0, TRANSITION_LENGTH / 2); this.FadeTo(0, TRANSITION_LENGTH / 2);
} }
} }

4
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Notifications
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(200); this.FadeInFromZero(200);
NotificationContent.MoveToX(DrawSize.X); NotificationContent.MoveToX(DrawSize.X);
NotificationContent.MoveToX(0, 500, EasingTypes.OutQuint); NotificationContent.MoveToX(0, 500, Easing.OutQuint);
} }
private bool wasClosed; private bool wasClosed;
@ -213,7 +213,7 @@ namespace osu.Game.Overlays.Notifications
{ {
const float length = 1000; const float length = 1000;
pulsateLayer.Loop(length / 2, 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)
); );
} }
} }

2
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Notifications
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
LayoutDuration = 150, LayoutDuration = 150,
LayoutEasing = EasingTypes.OutQuart, LayoutEasing = Easing.OutQuart,
Spacing = new Vector2(3), Spacing = new Vector2(3),
} }
}); });

4
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Notifications
switch (state) switch (state)
{ {
case ProgressNotificationState.Completed: 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()); this.FadeOut(200).Finally(d => Completed());
break; break;
} }
@ -181,7 +181,7 @@ namespace osu.Game.Overlays.Notifications
if (progress == value) return; if (progress == value) return;
progress = value; progress = value;
box.ResizeTo(new Vector2(progress, 1), 100, EasingTypes.OutQuad); box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
} }
} }

16
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -155,11 +155,11 @@ namespace osu.Game.Overlays
textLine3.Text = shortcut.ToUpper(); textLine3.Text = shortcut.ToUpper();
box.Animate( box.Animate(
b => b.FadeIn(500, EasingTypes.OutQuint), b => b.FadeIn(500, Easing.OutQuint),
b => b.ResizeHeightTo(height, 500, EasingTypes.OutQuint) b => b.ResizeHeightTo(height, 500, Easing.OutQuint)
).Then( ).Then(
b => b.FadeOutFromOne(1500, EasingTypes.InQuint), b => b.FadeOutFromOne(1500, Easing.InQuint),
b => b.ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint) b => b.ResizeHeightTo(height_contracted, 1500, Easing.InQuint)
); );
int optionCount = 0; int optionCount = 0;
@ -231,13 +231,13 @@ namespace osu.Game.Overlays
{ {
if (glowing) if (glowing)
{ {
fill.FadeColour(glowingColour, transition_speed, EasingTypes.OutQuint); fill.FadeColour(glowingColour, transition_speed, Easing.OutQuint);
FadeEdgeEffectTo(glow_strength, transition_speed, EasingTypes.OutQuint); FadeEdgeEffectTo(glow_strength, transition_speed, Easing.OutQuint);
} }
else else
{ {
FadeEdgeEffectTo(0, transition_speed, EasingTypes.OutQuint); FadeEdgeEffectTo(0, transition_speed, Easing.OutQuint);
fill.FadeColour(idleColour, transition_speed, EasingTypes.OutQuint); fill.FadeColour(idleColour, transition_speed, Easing.OutQuint);
} }
} }

4
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -517,13 +517,13 @@ namespace osu.Game.Overlays.Profile
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
this.FadeColour(hoverColour, 500, EasingTypes.OutQuint); this.FadeColour(hoverColour, 500, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
this.FadeColour(Color4.White, 500, EasingTypes.OutQuint); this.FadeColour(Color4.White, 500, Easing.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(state);
} }

4
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -138,7 +138,7 @@ namespace osu.Game.Overlays.Profile
public void ResetBall() 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(); ball.Show();
BallRelease(); BallRelease();
ballShown = true; ballShown = true;
@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Profile
float y = GetYPosition(values[i]); float y = GetYPosition(values[i]);
if (Math.Abs(y * DrawHeight - position.Y) <= 8f) 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); BallMove(i);
} }
} }

2
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -291,7 +291,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
{ {
set set
{ {
statusIcon.FadeColour(value, 500, EasingTypes.OutQuint); statusIcon.FadeColour(value, 500, Easing.OutQuint);
} }
} }

4
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
AutoSizeDuration = transition_duration, AutoSizeDuration = transition_duration,
AutoSizeEasing = EasingTypes.OutQuint, AutoSizeEasing = Easing.OutQuint,
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None; letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None;
if (!isVisible) if (!isVisible)
letterboxSettings.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint); letterboxSettings.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
}; };
letterboxing.TriggerChange(); letterboxing.TriggerChange();
} }

4
osu.Game/Overlays/Settings/Sidebar.cs
View File

@ -94,10 +94,10 @@ namespace osu.Game.Overlays.Settings
switch (state) switch (state)
{ {
default: default:
this.ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, EasingTypes.OutQuint); this.ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, Easing.OutQuint);
break; break;
case ExpandedState.Expanded: case ExpandedState.Expanded:
this.ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, EasingTypes.OutQuint); this.ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, Easing.OutQuint);
break; break;
} }
} }

8
osu.Game/Overlays/SettingsOverlay.cs
View File

@ -125,8 +125,8 @@ namespace osu.Game.Overlays
{ {
base.PopIn(); base.PopIn();
sectionsContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); sectionsContainer.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); sidebar.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(1, TRANSITION_LENGTH / 2); this.FadeTo(1, TRANSITION_LENGTH / 2);
searchTextBox.HoldFocus = true; searchTextBox.HoldFocus = true;
@ -136,8 +136,8 @@ namespace osu.Game.Overlays
{ {
base.PopOut(); base.PopOut();
sectionsContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint); sectionsContainer.MoveToX(-width, TRANSITION_LENGTH, Easing.OutQuint);
sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint); sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(0, TRANSITION_LENGTH / 2); this.FadeTo(0, TRANSITION_LENGTH / 2);
searchTextBox.HoldFocus = false; searchTextBox.HoldFocus = false;

14
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -107,29 +107,29 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
solidBackground.FadeTo(alpha_hovering, transition_time, EasingTypes.OutQuint); solidBackground.FadeTo(alpha_hovering, transition_time, Easing.OutQuint);
gradientBackground.FadeIn(transition_time, EasingTypes.OutQuint); gradientBackground.FadeIn(transition_time, Easing.OutQuint);
return true; return true;
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
solidBackground.FadeTo(alpha_normal, transition_time, EasingTypes.OutQuint); solidBackground.FadeTo(alpha_normal, transition_time, Easing.OutQuint);
gradientBackground.FadeOut(transition_time, EasingTypes.OutQuint); gradientBackground.FadeOut(transition_time, Easing.OutQuint);
} }
} }
protected override void PopIn() protected override void PopIn()
{ {
this.MoveToY(0, transition_time, EasingTypes.OutQuint); this.MoveToY(0, transition_time, Easing.OutQuint);
this.FadeIn(transition_time / 2, EasingTypes.OutQuint); this.FadeIn(transition_time / 2, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
userArea?.LoginOverlay.Hide(); userArea?.LoginOverlay.Hide();
this.MoveToY(-DrawSize.Y, transition_time, EasingTypes.OutQuint); this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
this.FadeOut(transition_time); this.FadeOut(transition_time);
} }
} }

2
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnClick(InputState state) 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); return base.OnClick(state);
} }

2
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Toolbar
if (!activeMode.IsValid) if (!activeMode.IsValid)
{ {
modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint); modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, Easing.OutQuint);
activeMode.Validate(); activeMode.Validate();
} }
} }

4
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -73,13 +73,13 @@ namespace osu.Game.Overlays
protected override void PopIn() protected override void PopIn()
{ {
base.PopIn(); base.PopIn();
FadeEdgeEffectTo(0.5f, APPEAR_DURATION, EasingTypes.In); FadeEdgeEffectTo(0.5f, APPEAR_DURATION, Easing.In);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
FadeEdgeEffectTo(0, DISAPPEAR_DURATION, EasingTypes.Out); FadeEdgeEffectTo(0, DISAPPEAR_DURATION, Easing.Out);
} }
public void ShowUser(User user, bool fetchOnline = true) public void ShowUser(User user, bool fetchOnline = true)

16
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -17,8 +17,8 @@ namespace osu.Game.Overlays
protected const float APPEAR_DURATION = 800; protected const float APPEAR_DURATION = 800;
protected const float DISAPPEAR_DURATION = 500; protected const float DISAPPEAR_DURATION = 500;
private const EasingTypes easing_show = EasingTypes.OutSine; private const Easing easing_show = Easing.OutSine;
private const EasingTypes easing_hide = EasingTypes.InSine; private const Easing easing_hide = Easing.InSine;
private readonly Wave firstWave; private readonly Wave firstWave;
private readonly Wave secondWave; private readonly Wave secondWave;
@ -137,23 +137,23 @@ namespace osu.Game.Overlays
foreach (var w in wavesContainer.Children) foreach (var w in wavesContainer.Children)
w.State = Visibility.Visible; w.State = Visibility.Visible;
this.FadeIn(100, EasingTypes.OutQuint); this.FadeIn(100, Easing.OutQuint);
contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint); contentContainer.MoveToY(0, APPEAR_DURATION, Easing.OutQuint);
this.FadeIn(100, EasingTypes.OutQuint); this.FadeIn(100, Easing.OutQuint);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint); this.FadeOut(DISAPPEAR_DURATION, Easing.InQuint);
contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In); contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, Easing.In);
foreach (var w in wavesContainer.Children) foreach (var w in wavesContainer.Children)
w.State = Visibility.Hidden; w.State = Visibility.Hidden;
this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint); this.FadeOut(DISAPPEAR_DURATION, Easing.InQuint);
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()

10
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -64,22 +64,22 @@ namespace osu.Game.Rulesets.Judgements
{ {
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(100, EasingTypes.OutQuint); this.FadeInFromZero(100, Easing.OutQuint);
switch (Judgement.Result) switch (Judgement.Result)
{ {
case HitResult.Miss: case HitResult.Miss:
this.ScaleTo(1.6f); 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.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
this.RotateTo(40, 800, EasingTypes.InQuint); this.RotateTo(40, 800, Easing.InQuint);
this.Delay(600).FadeOut(200); this.Delay(600).FadeOut(200);
break; break;
case HitResult.Hit: case HitResult.Hit:
this.ScaleTo(0.9f); this.ScaleTo(0.9f);
this.ScaleTo(1, 500, EasingTypes.OutElastic); this.ScaleTo(1, 500, Easing.OutElastic);
this.Delay(100).FadeOut(400); this.Delay(100).FadeOut(400);
break; break;

12
osu.Game/Screens/BackgroundScreen.cs
View File

@ -56,29 +56,29 @@ namespace osu.Game.Screens
Content.FadeOut(); Content.FadeOut();
Content.MoveToX(x_movement_amount); Content.MoveToX(x_movement_amount);
Content.FadeIn(transition_length, EasingTypes.InOutQuart); Content.FadeIn(transition_length, Easing.InOutQuart);
Content.MoveToX(0, transition_length, EasingTypes.InOutQuart); Content.MoveToX(0, transition_length, Easing.InOutQuart);
base.OnEntering(last); base.OnEntering(last);
} }
protected override void OnSuspending(Screen next) 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); base.OnSuspending(next);
} }
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)
{ {
Content.FadeOut(transition_length, EasingTypes.OutExpo); Content.FadeOut(transition_length, Easing.OutExpo);
Content.MoveToX(x_movement_amount, transition_length, EasingTypes.OutExpo); Content.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
return base.OnExiting(next); return base.OnExiting(next);
} }
protected override void OnResuming(Screen last) protected override void OnResuming(Screen last)
{ {
Content.MoveToX(0, transition_length, EasingTypes.OutExpo); Content.MoveToX(0, transition_length, Easing.OutExpo);
base.OnResuming(last); base.OnResuming(last);
} }
} }

2
osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Screens.Backgrounds
Beatmap = beatmap; 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); background?.BlurTo(sigma, duration, easing);
blurTarget = sigma; blurTarget = sigma;

2
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Backgrounds
private void display(Background newBackground) private void display(Background newBackground)
{ {
current?.FadeOut(800, EasingTypes.OutQuint); current?.FadeOut(800, Easing.OutQuint);
current?.Expire(); current?.Expire();
Add(current = newBackground); Add(current = newBackground);

38
osu.Game/Screens/Menu/Button.cs
View File

@ -128,14 +128,14 @@ namespace osu.Game.Screens.Menu
bool rightward = beatIndex % 2 == 1; bool rightward = beatIndex % 2 == 1;
double duration = timingPoint.BeatLength / 2; 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( icon.Animate(
i => i.MoveToY(-10, duration, EasingTypes.Out), i => i.MoveToY(-10, duration, Easing.Out),
i => i.ScaleTo(1, duration, EasingTypes.Out) i => i.ScaleTo(1, duration, Easing.Out)
).Then( ).Then(
i => i.MoveToY(0, duration, EasingTypes.In), i => i.MoveToY(0, duration, Easing.In),
i => i.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.In) i => i.ScaleTo(new Vector2(1, 0.9f), duration, Easing.In)
); );
} }
@ -145,25 +145,25 @@ namespace osu.Game.Screens.Menu
sampleHover?.Play(); 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; double duration = TimeUntilNextBeat;
icon.ClearTransforms(); icon.ClearTransforms();
icon.RotateTo(10, duration, EasingTypes.InOutSine); icon.RotateTo(10, duration, Easing.InOutSine);
icon.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.Out); icon.ScaleTo(new Vector2(1, 0.9f), duration, Easing.Out);
return true; return true;
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
icon.ClearTransforms(); icon.ClearTransforms();
icon.RotateTo(0, 500, EasingTypes.Out); icon.RotateTo(0, 500, Easing.Out);
icon.MoveTo(Vector2.Zero, 500, EasingTypes.Out); icon.MoveTo(Vector2.Zero, 500, Easing.Out);
icon.ScaleTo(Vector2.One, 200, EasingTypes.Out); icon.ScaleTo(Vector2.One, 200, Easing.Out);
if (State == ButtonState.Expanded) if (State == ButtonState.Expanded)
box.ScaleTo(new Vector2(1, 1), 500, EasingTypes.OutElastic); box.ScaleTo(new Vector2(1, 1), 500, Easing.OutElastic);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -176,13 +176,13 @@ namespace osu.Game.Screens.Menu
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) 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); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs 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); return base.OnMouseUp(state, args);
} }
@ -214,7 +214,7 @@ namespace osu.Game.Screens.Menu
boxHoverLayer.ClearTransforms(); boxHoverLayer.ClearTransforms();
boxHoverLayer.Alpha = 0.9f; 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; public override bool HandleInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
@ -246,23 +246,23 @@ namespace osu.Game.Screens.Menu
switch (ContractStyle) switch (ContractStyle)
{ {
default: default:
box.ScaleTo(new Vector2(0, 1), 500, EasingTypes.OutExpo); box.ScaleTo(new Vector2(0, 1), 500, Easing.OutExpo);
this.FadeOut(500); this.FadeOut(500);
break; break;
case 1: case 1:
box.ScaleTo(new Vector2(0, 1), 400, EasingTypes.InSine); box.ScaleTo(new Vector2(0, 1), 400, Easing.InSine);
this.FadeOut(800); this.FadeOut(800);
break; break;
} }
break; break;
case ButtonState.Expanded: case ButtonState.Expanded:
const int expand_duration = 500; 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); this.FadeIn(expand_duration / 6f);
break; break;
case ButtonState.Exploded: case ButtonState.Exploded:
const int explode_duration = 200; 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); this.FadeOut(explode_duration / 4f * 3);
break; break;
} }

14
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -224,13 +224,13 @@ namespace osu.Game.Screens.Menu
{ {
case MenuState.Exit: case MenuState.Exit:
case MenuState.Initial: case MenuState.Initial:
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out); buttonAreaBackground.ScaleTo(Vector2.One, 500, Easing.Out);
buttonArea.FadeOut(300); buttonArea.FadeOut(300);
osuLogo.Delay(150) osuLogo.Delay(150)
.Schedule(() => toolbar?.Hide()) .Schedule(() => toolbar?.Hide())
.ScaleTo(1, 800, EasingTypes.OutExpo) .ScaleTo(1, 800, Easing.OutExpo)
.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo); .MoveTo(Vector2.Zero, 800, Easing.OutExpo);
foreach (Button b in buttonsTopLevel) foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted; b.State = ButtonState.Contracted;
@ -247,11 +247,11 @@ namespace osu.Game.Screens.Menu
sampleBack?.Play(); sampleBack?.Play();
break; break;
case MenuState.TopLevel: case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out); buttonAreaBackground.ScaleTo(Vector2.One, 200, Easing.Out);
var sequence = osuLogo var sequence = osuLogo
.ScaleTo(0.5f, 200, EasingTypes.In) .ScaleTo(0.5f, 200, Easing.In)
.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In); .MoveTo(buttonFlow.DrawPosition, 200, Easing.In);
if (fromInitial && osuLogo.Scale.X > 0.5f) if (fromInitial && osuLogo.Scale.X > 0.5f)
sequence.OnComplete(o => sequence.OnComplete(o =>
@ -276,7 +276,7 @@ namespace osu.Game.Screens.Menu
b.State = ButtonState.Expanded; b.State = ButtonState.Expanded;
break; break;
case MenuState.EnteringMode: 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); buttonsTopLevel.ForEach(b => b.ContractStyle = 1);
buttonsPlay.ForEach(b => b.ContractStyle = 1); buttonsPlay.ForEach(b => b.ContractStyle = 1);

4
osu.Game/Screens/Menu/Intro.cs
View File

@ -134,8 +134,8 @@ namespace osu.Game.Screens.Menu
logo.ScaleTo(0.4f); logo.ScaleTo(0.4f);
logo.FadeOut(); logo.FadeOut();
logo.ScaleTo(1, 4400, EasingTypes.OutQuint); logo.ScaleTo(1, 4400, Easing.OutQuint);
logo.FadeIn(20000, EasingTypes.OutQuint); logo.FadeIn(20000, Easing.OutQuint);
} }
protected override void OnSuspending(Screen next) protected override void OnSuspending(Screen next)

12
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -118,10 +118,10 @@ namespace osu.Game.Screens.Menu
buttons.State = MenuState.EnteringMode; buttons.State = MenuState.EnteringMode;
Content.FadeOut(length, EasingTypes.InSine); Content.FadeOut(length, Easing.InSine);
Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.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) protected override void OnResuming(Screen last)
@ -137,10 +137,10 @@ namespace osu.Game.Screens.Menu
buttons.State = MenuState.TopLevel; buttons.State = MenuState.TopLevel;
Content.FadeIn(length, EasingTypes.OutQuint); Content.FadeIn(length, Easing.OutQuint);
Content.MoveTo(new Vector2(0, 0), length, EasingTypes.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) protected override bool OnExiting(Screen next)

2
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -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) 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() .Then()
.FadeOut(beatLength, EasingTypes.In); .FadeOut(beatLength, Easing.In);
} }
} }
} }

26
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -240,27 +240,27 @@ namespace osu.Game.Screens.Menu
this.Delay(early_activation).Schedule(() => sampleBeat.Play()); this.Delay(early_activation).Schedule(() => sampleBeat.Play());
logoBeatContainer logoBeatContainer
.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out) .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out)
.Then() .Then()
.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint); .ScaleTo(1, beatLength * 2, Easing.OutQuint);
ripple.ClearTransforms(); ripple.ClearTransforms();
ripple ripple
.ScaleTo(logoAmplitudeContainer.Scale) .ScaleTo(logoAmplitudeContainer.Scale)
.ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, EasingTypes.OutQuint) .ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, Easing.OutQuint)
.FadeTo(0.15f * amplitudeAdjust).FadeOut(beatLength, EasingTypes.OutQuint); .FadeTo(0.15f * amplitudeAdjust).FadeOut(beatLength, Easing.OutQuint);
if (effectPoint.KiaiMode && flashLayer.Alpha < 0.4f) if (effectPoint.KiaiMode && flashLayer.Alpha < 0.4f)
{ {
flashLayer.ClearTransforms(); flashLayer.ClearTransforms();
flashLayer flashLayer
.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out) .FadeTo(0.2f * amplitudeAdjust, early_activation, Easing.Out)
.Then() .Then()
.FadeOut(beatLength); .FadeOut(beatLength);
visualizer.ClearTransforms(); visualizer.ClearTransforms();
visualizer visualizer
.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out) .FadeTo(0.9f * amplitudeAdjust, early_activation, Easing.Out)
.Then() .Then()
.FadeTo(0.5f, beatLength); .FadeTo(0.5f, beatLength);
} }
@ -274,7 +274,7 @@ namespace osu.Game.Screens.Menu
const float velocity_adjust_cutoff = 0.98f; const float velocity_adjust_cutoff = 0.98f;
var maxAmplitude = lastBeatIndex >= 0 ? Beatmap.Value.Track?.CurrentAmplitudes.Maximum ?? 0 : 0; 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) if (maxAmplitude > velocity_adjust_cutoff)
triangles.Velocity = 1 + Math.Max(0, maxAmplitude - velocity_adjust_cutoff) * 50; triangles.Velocity = 1 + Math.Max(0, maxAmplitude - velocity_adjust_cutoff) * 50;
@ -286,13 +286,13 @@ namespace osu.Game.Screens.Menu
{ {
if (!Interactive) return false; if (!Interactive) return false;
logoBounceContainer.ScaleTo(0.9f, 1000, EasingTypes.Out); logoBounceContainer.ScaleTo(0.9f, 1000, Easing.Out);
return true; return true;
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
logoBounceContainer.ScaleTo(1f, 500, EasingTypes.OutElastic); logoBounceContainer.ScaleTo(1f, 500, Easing.OutElastic);
return true; return true;
} }
@ -304,7 +304,7 @@ namespace osu.Game.Screens.Menu
flashLayer.ClearTransforms(); flashLayer.ClearTransforms();
flashLayer.Alpha = 0.4f; flashLayer.Alpha = 0.4f;
flashLayer.FadeOut(1500, EasingTypes.OutExpo); flashLayer.FadeOut(1500, Easing.OutExpo);
Action?.Invoke(); Action?.Invoke();
return true; return true;
@ -314,18 +314,18 @@ namespace osu.Game.Screens.Menu
{ {
if (!Interactive) return false; if (!Interactive) return false;
logoHoverContainer.ScaleTo(1.1f, 500, EasingTypes.OutElastic); logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic);
return true; return true;
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
logoHoverContainer.ScaleTo(1, 500, EasingTypes.OutElastic); logoHoverContainer.ScaleTo(1, 500, Easing.OutElastic);
} }
public void Impact() public void Impact()
{ {
impactContainer.FadeOutFromOne(250, EasingTypes.In); impactContainer.FadeOutFromOne(250, Easing.In);
impactContainer.ScaleTo(0.96f); impactContainer.ScaleTo(0.96f);
impactContainer.ScaleTo(1.12f, 250); impactContainer.ScaleTo(1.12f, 250);
} }

2
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -235,7 +235,7 @@ namespace osu.Game.Screens.Multiplayer
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}) { RelativeSizeAxes = Axes.Both }, }) { RelativeSizeAxes = Axes.Both },
}; };

2
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -337,7 +337,7 @@ namespace osu.Game.Screens.Multiplayer
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}) { RelativeSizeAxes = Axes.Both }, }) { RelativeSizeAxes = Axes.Both },
}; };

4
osu.Game/Screens/Play/HUD/ComboCounter.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD
protected virtual double PopOutDuration => 150; protected virtual double PopOutDuration => 150;
protected virtual float PopOutScale => 2.0f; 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 float PopOutInitialAlpha => 0.75f;
protected virtual double FadeOutDuration => 100; protected virtual double FadeOutDuration => 100;
@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play.HUD
/// <summary> /// <summary>
/// Easing for the counter rollover animation. /// Easing for the counter rollover animation.
/// </summary> /// </summary>
protected EasingTypes RollingEasing => EasingTypes.None; protected Easing RollingEasing => Easing.None;
protected SpriteText DisplayedCountSpriteText; protected SpriteText DisplayedCountSpriteText;

2
osu.Game/Screens/Play/HUD/ComboResultCounter.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.HUD
public class ComboResultCounter : RollingCounter<long> public class ComboResultCounter : RollingCounter<long>
{ {
protected override double RollingDuration => 500; 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) protected override double GetProportionalDuration(long currentValue, long newValue)
{ {

8
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -76,20 +76,20 @@ namespace osu.Game.Screens.Play.HUD
private void appearTransform() private void appearTransform()
{ {
if (mods.Value.Any(m => !m.Ranked)) if (mods.Value.Any(m => !m.Ranked))
unrankedText.FadeInFromZero(fade_duration, EasingTypes.OutQuint); unrankedText.FadeInFromZero(fade_duration, Easing.OutQuint);
else else
unrankedText.Hide(); unrankedText.Hide();
iconsContainer.FinishTransforms(); iconsContainer.FinishTransforms();
iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint); iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
expand(); expand();
using (iconsContainer.BeginDelayedSequence(1200)) using (iconsContainer.BeginDelayedSequence(1200))
contract(); 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) protected override bool OnHover(InputState state)
{ {

6
osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
View File

@ -97,11 +97,11 @@ namespace osu.Game.Screens.Play.HUD
if (judgement.Result == HitResult.Miss) if (judgement.Result == HitResult.Miss)
return; 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) .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);
} }
} }

4
osu.Game/Screens/Play/HotkeyRetryOverlay.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play
if (args.Key == Key.Tilde) if (args.Key == Key.Tilde)
{ {
overlay.FadeIn(activate_delay, EasingTypes.Out); overlay.FadeIn(activate_delay, Easing.Out);
return true; return true;
} }
@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play
{ {
if (args.Key == Key.Tilde && !fired) if (args.Key == Key.Tilde && !fired)
{ {
overlay.FadeOut(fadeout_delay, EasingTypes.Out); overlay.FadeOut(fadeout_delay, Easing.Out);
return true; return true;
} }

Some files were not shown because too many files have changed in this diff Show More