h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1019 from Tom94/better-transforms

Browse Source 
Improve transforms and use new LINQ-like syntax
This commit is contained in:
Dean Herbert 2017-07-23 13:45:52 +09:00 committed by GitHub
commit 660afb40b0
106 changed files with 500 additions and 763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 2d2e2fe698ab32d80d5e856f52c8c398ceb35540
Subproject commit 8fde46d214e4ababb46100d2e4488ca26a9d43a3

4
osu.Desktop.VisualTests/Tests/TestCaseBeatSyncedContainer.cs
View File

@ -177,9 +177,7 @@ namespace osu.Desktop.VisualTests.Tests
beatsPerMinute.Value = 60000 / timingPoint.BeatLength;
adjustedBeatLength.Value = timingPoint.BeatLength;
flashLayer.ClearTransforms();
flashLayer.FadeTo(1);
flashLayer.FadeTo(0, timingPoint.BeatLength);
flashLayer.FadeOutFromOne(timingPoint.BeatLength);
}
}

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

@ -59,20 +59,13 @@ namespace osu.Desktop.VisualTests.Tests
{
base.LoadComplete();
using (container.BeginLoopedSequence())
{
container.MoveTo(new Vector2(0, 100), duration);
using (container.BeginDelayedSequence(duration))
{
container.MoveTo(new Vector2(100, 100), duration);
using (container.BeginDelayedSequence(duration))
{
container.MoveTo(new Vector2(100, 0), duration);
using (container.BeginDelayedSequence(duration))
container.MoveTo(Vector2.Zero, duration);
}
}
}
// Move box along a square trajectory
container.Loop(c => c
.MoveTo(new Vector2(0, 100), duration).Then()
.MoveTo(new Vector2(100, 100), duration).Then()
.MoveTo(new Vector2(100, 0), duration).Then()
.MoveTo(Vector2.Zero, duration)
);
}
private class MyContextMenuContainer : Container, IHasContextMenu
@ -95,10 +88,10 @@ namespace osu.Desktop.VisualTests.Tests
{
new OsuContextMenuItem(@"Simple option"),
new OsuContextMenuItem(@"Simple very very long option"),
new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => ResizeWidthTo(Width * 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => ResizeHeightTo(Height * 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => ResizeWidthTo(Width / 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => ResizeHeightTo(Height / 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, EasingTypes.OutQuint) },
new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, EasingTypes.OutQuint) },
};
}
}

5
osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs
View File

@ -56,10 +56,7 @@ namespace osu.Desktop.VisualTests.Tests
}
if (remaining > 0)
{
Delay(80);
Schedule(() => sendBarrage(remaining - 1));
}
Scheduler.AddDelayed(() => sendBarrage(remaining - 1), 80);
}
protected override void Update()

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

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

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

@ -67,6 +67,8 @@ namespace osu.Desktop.VisualTests.Tests
private void changePlayfieldSize(int step)
{
double delay = 0;
// Add new hits
switch (step)
{
@ -84,7 +86,7 @@ namespace osu.Desktop.VisualTests.Tests
break;
case 5:
addSwell(1000);
playfieldContainer.Delay(scroll_time - 100);
delay = scroll_time - 100;
break;
}
@ -92,10 +94,10 @@ namespace osu.Desktop.VisualTests.Tests
switch (step)
{
default:
playfieldContainer.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
break;
case 6:
playfieldContainer.ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
break;
}
}

2
osu.Desktop/Overlays/VersionManager.cs
View File

@ -175,7 +175,7 @@ namespace osu.Desktop.Overlays
protected override void PopIn()
{
FadeIn(1000);
this.FadeIn(1000);
}
protected override void PopOut()

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

@ -16,8 +16,6 @@ using System.Linq;
using System.Collections.Generic;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Framework.Input;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Timing;
using osu.Framework.Configuration;
@ -235,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.UI
private void transformVisibleTimeRangeTo(double newTimeRange, double duration = 0, EasingTypes easing = EasingTypes.None)
{
TransformTo(newTimeRange, duration, easing, new TransformTimeSpan());
this.TransformTo(nameof(visibleTimeRange), newTimeRange, duration, easing);
}
protected override void Update()
@ -244,23 +242,5 @@ namespace osu.Game.Rulesets.Mania.UI
// While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually
barLineContainer.Width = columns.Width;
}
private class TransformTimeSpan : Transform<double, Drawable>
{
public double CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((ManiaPlayfield)d).visibleTimeRange.Value = (float)CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((ManiaPlayfield)d).visibleTimeRange.Value;
}
}
}

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

@ -98,8 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
fp.Delay(fadeOutTime - fadeInTime);
fp.FadeOut(DrawableOsuHitObject.TIME_FADEIN);
fp.Delay(fadeOutTime - fadeInTime).FadeOut(DrawableOsuHitObject.TIME_FADEIN);
}
fp.Expire(true);

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

@ -112,29 +112,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
double duration = ((HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime) - HitObject.StartTime;
using (glow.BeginDelayedSequence(duration))
glow.FadeOut(400);
glow.Delay(duration).FadeOut(400);
switch (state)
{
case ArmedState.Idle:
using (BeginDelayedSequence(duration + TIME_PREEMPT))
FadeOut(TIME_FADEOUT);
this.Delay(duration + TIME_PREEMPT).FadeOut(TIME_FADEOUT);
Expire(true);
break;
case ArmedState.Miss:
ApproachCircle.FadeOut(50);
FadeOut(TIME_FADEOUT / 5);
this.FadeOut(TIME_FADEOUT / 5);
Expire();
break;
case ArmedState.Hit:
ApproachCircle.FadeOut(50);
const double flash_in = 40;
flash.FadeTo(0.8f, flash_in);
using (flash.BeginDelayedSequence(flash_in))
flash.FadeOut(100);
flash.FadeTo(0.8f, flash_in)
.Then()
.FadeOut(100);
explode.FadeIn(flash_in);
@ -145,8 +142,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
circle.FadeOut();
number.FadeOut();
FadeOut(800);
ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
this.FadeOut(800)
.ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
}
Expire();

5
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -4,6 +4,7 @@
using System.ComponentModel;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Judgements;
using osu.Framework.Graphics;
namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected sealed override void UpdateState(ArmedState state)
{
Flush();
FinishTransforms();
using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
{
@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected virtual void UpdatePreemptState()
{
FadeIn(TIME_FADEIN);
this.FadeIn(TIME_FADEIN);
}
protected virtual void UpdateCurrentState(ArmedState state)

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

@ -158,14 +158,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
ball.FadeIn();
Delay(slider.Duration, true);
using (BeginDelayedSequence(slider.Duration, true))
{
body.FadeOut(160);
ball.FadeOut(160);
body.FadeOut(160);
ball.FadeOut(160);
FadeOut(800);
Expire();
this.FadeOut(800)
.Expire();
}
}
public Drawable ProxiedLayer => initialCircle.ApproachCircle;

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

@ -62,14 +62,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
ScaleTo(0.5f);
ScaleTo(1.2f, animIn);
FadeIn(animIn);
Delay(animIn);
ScaleTo(1, 150, EasingTypes.Out);
Delay(-animIn);
this.Animate(
d => d.FadeIn(animIn),
d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn)
).Then(
d => d.ScaleTo(1, 150, EasingTypes.Out)
);
}
protected override void UpdateCurrentState(ArmedState state)
@ -77,16 +75,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
switch (state)
{
case ArmedState.Idle:
Delay(FadeOutTime - sliderTick.StartTime);
FadeOut();
this.Delay(FadeOutTime - sliderTick.StartTime).FadeOut();
break;
case ArmedState.Miss:
FadeOut(160);
FadeColour(Color4.Red, 80);
this.FadeOut(160)
.FadeColour(Color4.Red, 80);
break;
case ArmedState.Hit:
FadeOut(120, EasingTypes.OutQuint);
ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
this.FadeOut(120, EasingTypes.OutQuint)
.ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
break;
}
}

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

@ -189,30 +189,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
disc.RotateTo(-720);
symbol.RotateTo(-720);
mainContainer.ScaleTo(0);
mainContainer.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint);
mainContainer.Delay(TIME_PREEMPT - 150);
mainContainer.ScaleTo(1, 500, EasingTypes.OutQuint);
mainContainer
.ScaleTo(0)
.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint)
.Then()
.ScaleTo(1, 500, EasingTypes.OutQuint);
}
protected override void UpdateCurrentState(ArmedState state)
{
Delay(spinner.Duration, true);
FadeOut(160);
var sequence = this.Delay(spinner.Duration).FadeOut(160);
switch (state)
{
case ArmedState.Hit:
ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
Expire();
sequence.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
break;
case ArmedState.Miss:
ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
Expire();
sequence.ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
break;
}
Expire();
}
}
}

3
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBouncer.cs
View File

@ -37,8 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
protected override void LoadComplete()
{
base.LoadComplete();
using (icon.BeginLoopedSequence())
icon.RotateTo(360, 1000);
icon.Spin(1000, RotationDirection.Clockwise);
}
public void UpdateProgress(double progress, int repeat)

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

@ -4,7 +4,6 @@
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using osu.Game.Graphics;
using OpenTK;
@ -127,13 +126,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
if (Complete && updateCompleteTick())
{
background.Flush(flushType: typeof(TransformAlpha));
background.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo);
background.Delay(60);
background.FadeTo(tracking_alpha, 250, EasingTypes.OutQuint);
background.FinishTransforms(false, nameof(Alpha));
background
.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo)
.Then()
.FadeTo(tracking_alpha, 250, EasingTypes.OutQuint);
}
RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, EasingTypes.OutExpo);
this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, EasingTypes.OutExpo);
}
}
}

5
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
View File

@ -64,11 +64,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void LoadComplete()
{
base.LoadComplete();
Delay(BarLine.StartTime - Time.Current);
FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000);
this.Delay(BarLine.StartTime - Time.Current).FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000);
}
private void updateScrollPosition(double time) => MoveToX((float)((BarLine.StartTime - time) / BarLine.ScrollTime));
private void updateScrollPosition(double time) => this.MoveToX((float)((BarLine.StartTime - time) / BarLine.ScrollTime));
protected override void Update()
{

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

@ -65,45 +65,42 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state)
{
Delay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);
var circlePiece = MainPiece as CirclePiece;
circlePiece?.FlashBox.FinishTransforms();
circlePiece?.FlashBox.Flush();
switch (State)
using (BeginDelayedSequence(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true))
{
case ArmedState.Idle:
Delay(HitObject.HitWindowMiss);
break;
case ArmedState.Miss:
FadeOut(100);
break;
case ArmedState.Hit:
FadeOut(600);
switch (State)
{
case ArmedState.Idle:
this.Delay(HitObject.HitWindowMiss).Expire();
break;
case ArmedState.Miss:
this.FadeOut(100)
.Expire();
break;
case ArmedState.Hit:
var flash = circlePiece?.FlashBox;
if (flash != null)
{
flash.FadeTo(0.9f);
flash.FadeOut(300);
}
var flash = circlePiece?.FlashBox;
if (flash != null)
{
flash.FadeTo(0.9f);
flash.FadeOut(300);
}
const float gravity_time = 300;
const float gravity_travel_height = 200;
Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad);
FadeOut(800);
this.FadeOut(800)
.MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out)
.Then()
.MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In);
const float gravity_time = 300;
const float gravity_travel_height = 200;
Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad);
MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out);
Delay(gravity_time, true);
MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In);
break;
Expire();
break;
}
}
Expire();
}
}
}

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

@ -147,9 +147,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
var completion = (float)userHits / HitObject.RequiredHits;
expandingRing.FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50);
using (expandingRing.BeginDelayedSequence(50))
expandingRing.FadeTo(completion / 8, 2000, EasingTypes.OutQuint);
expandingRing
.FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50)
.Then()
.FadeTo(completion / 8, 2000, EasingTypes.OutQuint);
symbol.RotateTo((float)(completion * HitObject.Duration / 8), 4000, EasingTypes.OutQuint);
@ -180,26 +181,21 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state)
{
const float preempt = 100;
Delay(HitObject.StartTime - Time.Current - preempt, true);
targetRing.ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint);
Delay(preempt, true);
Delay(Judgement.TimeOffset + HitObject.Duration, true);
const float out_transition_time = 300;
double untilStartTime = HitObject.StartTime - Time.Current;
double untilJudgement = untilStartTime + Judgement.TimeOffset + HitObject.Duration;
targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint);
this.Delay(untilJudgement).FadeOut(out_transition_time, EasingTypes.Out);
switch (state)
{
case ArmedState.Hit:
bodyContainer.ScaleTo(1.4f, out_transition_time);
bodyContainer.Delay(untilJudgement).ScaleTo(1.4f, out_transition_time);
break;
}
FadeOut(out_transition_time, EasingTypes.Out);
Expire();
}

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

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

3
osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
View File

@ -6,6 +6,7 @@ using osu.Game.Rulesets.Objects.Drawables;
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Game.Rulesets.Judgements;
using osu.Framework.Graphics;
namespace osu.Game.Rulesets.Taiko.UI
{
@ -47,7 +48,7 @@ namespace osu.Game.Rulesets.Taiko.UI
switch (Judgement.Result)
{
case HitResult.Hit:
MoveToY(-100, 500);
this.MoveToY(-100, 500);
break;
}

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

@ -62,8 +62,8 @@ namespace osu.Game.Rulesets.Taiko.UI
{
base.LoadComplete();
ScaleTo(3f, 1000, EasingTypes.OutQuint);
FadeOut(500);
this.ScaleTo(3f, 1000, EasingTypes.OutQuint);
this.FadeOut(500);
Expire();
}
@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
/// </summary>
public void VisualiseSecondHit()
{
ResizeTo(new Vector2(TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER), 50);
this.ResizeTo(new Vector2(TaikoPlayfield.HIT_TARGET_OFFSET + TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER), 50);
}
}
}

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

@ -149,15 +149,17 @@ namespace osu.Game.Rulesets.Taiko.UI
const float down_time = 40;
const float up_time = 1000;
back.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint);
back.Delay(down_time);
back.ScaleTo(1, up_time, EasingTypes.OutQuint);
back.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint)
.Then()
.ScaleTo(1, up_time, EasingTypes.OutQuint);
target.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint);
target.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, EasingTypes.OutQuint);
target.Delay(down_time);
target.ScaleTo(1, up_time, EasingTypes.OutQuint);
target.FadeOut(up_time, EasingTypes.OutQuint);
target.Animate(
t => t.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint),
t => t.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, EasingTypes.OutQuint)
).Then(
t => t.ScaleTo(1, up_time, EasingTypes.OutQuint),
t => t.FadeOut(up_time, EasingTypes.OutQuint)
);
}
return false;

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

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

37
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Desktop.Platform;
using osu.Framework.Platform;
using osu.Game.Database;
using osu.Game.IPC;
using osu.Framework.Allocation;
namespace osu.Game.Tests.Beatmaps.IO
{
@ -26,15 +27,15 @@ namespace osu.Game.Tests.Beatmaps.IO
//unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
using (HeadlessGameHost host = new HeadlessGameHost())
{
loadOsu(host);
var osu = loadOsu(host);
var temp = prepareTempCopy(osz_path);
Assert.IsTrue(File.Exists(temp));
host.Dependencies.Get<BeatmapDatabase>().Import(temp);
osu.Dependencies.Get<BeatmapDatabase>().Import(temp);
ensureLoaded(host);
ensureLoaded(osu);
Assert.IsFalse(File.Exists(temp));
}
@ -49,7 +50,7 @@ namespace osu.Game.Tests.Beatmaps.IO
Assert.IsTrue(host.IsPrimaryInstance);
Assert.IsTrue(!client.IsPrimaryInstance);
loadOsu(host);
var osu = loadOsu(host);
var temp = prepareTempCopy(osz_path);
@ -59,7 +60,7 @@ namespace osu.Game.Tests.Beatmaps.IO
if (!importer.ImportAsync(temp).Wait(10000))
Assert.Fail(@"IPC took too long to send");
ensureLoaded(host);
ensureLoaded(osu);
Assert.IsFalse(File.Exists(temp));
}
@ -71,16 +72,16 @@ namespace osu.Game.Tests.Beatmaps.IO
//unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
using (HeadlessGameHost host = new HeadlessGameHost())
{
loadOsu(host);
var osu = loadOsu(host);
var temp = prepareTempCopy(osz_path);
Assert.IsTrue(File.Exists(temp), "Temporary file copy never substantiated");
using (File.OpenRead(temp))
host.Dependencies.Get<BeatmapDatabase>().Import(temp);
osu.Dependencies.Get<BeatmapDatabase>().Import(temp);
ensureLoaded(host);
ensureLoaded(osu);
File.Delete(temp);
@ -103,19 +104,19 @@ namespace osu.Game.Tests.Beatmaps.IO
Thread.Sleep(1);
//reset beatmap database (sqlite and storage backing)
host.Dependencies.Get<RulesetDatabase>().Reset();
host.Dependencies.Get<BeatmapDatabase>().Reset();
osu.Dependencies.Get<RulesetDatabase>().Reset();
osu.Dependencies.Get<BeatmapDatabase>().Reset();
return osu;
}
private void ensureLoaded(GameHost host, int timeout = 60000)
private void ensureLoaded(OsuGameBase osu, int timeout = 60000)
{
IEnumerable<BeatmapSetInfo> resultSets = null;
Action waitAction = () =>
{
while (!(resultSets = host.Dependencies.Get<BeatmapDatabase>()
while (!(resultSets = osu.Dependencies.Get<BeatmapDatabase>()
.Query<BeatmapSetInfo>().Where(s => s.OnlineBeatmapSetID == 241526)).Any())
Thread.Sleep(50);
};
@ -132,7 +133,7 @@ namespace osu.Game.Tests.Beatmaps.IO
//if we don't re-check here, the set will be inserted but the beatmaps won't be present yet.
waitAction = () =>
{
while ((resultBeatmaps = host.Dependencies.Get<BeatmapDatabase>()
while ((resultBeatmaps = osu.Dependencies.Get<BeatmapDatabase>()
.GetAllWithChildren<BeatmapInfo>(s => s.OnlineBeatmapSetID == 241526 && s.BaseDifficultyID > 0)).Count() != 12)
Thread.Sleep(50);
};
@ -140,7 +141,7 @@ namespace osu.Game.Tests.Beatmaps.IO
Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout),
@"Beatmaps did not import to the database in allocated time");
var set = host.Dependencies.Get<BeatmapDatabase>().GetChildren(resultSets.First());
var set = osu.Dependencies.Get<BeatmapDatabase>().GetChildren(resultSets.First());
Assert.IsTrue(set.Beatmaps.Count == resultBeatmaps.Count(),
$@"Incorrect database beatmap count post-import ({resultBeatmaps.Count()} but should be {set.Beatmaps.Count}).");
@ -150,16 +151,16 @@ namespace osu.Game.Tests.Beatmaps.IO
Assert.IsTrue(set.Beatmaps.Count > 0);
var beatmap = host.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 0))?.Beatmap;
var beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 0))?.Beatmap;
Assert.IsTrue(beatmap?.HitObjects.Count > 0);
beatmap = host.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 1))?.Beatmap;
beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 1))?.Beatmap;
Assert.IsTrue(beatmap?.HitObjects.Count > 0);
beatmap = host.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 2))?.Beatmap;
beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 2))?.Beatmap;
Assert.IsTrue(beatmap?.HitObjects.Count > 0);
beatmap = host.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 3))?.Beatmap;
beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.RulesetID == 3))?.Beatmap;
Assert.IsTrue(beatmap?.HitObjects.Count > 0);
}
}

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

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

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

@ -83,16 +83,10 @@ namespace osu.Game.Graphics.Cursor
protected override void PopIn()
{
instantMovement |= !IsPresent;
ClearTransforms();
FadeIn(500, EasingTypes.OutQuint);
this.FadeIn(500, EasingTypes.OutQuint);
}
protected override void PopOut()
{
using (BeginDelayedSequence(150))
FadeOut(500, EasingTypes.OutQuint);
}
protected override void PopOut() => this.Delay(150).FadeOut(500, EasingTypes.OutQuint);
public override void Move(Vector2 pos)
{
@ -103,7 +97,7 @@ namespace osu.Game.Graphics.Cursor
}
else
{
MoveTo(pos, 200, EasingTypes.OutQuint);
this.MoveTo(pos, 200, EasingTypes.OutQuint);
}
}
}

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

@ -4,7 +4,6 @@
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Game.Graphics.Transforms;
namespace osu.Game.Graphics
{
@ -27,10 +26,8 @@ namespace osu.Game.Graphics
/// <param name="newColour">The new accent colour.</param>
/// <param name="duration">The tween duration.</param>
/// <param name="easing">The tween easing.</param>
public static void FadeAccent<T>(this T accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None)
where T : Transformable<Drawable>, IHasAccentColour
{
accentedDrawable.TransformTo(newColour, duration, easing, new TransformAccent());
}
public static TransformSequence<T> FadeAccent<T>(this T accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None)
where T : IHasAccentColour
=> accentedDrawable.TransformTo(nameof(accentedDrawable.AccentColour), newColour, duration, easing);
}
}

31
osu.Game/Graphics/Transforms/TransformAccent.cs
View File

@ -1,31 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
namespace osu.Game.Graphics.Transforms
{
public class TransformAccent : Transform<Color4, Drawable>
{
/// <summary>
/// Current value of the transformed colour in linear colour space.
/// </summary>
public virtual Color4 CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((IHasAccentColour)d).AccentColour = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((IHasAccentColour)d).AccentColour;
}
}

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

@ -54,13 +54,13 @@ namespace osu.Game.Graphics.UserInterface
if (State == Visibility.Visible)
{
FadeIn(transition_duration, EasingTypes.OutQuint);
ScaleTo(new Vector2(1f), transition_duration, EasingTypes.OutQuint);
this.FadeIn(transition_duration, EasingTypes.OutQuint);
this.ScaleTo(new Vector2(1f), transition_duration, EasingTypes.OutQuint);
}
else
{
FadeOut(transition_duration, EasingTypes.OutQuint);
ScaleTo(new Vector2(0.8f, 1f), transition_duration, EasingTypes.OutQuint);
this.FadeOut(transition_duration, EasingTypes.OutQuint);
this.ScaleTo(new Vector2(0.8f, 1f), transition_duration, EasingTypes.OutQuint);
}
}
}

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

@ -99,8 +99,7 @@ namespace osu.Game.Graphics.UserInterface
colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In);
flash();
Delay(click_duration);
Schedule(delegate {
this.Delay(click_duration).Schedule(delegate {
colourContainer.ResizeTo(new Vector2(0.8f, 1f));
spriteText.Spacing = Vector2.Zero;
glowContainer.FadeOut();

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

@ -34,14 +34,13 @@ namespace osu.Game.Graphics.UserInterface
{
base.LoadComplete();
using (spinner.BeginLoopedSequence())
spinner.RotateTo(360, 2000);
spinner.Spin(2000, RotationDirection.Clockwise);
}
private const float transition_duration = 500;
protected override void PopIn() => FadeIn(transition_duration * 5, EasingTypes.OutQuint);
protected override void PopIn() => this.FadeIn(transition_duration * 5, EasingTypes.OutQuint);
protected override void PopOut() => FadeOut(transition_duration, EasingTypes.OutQuint);
protected override void PopOut() => this.FadeOut(transition_duration, EasingTypes.OutQuint);
}
}

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

@ -80,13 +80,13 @@ namespace osu.Game.Graphics.UserInterface
if (value)
{
FadeColour(GlowingAccentColour, 500, EasingTypes.OutQuint);
this.FadeColour(GlowingAccentColour, 500, EasingTypes.OutQuint);
FadeEdgeEffectTo(1, 500, EasingTypes.OutQuint);
}
else
{
FadeEdgeEffectTo(0, 500);
FadeColour(AccentColour, 500);
this.FadeColour(AccentColour, 500);
}
}
}
@ -95,7 +95,7 @@ namespace osu.Game.Graphics.UserInterface
{
set
{
ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, EasingTypes.OutQuint);
}
}

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

@ -39,13 +39,13 @@ namespace osu.Game.Graphics.UserInterface
Background.Colour = colours.ContextMenuGray;
}
protected override void AnimateOpen() => FadeIn(fade_duration, EasingTypes.OutQuint);
protected override void AnimateClose() => FadeOut(fade_duration, EasingTypes.OutQuint);
protected override void AnimateOpen() => this.FadeIn(fade_duration, EasingTypes.OutQuint);
protected override void AnimateClose() => this.FadeOut(fade_duration, EasingTypes.OutQuint);
protected override void UpdateContentHeight()
{
var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
}
}
}

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

@ -19,14 +19,14 @@ namespace osu.Game.Graphics.UserInterface
ItemsContainer.Padding = new MarginPadding(5);
}
protected override void AnimateOpen() => FadeIn(300, EasingTypes.OutQuint);
protected override void AnimateOpen() => this.FadeIn(300, EasingTypes.OutQuint);
protected override void AnimateClose() => FadeOut(300, EasingTypes.OutQuint);
protected override void AnimateClose() => this.FadeOut(300, EasingTypes.OutQuint);
protected override void UpdateContentHeight()
{
var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
}
}
}

23
osu.Game/Graphics/UserInterface/PercentageCounter.cs
View File

@ -1,9 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using System;
namespace osu.Game.Graphics.UserInterface
@ -13,8 +10,6 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public class PercentageCounter : RollingCounter<double>
{
protected override Type TransformType => typeof(TransformAccuracy);
protected override double RollingDuration => 750;
private float epsilon => 1e-10f;
@ -44,23 +39,5 @@ namespace osu.Game.Graphics.UserInterface
{
Current.Value = Current + amount;
}
protected class TransformAccuracy : Transform<double, Drawable>
{
public virtual double CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((PercentageCounter)d).DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((PercentageCounter)d).DisplayedCount;
}
}
}

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

@ -5,30 +5,21 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
using osu.Game.Graphics.Sprites;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using OpenTK.Graphics;
namespace osu.Game.Graphics.UserInterface
{
public abstract class RollingCounter<T> : Container, IHasAccentColour
where T : struct, IEquatable<T>
{
/// <summary>
/// The current value.
/// </summary>
public Bindable<T> Current = new Bindable<T>();
/// <summary>
/// Type of the Transform to use.
/// </summary>
/// <remarks>
/// Must be a subclass of Transform(T)
/// </remarks>
protected virtual Type TransformType => typeof(Transform<T, Drawable>);
protected SpriteText DisplayedCountSpriteText;
/// <summary>
@ -58,7 +49,8 @@ namespace osu.Game.Graphics.UserInterface
{
return displayedCount;
}
protected set
set
{
if (EqualityComparer<T>.Default.Equals(displayedCount, value))
return;
@ -133,7 +125,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public virtual void StopRolling()
{
Flush(false, TransformType);
FinishTransforms(false, nameof(DisplayedCount));
DisplayedCount = Current;
}
@ -176,44 +168,15 @@ namespace osu.Game.Graphics.UserInterface
/// implement the rollover animation).
/// </summary>
/// <param name="currentValue">Count value before modification.</param>
/// <param name="newValue">Expected count value after modification-</param>
/// <seealso cref="TransformType"/>
/// <param name="newValue">Expected count value after modification.</param>
protected virtual void TransformCount(T currentValue, T newValue)
{
Debug.Assert(
typeof(Transform<T, Drawable>).IsAssignableFrom(TransformType),
@"transformType should be a subclass of Transform<T>."
);
TransformCount((Transform<T, Drawable>)Activator.CreateInstance(TransformType), currentValue, newValue);
}
/// <summary>
/// Intended to be used by TransformCount(T currentValue, T newValue).
/// </summary>
protected void TransformCount(Transform<T, Drawable> transform, T currentValue, T newValue)
{
Type type = transform.GetType();
Flush(false, type);
if (RollingDuration < 1)
{
DisplayedCount = Current;
return;
}
double rollingTotalDuration =
IsRollingProportional
? GetProportionalDuration(currentValue, newValue)
: RollingDuration;
transform.StartTime = TransformStartTime;
transform.EndTime = TransformStartTime + rollingTotalDuration;
transform.EndValue = newValue;
transform.Easing = RollingEasing;
Transforms.Add(transform);
this.TransformTo(nameof(DisplayedCount), newValue, rollingTotalDuration, RollingEasing);
}
}
}

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

@ -2,16 +2,11 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using System;
namespace osu.Game.Graphics.UserInterface
{
public class ScoreCounter : RollingCounter<double>
{
protected override Type TransformType => typeof(TransformScore);
protected override double RollingDuration => 1000;
protected override EasingTypes RollingEasing => EasingTypes.Out;
@ -55,23 +50,5 @@ namespace osu.Game.Graphics.UserInterface
{
Current.Value = Current + amount;
}
protected class TransformScore : Transform<double, Drawable>
{
public virtual double CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((ScoreCounter)d).DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((ScoreCounter)d).DisplayedCount;
}
}
}

23
osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
View File

@ -2,9 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
namespace osu.Game.Graphics.UserInterface
{
@ -13,8 +10,6 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public class SimpleComboCounter : RollingCounter<int>
{
protected override Type TransformType => typeof(TransformCounterCount);
protected override double RollingDuration => 750;
public SimpleComboCounter()
@ -36,23 +31,5 @@ namespace osu.Game.Graphics.UserInterface
{
Current.Value = Current + amount;
}
private class TransformCounterCount : Transform<int, Drawable>
{
public int CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return (int)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((SimpleComboCounter)d).DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((SimpleComboCounter)d).DisplayedCount;
}
}
}

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

@ -122,7 +122,7 @@ namespace osu.Game.Graphics.UserInterface
if (value <= i)
return minStarScale;
return i + 1 <= value ? 1.0f : (float)Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
return i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
}
private void transformCount(float newValue)
@ -133,12 +133,8 @@ namespace osu.Game.Graphics.UserInterface
star.ClearTransforms(true);
var delay = (countStars <= newValue ? Math.Max(i - countStars, 0) : Math.Max(countStars - 1 - i, 0)) * animationDelay;
using (BeginDelayedSequence(delay, true))
{
star.FadeTo(i < newValue ? 1.0f : minStarAlpha, fadingDuration);
star.Icon.ScaleTo(getStarScale(i, newValue), scalingDuration, scalingEasing);
}
star.Delay(delay).FadeTo(i < newValue ? 1.0f : minStarAlpha, fadingDuration);
star.Icon.Delay(delay).ScaleTo(getStarScale(i, newValue), scalingDuration, scalingEasing);
i++;
}

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

@ -173,7 +173,7 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(InputState state)
{
ResizeTo(SIZE_EXTENDED, transform_time, EasingTypes.OutElastic);
this.ResizeTo(SIZE_EXTENDED, transform_time, EasingTypes.OutElastic);
IconLayer.FadeColour(HoverColour, transform_time, EasingTypes.OutElastic);
bouncingIcon.ScaleTo(1.1f, transform_time, EasingTypes.OutElastic);
@ -183,7 +183,7 @@ namespace osu.Game.Graphics.UserInterface
protected override void OnHoverLost(InputState state)
{
ResizeTo(SIZE_RETRACTED, transform_time, EasingTypes.OutElastic);
this.ResizeTo(SIZE_RETRACTED, transform_time, EasingTypes.OutElastic);
IconLayer.FadeColour(TextLayer.Colour, transform_time, EasingTypes.OutElastic);
bouncingIcon.ScaleTo(1, transform_time, EasingTypes.OutElastic);
@ -245,9 +245,9 @@ namespace osu.Game.Graphics.UserInterface
if (beatIndex < 0) return;
icon.ScaleTo(1 - 0.1f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (icon.BeginDelayedSequence(beat_in_time))
icon.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
icon.ScaleTo(1 - 0.1f * amplitudeAdjust, beat_in_time, EasingTypes.Out)
.Then()
.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
}
}
}

7
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -93,21 +93,20 @@ namespace osu.Game.Graphics.UserInterface.Volume
protected override void PopIn()
{
ClearTransforms();
FadeIn(100);
this.FadeIn(100);
schedulePopOut();
}
protected override void PopOut()
{
FadeOut(100);
this.FadeOut(100);
}
private void schedulePopOut()
{
popOutDelegate?.Cancel();
Delay(1000);
popOutDelegate = Schedule(Hide);
this.Delay(1000).Schedule(Hide, out popOutDelegate);
}
}
}

24
osu.Game/OsuGame.cs
View File

@ -80,6 +80,11 @@ namespace osu.Game
public void ToggleDirect() => direct.ToggleVisibility();
private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) =>
dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfig)
{
@ -97,7 +102,7 @@ namespace osu.Game
Task.Run(() => BeatmapDatabase.Import(paths.ToArray()));
}
Dependencies.Cache(this);
dependencies.Cache(this);
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
Ruleset.Value = RulesetDatabase.GetRuleset(configRuleset.Value);
@ -121,8 +126,7 @@ namespace osu.Game
if (!menu.IsCurrentScreen)
{
menu.MakeCurrent();
Delay(500);
scoreLoad = Schedule(() => LoadScore(s));
this.Delay(500).Schedule(() => LoadScore(s), out scoreLoad);
return;
}
@ -207,13 +211,13 @@ namespace osu.Game
});
};
Dependencies.Cache(settings);
Dependencies.Cache(social);
Dependencies.Cache(chat);
Dependencies.Cache(userProfile);
Dependencies.Cache(musicController);
Dependencies.Cache(notificationManager);
Dependencies.Cache(dialogOverlay);
dependencies.Cache(settings);
dependencies.Cache(social);
dependencies.Cache(chat);
dependencies.Cache(userProfile);
dependencies.Cache(musicController);
dependencies.Cache(notificationManager);
dependencies.Cache(dialogOverlay);
// ensure both overlays aren't presented at the same time
chat.StateChanged += (container, state) => social.State = state == Visibility.Visible ? Visibility.Hidden : social.State;

21
osu.Game/OsuGameBase.cs
View File

@ -81,21 +81,26 @@ namespace osu.Game
Name = @"osu!lazer";
}
private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) =>
dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
[BackgroundDependencyLoader]
private void load()
{
Dependencies.Cache(this);
Dependencies.Cache(LocalConfig);
dependencies.Cache(this);
dependencies.Cache(LocalConfig);
SQLiteConnection connection = Host.Storage.GetDatabase(@"client");
Dependencies.Cache(RulesetDatabase = new RulesetDatabase(Host.Storage, connection));
Dependencies.Cache(BeatmapDatabase = new BeatmapDatabase(Host.Storage, connection, RulesetDatabase, Host));
Dependencies.Cache(ScoreDatabase = new ScoreDatabase(Host.Storage, connection, Host, BeatmapDatabase));
Dependencies.Cache(new OsuColour());
dependencies.Cache(RulesetDatabase = new RulesetDatabase(Host.Storage, connection));
dependencies.Cache(BeatmapDatabase = new BeatmapDatabase(Host.Storage, connection, RulesetDatabase, Host));
dependencies.Cache(ScoreDatabase = new ScoreDatabase(Host.Storage, connection, Host, BeatmapDatabase));
dependencies.Cache(new OsuColour());
//this completely overrides the framework default. will need to change once we make a proper FontStore.
Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true);
dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true);
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
@ -127,7 +132,7 @@ namespace osu.Game
OszArchiveReader.Register();
Dependencies.Cache(API = new APIAccess
dependencies.Cache(API = new APIAccess
{
Username = LocalConfig.Get<string>(OsuSetting.Username),
Token = LocalConfig.Get<string>(OsuSetting.Token)

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

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Chat
{
set
{
FadeTo(value ? 1f : 0f, 100);
this.FadeTo(value ? 1f : 0f, 100);
}
}
@ -175,14 +175,14 @@ namespace osu.Game.Overlays.Chat
joinedCheckmark.FadeTo(1f, transition_duration);
topic.FadeTo(0.8f, transition_duration);
topic.FadeColour(Color4.White, transition_duration);
FadeColour(joinedColour, transition_duration);
this.FadeColour(joinedColour, transition_duration);
}
else
{
joinedCheckmark.FadeTo(0f, transition_duration);
topic.FadeTo(1f, transition_duration);
topic.FadeColour(topicColour, transition_duration);
FadeColour(Color4.White, transition_duration);
this.FadeColour(Color4.White, transition_duration);
}
}
}

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

@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Chat
{
set
{
FadeTo(value ? 1f : 0f, 100);
this.FadeTo(value ? 1f : 0f, 100);
}
}

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

@ -158,10 +158,10 @@ namespace osu.Game.Overlays.Chat
protected override void PopIn()
{
if (Alpha == 0) MoveToY(DrawHeight);
if (Alpha == 0) this.MoveToY(DrawHeight);
FadeIn(transition_duration, EasingTypes.OutQuint);
MoveToY(0, transition_duration, EasingTypes.OutQuint);
this.FadeIn(transition_duration, EasingTypes.OutQuint);
this.MoveToY(0, transition_duration, EasingTypes.OutQuint);
search.HoldFocus = true;
base.PopIn();
@ -169,8 +169,8 @@ namespace osu.Game.Overlays.Chat
protected override void PopOut()
{
FadeOut(transition_duration, EasingTypes.InSine);
MoveToY(DrawHeight, transition_duration, EasingTypes.InSine);
this.FadeOut(transition_duration, EasingTypes.InSine);
this.MoveToY(DrawHeight, transition_duration, EasingTypes.InSine);
search.HoldFocus = false;
base.PopOut();

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

@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Chat
private void fadeActive()
{
ResizeTo(new Vector2(Width, 1.1f), transition_length, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(Width, 1.1f), transition_length, EasingTypes.OutQuint);
box.FadeColour(backgroundActive, transition_length, EasingTypes.OutQuint);
highlightBox.FadeIn(transition_length, EasingTypes.OutQuint);
@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Chat
private void fadeInactive()
{
ResizeTo(new Vector2(Width, 1), transition_length, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(Width, 1), transition_length, EasingTypes.OutQuint);
box.FadeColour(backgroundInactive, transition_length, EasingTypes.OutQuint);
highlightBox.FadeOut(transition_length, EasingTypes.OutQuint);

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

@ -235,8 +235,8 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
MoveToY(0, transition_length, EasingTypes.OutQuint);
FadeIn(transition_length, EasingTypes.OutQuint);
this.MoveToY(0, transition_length, EasingTypes.OutQuint);
this.FadeIn(transition_length, EasingTypes.OutQuint);
inputTextBox.HoldFocus = true;
base.PopIn();
@ -244,8 +244,8 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
MoveToY(Height, transition_length, EasingTypes.InSine);
FadeOut(transition_length, EasingTypes.InSine);
this.MoveToY(Height, transition_length, EasingTypes.InSine);
this.FadeOut(transition_length, EasingTypes.InSine);
inputTextBox.HoldFocus = false;
base.PopOut();

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

@ -35,8 +35,7 @@ namespace osu.Game.Overlays
if (v != Visibility.Hidden) return;
//handle the dialog being dismissed.
dialog.Delay(PopupDialog.EXIT_DURATION);
dialog.Expire();
dialog.Delay(PopupDialog.EXIT_DURATION).Expire();
if (dialog == currentDialog)
State = Visibility.Hidden;
@ -45,13 +44,13 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
FadeIn(PopupDialog.ENTER_DURATION, EasingTypes.OutQuint);
this.FadeIn(PopupDialog.ENTER_DURATION, EasingTypes.OutQuint);
}
protected override void PopOut()
{
base.PopOut();
FadeOut(PopupDialog.EXIT_DURATION, EasingTypes.InSine);
this.FadeOut(PopupDialog.EXIT_DURATION, EasingTypes.InSine);
}
public DialogOverlay()

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

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

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

@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Direct
{
base.LoadComplete();
FadeInFromZero(200, EasingTypes.Out);
this.FadeInFromZero(200, EasingTypes.Out);
}
[BackgroundDependencyLoader]

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

@ -67,7 +67,7 @@ namespace osu.Game.Overlays
base.PopIn();
settingsSection.Bounding = true;
FadeIn(transition_time, EasingTypes.OutQuint);
this.FadeIn(transition_time, EasingTypes.OutQuint);
InputManager.ChangeFocus(settingsSection);
}
@ -77,7 +77,7 @@ namespace osu.Game.Overlays
base.PopOut();
settingsSection.Bounding = false;
FadeOut(transition_time);
this.FadeOut(transition_time);
}
}
}

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

@ -194,38 +194,43 @@ namespace osu.Game.Overlays
{
base.PopIn();
FadeIn(200);
this.FadeIn(200);
background.FlashColour(Color4.White.Opacity(0.25f), 400);
getSample.Play();
using (innerSpin.BeginLoopedSequence())
innerSpin.RotateTo(360, 20000);
using (outerSpin.BeginLoopedSequence())
outerSpin.RotateTo(360, 40000);
innerSpin.Spin(20000, RotationDirection.Clockwise);
outerSpin.Spin(40000, RotationDirection.Clockwise);
using (BeginDelayedSequence(200, true))
{
disc.FadeIn(initial_duration);
disc.FadeIn(initial_duration)
.ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic);
particleContainer.FadeIn(initial_duration);
outerSpin.FadeTo(0.1f, initial_duration * 2);
disc.ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic);
using (BeginDelayedSequence(initial_duration + 200, true))
{
backgroundStrip.FadeIn(step_duration);
leftStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint);
rightStrip.ResizeWidthTo(1f, step_duration, EasingTypes.OutQuint);
Schedule(() => { if (drawableMedal.State != DisplayState.Full) drawableMedal.State = DisplayState.Icon; });
using (BeginDelayedSequence(step_duration, true))
this.Animate().Schedule(() =>
{
Schedule(() => { if (drawableMedal.State != DisplayState.Full) drawableMedal.State = DisplayState.MedalUnlocked; });
using (BeginDelayedSequence(step_duration, true))
Schedule(() => { if (drawableMedal.State != DisplayState.Full) drawableMedal.State = DisplayState.Full; });
}
if (drawableMedal.State != DisplayState.Full)
drawableMedal.State = DisplayState.Icon;
})
.Delay(step_duration).Schedule(() =>
{
if (drawableMedal.State != DisplayState.Full)
drawableMedal.State = DisplayState.MedalUnlocked;
})
.Delay(step_duration).Schedule(() =>
{
if (drawableMedal.State != DisplayState.Full)
drawableMedal.State = DisplayState.Full;
});
}
}
}
@ -233,7 +238,7 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
base.PopOut();
FadeOut(200);
this.FadeOut(200);
}
private void dismiss()
@ -242,7 +247,7 @@ namespace osu.Game.Overlays
{
// if we haven't yet, play out the animation fully
drawableMedal.State = DisplayState.Full;
Flush(true);
FinishTransforms(true);
return;
}
@ -295,8 +300,8 @@ namespace osu.Game.Overlays
Radius = 5,
};
MoveTo(positionForOffset(DISC_SIZE / 2 + 200), 500);
FadeOut(500);
this.MoveTo(positionForOffset(DISC_SIZE / 2 + 200), 500);
this.FadeOut(500);
Expire();
}
}

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

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

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

@ -81,11 +81,13 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.Icon = modAfter.Icon;
using (BeginDelayedSequence(mod_switch_duration, true))
{
foregroundIcon.RotateTo(-rotate_angle * direction);
foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
foregroundIcon
.RotateTo(-rotate_angle * direction)
.RotateTo(0f, mod_switch_duration, mod_switch_easing);
backgroundIcon.RotateTo(rotate_angle * direction);
backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
backgroundIcon
.RotateTo(rotate_angle * direction)
.RotateTo(0f, mod_switch_duration, mod_switch_easing);
Schedule(() => displayMod(modAfter));
}

4
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Music
if (value == selected) return;
selected = value;
Flush(true);
FinishTransforms(true);
foreach (SpriteText s in titleSprites)
s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration);
}
@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Music
matching = value;
FadeTo(matching ? 1 : 0, 200);
this.FadeTo(matching ? 1 : 0, 200);
}
}
}

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

@ -101,16 +101,16 @@ namespace osu.Game.Overlays.Music
filter.Search.HoldFocus = true;
Schedule(() => inputManager.ChangeFocus(filter.Search));
ResizeTo(new Vector2(1, playlist_height), transition_duration, EasingTypes.OutQuint);
FadeIn(transition_duration, EasingTypes.OutQuint);
this.ResizeTo(new Vector2(1, playlist_height), transition_duration, EasingTypes.OutQuint);
this.FadeIn(transition_duration, EasingTypes.OutQuint);
}
protected override void PopOut()
{
filter.Search.HoldFocus = false;
ResizeTo(new Vector2(1, 0), transition_duration, EasingTypes.OutQuint);
FadeOut(transition_duration);
this.ResizeTo(new Vector2(1, 0), transition_duration, EasingTypes.OutQuint);
this.FadeOut(transition_duration);
}
private void itemSelected(BeatmapSetInfo set)

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

@ -368,7 +368,7 @@ namespace osu.Game.Overlays
{
base.PopIn();
FadeIn(transition_length, EasingTypes.OutQuint);
this.FadeIn(transition_length, EasingTypes.OutQuint);
dragContainer.ScaleTo(1, transition_length, EasingTypes.OutElastic);
}
@ -376,7 +376,7 @@ namespace osu.Game.Overlays
{
base.PopOut();
FadeOut(transition_length, EasingTypes.OutQuint);
this.FadeOut(transition_length, EasingTypes.OutQuint);
dragContainer.ScaleTo(0.9f, transition_length, EasingTypes.OutQuint);
}

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

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

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

@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Notifications
protected override void LoadComplete()
{
base.LoadComplete();
FadeInFromZero(200);
this.FadeInFromZero(200);
NotificationContent.MoveToX(DrawSize.X);
NotificationContent.MoveToX(0, 500, EasingTypes.OutQuint);
}
@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Notifications
wasClosed = true;
Closed?.Invoke();
FadeOut(100);
this.FadeOut(100);
Expire();
}
@ -181,13 +181,13 @@ namespace osu.Game.Overlays.Notifications
protected override bool OnHover(InputState state)
{
FadeColour(hoverColour, 200);
this.FadeColour(hoverColour, 200);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
FadeColour(OsuColour.Gray(0.2f), 200);
this.FadeColour(OsuColour.Gray(0.2f), 200);
base.OnHoverLost(state);
}
}
@ -212,12 +212,9 @@ namespace osu.Game.Overlays.Notifications
if (pulsate)
{
const float length = 1000;
using (pulsateLayer.BeginLoopedSequence(length / 2))
{
pulsateLayer.FadeTo(0.4f, length, EasingTypes.In);
using (pulsateLayer.BeginDelayedSequence(length))
pulsateLayer.FadeTo(1, length, EasingTypes.Out);
}
pulsateLayer.Loop(length / 2,
p => p.FadeTo(0.4f, length, EasingTypes.In).Then().FadeTo(1, length, EasingTypes.Out)
);
}
}
}

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

@ -78,10 +78,7 @@ namespace osu.Game.Overlays.Notifications
{
case ProgressNotificationState.Completed:
NotificationContent.MoveToY(-DrawSize.Y / 2, 200, EasingTypes.OutQuint);
FadeTo(0.01f, 200); //don't completely fade out or our scheduled task won't run.
Delay(100);
Schedule(Completed);
this.FadeOut(200).Finally(d => Completed());
break;
}
}
@ -196,7 +193,7 @@ namespace osu.Game.Overlays.Notifications
set
{
active = value;
FadeColour(active ? colourActive : colourInactive, 100);
this.FadeColour(active ? colourActive : colourInactive, 100);
}
}

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

@ -154,14 +154,13 @@ namespace osu.Game.Overlays
textLine2.Text = settingValue;
textLine3.Text = shortcut.ToUpper();
box.FadeIn(500, EasingTypes.OutQuint);
box.ResizeHeightTo(height, 500, EasingTypes.OutQuint);
using (box.BeginDelayedSequence(500))
{
box.FadeOutFromOne(1500, EasingTypes.InQuint);
box.ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint);
}
box.Animate(
b => b.FadeIn(500, EasingTypes.OutQuint),
b => b.ResizeHeightTo(height, 500, EasingTypes.OutQuint)
).Then(
b => b.FadeOutFromOne(1500, EasingTypes.InQuint),
b => b.ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint)
);
int optionCount = 0;
int selectedOption = -1;
@ -261,7 +260,7 @@ namespace osu.Game.Overlays
};
updateGlow();
Flush(true);
FinishTransforms(true);
}
}
}

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

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

2
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Settings
set
{
// probably needs a better transition.
FadeTo(value ? 1 : 0);
this.FadeTo(value ? 1 : 0);
}
}

2
osu.Game/Overlays/Settings/SettingsSection.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Settings
{
set
{
FadeTo(value ? 1 : 0);
this.FadeTo(value ? 1 : 0);
}
}

2
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings
{
set
{
FadeTo(value ? 1 : 0);
this.FadeTo(value ? 1 : 0);
}
}

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

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

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

@ -127,7 +127,7 @@ namespace osu.Game.Overlays
sectionsContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
FadeTo(1, TRANSITION_LENGTH / 2);
this.FadeTo(1, TRANSITION_LENGTH / 2);
searchTextBox.HoldFocus = true;
}
@ -138,7 +138,7 @@ namespace osu.Game.Overlays
sectionsContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint);
FadeTo(0, TRANSITION_LENGTH / 2);
this.FadeTo(0, TRANSITION_LENGTH / 2);
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)

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

@ -121,16 +121,16 @@ namespace osu.Game.Overlays.Toolbar
protected override void PopIn()
{
MoveToY(0, transition_time, EasingTypes.OutQuint);
FadeIn(transition_time / 2, EasingTypes.OutQuint);
this.MoveToY(0, transition_time, EasingTypes.OutQuint);
this.FadeIn(transition_time / 2, EasingTypes.OutQuint);
}
protected override void PopOut()
{
userArea?.LoginOverlay.Hide();
MoveToY(-DrawSize.Y, transition_time, EasingTypes.OutQuint);
FadeOut(transition_time);
this.MoveToY(-DrawSize.Y, transition_time, EasingTypes.OutQuint);
this.FadeOut(transition_time);
}
}
}

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

@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Toolbar
public override bool HandleInput => !ruleset.Disabled;
private void disabledChanged(bool isDisabled) => FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
private void disabledChanged(bool isDisabled) => this.FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
protected override void Update()
{

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

@ -137,23 +137,23 @@ namespace osu.Game.Overlays
foreach (var w in wavesContainer.Children)
w.State = Visibility.Visible;
FadeIn(100, EasingTypes.OutQuint);
this.FadeIn(100, EasingTypes.OutQuint);
contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint);
FadeIn(100, EasingTypes.OutQuint);
this.FadeIn(100, EasingTypes.OutQuint);
}
protected override void PopOut()
{
base.PopOut();
FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In);
foreach (var w in wavesContainer.Children)
w.State = Visibility.Hidden;
FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
this.FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
}
protected override void UpdateAfterChildren()
@ -210,10 +210,10 @@ namespace osu.Game.Overlays
switch (value)
{
case Visibility.Hidden:
MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
this.MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
break;
case Visibility.Visible:
MoveToY(FinalPosition, APPEAR_DURATION, easing_show);
this.MoveToY(FinalPosition, APPEAR_DURATION, easing_show);
break;
}
}

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

@ -64,26 +64,24 @@ namespace osu.Game.Rulesets.Judgements
{
base.LoadComplete();
FadeInFromZero(100, EasingTypes.OutQuint);
this.FadeInFromZero(100, EasingTypes.OutQuint);
switch (Judgement.Result)
{
case HitResult.Miss:
ScaleTo(1.6f);
ScaleTo(1, 100, EasingTypes.In);
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, EasingTypes.In);
MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
RotateTo(40, 800, EasingTypes.InQuint);
this.MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
this.RotateTo(40, 800, EasingTypes.InQuint);
Delay(600);
FadeOut(200);
this.Delay(600).FadeOut(200);
break;
case HitResult.Hit:
ScaleTo(0.9f);
ScaleTo(1, 500, EasingTypes.OutElastic);
this.ScaleTo(0.9f);
this.ScaleTo(1, 500, EasingTypes.OutElastic);
Delay(100);
FadeOut(400);
this.Delay(100).FadeOut(400);
break;
}

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

@ -40,7 +40,7 @@ namespace osu.Game.Screens.Backgrounds
if (background != null)
{
newDepth = background.Depth + 1;
background.Flush();
background.FinishTransforms();
background.FadeOut(250);
background.Expire();
}

1
osu.Game/Screens/Edit/Editor.cs
View File

@ -7,6 +7,7 @@ using OpenTK.Graphics;
using osu.Framework.Screens;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Select;
using osu.Framework.Graphics;
namespace osu.Game.Screens.Edit
{

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

@ -130,14 +130,13 @@ namespace osu.Game.Screens.Menu
icon.RotateTo(rightward ? 10 : -10, duration * 2, EasingTypes.InOutSine);
icon.MoveToY(-10, duration, EasingTypes.Out);
icon.ScaleTo(Vector2.One, duration, EasingTypes.Out);
using (icon.BeginDelayedSequence(duration))
{
icon.MoveToY(0, duration, EasingTypes.In);
icon.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.In);
}
icon.Animate(
i => i.MoveToY(-10, duration, EasingTypes.Out),
i => i.ScaleTo(1, duration, EasingTypes.Out)
).Then(
i => i.MoveToY(0, duration, EasingTypes.In),
i => i.ScaleTo(new Vector2(1, 0.9f), duration, EasingTypes.In)
);
}
protected override bool OnHover(InputState state)
@ -248,23 +247,23 @@ namespace osu.Game.Screens.Menu
{
default:
box.ScaleTo(new Vector2(0, 1), 500, EasingTypes.OutExpo);
FadeOut(500);
this.FadeOut(500);
break;
case 1:
box.ScaleTo(new Vector2(0, 1), 400, EasingTypes.InSine);
FadeOut(800);
this.FadeOut(800);
break;
}
break;
case ButtonState.Expanded:
const int expand_duration = 500;
box.ScaleTo(new Vector2(1, 1), expand_duration, EasingTypes.OutExpo);
FadeIn(expand_duration / 6f);
this.FadeIn(expand_duration / 6f);
break;
case ButtonState.Exploded:
const int explode_duration = 200;
box.ScaleTo(new Vector2(2, 1), explode_duration, EasingTypes.OutExpo);
FadeOut(explode_duration / 4f * 3);
this.FadeOut(explode_duration / 4f * 3);
break;
}
}

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

@ -216,7 +216,7 @@ namespace osu.Game.Screens.Menu
bool fromInitial = lastState == MenuState.Initial;
if (state == MenuState.TopLevel)
buttonArea.Flush(true);
buttonArea.FinishTransforms(true);
using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true))
{
@ -224,16 +224,13 @@ namespace osu.Game.Screens.Menu
{
case MenuState.Exit:
case MenuState.Initial:
toolbar?.Hide();
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
buttonArea.FadeOut(300);
using (osuLogo.BeginDelayedSequence(150))
{
osuLogo.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
osuLogo.ScaleTo(1, 800, EasingTypes.OutExpo);
}
osuLogo.Delay(150)
.Schedule(() => toolbar?.Hide())
.ScaleTo(1, 800, EasingTypes.OutExpo)
.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Contracted;
@ -252,17 +249,18 @@ namespace osu.Game.Screens.Menu
case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
osuLogo.ClearTransforms();
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
buttonArea.FadeIn(300);
var sequence = osuLogo
.ScaleTo(0.5f, 200, EasingTypes.In)
.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
if (fromInitial && osuLogo.Scale.X > 0.5f)
using (osuLogo.BeginDelayedSequence(200, true))
osuLogo.Impact();
sequence.OnComplete(o =>
{
o.Impact();
toolbar?.Show();
});
Scheduler.AddDelayed(() => toolbar?.Show(), 150);
buttonArea.FadeIn(300);
foreach (Button b in buttonsTopLevel)
b.State = ButtonState.Expanded;

17
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -98,18 +98,13 @@ namespace osu.Game.Screens.Menu
{
base.OnEntering(last);
Content.FadeInFromZero(500);
icon.Delay(1500).FadeColour(iconColour, 200);
icon.Delay(1500);
icon.FadeColour(iconColour, 200);
Delay(6000, true);
Content.FadeOut(250);
Delay(250);
Schedule(() => Push(intro));
Content
.FadeInFromZero(500)
.Then(5500)
.FadeOut(250)
.Finally(d => Push(intro));
}
}
}

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

@ -90,9 +90,9 @@ namespace osu.Game.Screens.Menu
private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes)
{
d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time);
using (d.BeginDelayedSequence(box_fade_in_time))
d.FadeOut(beatLength, EasingTypes.In);
d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time)
.Then()
.FadeOut(beatLength, EasingTypes.In);
}
}
}

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

@ -237,34 +237,32 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
if (IsHovered)
{
using (BeginDelayedSequence(early_activation))
Schedule(() => sampleBeat.Play());
}
this.Delay(early_activation).Schedule(() => sampleBeat.Play());
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(early_activation))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
logoBeatContainer
.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out)
.Then()
.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
ripple.ClearTransforms();
ripple.ScaleTo(logoAmplitudeContainer.Scale);
ripple.Alpha = 0.15f * amplitudeAdjust;
ripple.ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, EasingTypes.OutQuint);
ripple.FadeOut(beatLength, EasingTypes.OutQuint);
ripple
.ScaleTo(logoAmplitudeContainer.Scale)
.ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, EasingTypes.OutQuint)
.FadeTo(0.15f * amplitudeAdjust).FadeOut(beatLength, EasingTypes.OutQuint);
if (effectPoint.KiaiMode && flashLayer.Alpha < 0.4f)
{
flashLayer.ClearTransforms();
visualizer.ClearTransforms();
flashLayer
.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out)
.Then()
.FadeOut(beatLength);
flashLayer.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out);
visualizer.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (flashLayer.BeginDelayedSequence(early_activation))
flashLayer.FadeOut(beatLength);
using (visualizer.BeginDelayedSequence(early_activation))
visualizer.FadeTo(0.5f, beatLength);
visualizer.ClearTransforms();
visualizer
.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out)
.Then()
.FadeTo(0.5f, beatLength);
}
}

1
osu.Game/Screens/Multiplayer/Match.cs
View File

@ -8,6 +8,7 @@ using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Play;
using OpenTK.Graphics;
using osu.Game.Screens.Select;
using osu.Framework.Graphics;
namespace osu.Game.Screens.Multiplayer
{

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

@ -5,8 +5,6 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Play.HUD
@ -130,7 +128,7 @@ namespace osu.Game.Screens.Play.HUD
protected virtual void OnCountRolling(int currentValue, int newValue)
{
transformRoll(new TransformComboRoll(), currentValue, newValue);
transformRoll(currentValue, newValue);
}
protected virtual void OnCountIncrement(int currentValue, int newValue)
@ -170,7 +168,7 @@ namespace osu.Game.Screens.Play.HUD
if (!rolling)
{
Flush(false, typeof(TransformComboRoll));
FinishTransforms(false, nameof(DisplayedCount));
IsRolling = false;
DisplayedCount = prev;
@ -186,40 +184,9 @@ namespace osu.Game.Screens.Play.HUD
}
}
private void transformRoll(TransformComboRoll transform, int currentValue, int newValue)
private void transformRoll(int currentValue, int newValue)
{
Flush(false, typeof(TransformComboRoll));
if (RollingDuration < 1)
{
DisplayedCount = Current;
return;
}
transform.StartTime = Time.Current;
transform.EndTime = Time.Current + getProportionalDuration(currentValue, newValue);
transform.EndValue = newValue;
transform.Easing = RollingEasing;
Transforms.Add(transform);
}
protected class TransformComboRoll : Transform<int, Drawable>
{
public virtual int CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return (int)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((ComboCounter)d).DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((ComboCounter)d).DisplayedCount;
this.TransformTo(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), RollingEasing);
}
protected abstract void OnDisplayedCountRolling(int currentValue, int newValue);

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

@ -1,10 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.HUD
@ -12,44 +9,24 @@ namespace osu.Game.Screens.Play.HUD
/// <summary>
/// Used to display combo with a roll-up animation in results screen.
/// </summary>
public class ComboResultCounter : RollingCounter<ulong>
public class ComboResultCounter : RollingCounter<long>
{
protected override Type TransformType => typeof(TransformComboResult);
protected override double RollingDuration => 500;
protected override EasingTypes RollingEasing => EasingTypes.Out;
protected override double GetProportionalDuration(ulong currentValue, ulong newValue)
protected override double GetProportionalDuration(long currentValue, long newValue)
{
return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
}
protected override string FormatCount(ulong count)
protected override string FormatCount(long count)
{
return $@"{count}x";
}
public override void Increment(ulong amount)
public override void Increment(long amount)
{
Current.Value = Current + amount;
}
protected class TransformComboResult : Transform<ulong, Drawable>
{
public virtual ulong CurrentValue
{
get
{
double time = Time?.Current ?? 0;
if (time < StartTime) return StartValue;
if (time >= EndTime) return EndValue;
return (ulong)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
}
}
public override void Apply(Drawable d) => ((ComboResultCounter)d).DisplayedCount = CurrentValue;
public override void ReadIntoStartValue(Drawable d) => StartValue = ((ComboResultCounter)d).DisplayedCount;
}
}
}

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

@ -80,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD
else
unrankedText.Hide();
iconsContainer.Flush();
iconsContainer.FinishTransforms();
iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint);
expand();
using (iconsContainer.BeginDelayedSequence(1200))

1
osu.Game/Screens/Play/HUD/StandardComboCounter.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Graphics;
namespace osu.Game.Screens.Play.HUD
{

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

@ -97,9 +97,9 @@ namespace osu.Game.Screens.Play.HUD
if (judgement.Result == HitResult.Miss)
return;
fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, EasingTypes.OutQuint);
fill.Delay(glow_fade_delay);
fill.FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, EasingTypes.OutQuint);
fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, EasingTypes.OutQuint)
.Delay(glow_fade_delay)
.FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, EasingTypes.OutQuint);
}
protected override void SetHealth(float value) => fill.ResizeTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);

5
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -98,10 +98,7 @@ namespace osu.Game.Screens.Play
// in the case a replay isn't loaded, we want some elements to only appear briefly.
if (!replayLoaded)
{
using (ModDisplay.BeginDelayedSequence(2000))
ModDisplay.FadeOut(200);
}
ModDisplay.Delay(2000).FadeOut(200);
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)

2
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
private void load(OsuConfigManager config)
{
showKeyCounter = config.GetBindable<bool>(OsuSetting.KeyOverlay);
showKeyCounter.ValueChanged += keyCounterVisibility => FadeTo(keyCounterVisibility ? 1 : 0, duration);
showKeyCounter.ValueChanged += keyCounterVisibility => this.FadeTo(keyCounterVisibility ? 1 : 0, duration);
showKeyCounter.TriggerChange();
}

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

@ -76,8 +76,8 @@ namespace osu.Game.Screens.Play
public override bool HandleInput => State == Visibility.Visible;
protected override void PopIn() => FadeIn(transition_duration, EasingTypes.In);
protected override void PopOut() => FadeOut(transition_duration, EasingTypes.In);
protected override void PopIn() => this.FadeIn(transition_duration, EasingTypes.In);
protected override void PopOut() => this.FadeOut(transition_duration, EasingTypes.In);
// Don't let mouse down events through the overlay or people can click circles while paused.
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

6
osu.Game/Screens/Play/PauseContainer.cs
View File

@ -56,11 +56,7 @@ namespace osu.Game.Screens.Play
AddInternal(pauseOverlay = new PauseOverlay
{
OnResume = delegate
{
Delay(400);
Schedule(Resume);
},
OnResume = () => this.Delay(400).Schedule(Resume),
OnRetry = () => OnRetry(),
OnQuit = () => OnQuit(),
});

22
osu.Game/Screens/Play/Player.cs
View File

@ -269,19 +269,17 @@ namespace osu.Game.Screens.Play
dimLevel.ValueChanged += newDim => Background?.FadeTo(1 - (float)newDim, 800);
Content.ScaleTo(0.7f);
Content
.ScaleTo(0.7f)
.ScaleTo(1, 750, EasingTypes.OutQuint)
.Delay(250)
.FadeIn(250);
using (Content.BeginDelayedSequence(250))
Content.FadeIn(250);
Content.ScaleTo(1, 750, EasingTypes.OutQuint);
using (BeginDelayedSequence(750))
Schedule(() =>
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
});
this.Delay(750).Schedule(() =>
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
});
pauseContainer.Alpha = 0;
pauseContainer.FadeIn(750, EasingTypes.OutQuint);

23
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -77,9 +77,7 @@ namespace osu.Game.Screens.Play
RestartRequested = player.RestartRequested,
});
Delay(400);
Schedule(pushWhenLoaded);
this.Delay(400).Schedule(pushWhenLoaded);
}
private void contentIn()
@ -104,16 +102,9 @@ namespace osu.Game.Screens.Play
contentIn();
Delay(500, true);
logo.MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo);
Delay(250, true);
info.FadeIn(500);
Delay(1400, true);
Schedule(pushWhenLoaded);
logo.Delay(500).MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo);
info.Delay(750).FadeIn(500);
this.Delay(2150).Schedule(pushWhenLoaded);
}
private void pushWhenLoaded()
@ -123,9 +114,7 @@ namespace osu.Game.Screens.Play
contentOut();
Delay(250);
Schedule(() =>
this.Delay(250).Schedule(() =>
{
if (!IsCurrentScreen) return;
@ -143,7 +132,7 @@ namespace osu.Game.Screens.Play
protected override bool OnExiting(Screen next)
{
Content.ScaleTo(0.7f, 150, EasingTypes.InQuint);
FadeOut(150);
this.FadeOut(150);
return base.OnExiting(next);
}

8
osu.Game/Screens/Play/SkipButton.cs
View File

@ -100,9 +100,9 @@ namespace osu.Game.Screens.Play
return;
}
FadeInFromZero(fade_time);
this.FadeInFromZero(fade_time);
using (BeginAbsoluteSequence(beginFadeTime))
FadeOut(fade_time);
this.FadeOut(fade_time);
button.Action = () => AudioClock?.Seek(startTime - skip_required_cutoff - fade_time);
@ -154,14 +154,14 @@ namespace osu.Game.Screens.Play
{
case Visibility.Visible:
if (lastState == Visibility.Hidden)
FadeIn(500, EasingTypes.OutExpo);
this.FadeIn(500, EasingTypes.OutExpo);
if (!IsHovered)
using (BeginDelayedSequence(1000))
scheduledHide = Schedule(() => State = Visibility.Hidden);
break;
case Visibility.Hidden:
FadeOut(1000, EasingTypes.OutExpo);
this.FadeOut(1000, EasingTypes.OutExpo);
break;
}
}

6
osu.Game/Screens/Play/SongProgress.cs
View File

@ -122,18 +122,18 @@ namespace osu.Game.Screens.Play
private void updateBarVisibility()
{
bar.FadeTo(allowSeeking ? 1 : 0, transition_duration, EasingTypes.In);
MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, EasingTypes.In);
this.MoveTo(new Vector2(0, allowSeeking ? 0 : bottom_bar_height), transition_duration, EasingTypes.In);
}
protected override void PopIn()
{
updateBarVisibility();
FadeIn(500, EasingTypes.OutQuint);
this.FadeIn(500, EasingTypes.OutQuint);
}
protected override void PopOut()
{
FadeOut(100);
this.FadeOut(100);
}
protected override void Update()

15
osu.Game/Screens/Ranking/Results.cs
View File

@ -67,20 +67,23 @@ namespace osu.Game.Screens.Ranking
modeChangeButtons.FadeOut();
currentPage.FadeOut();
circleOuterBackground.ScaleTo(1, transition_time, EasingTypes.OutQuint);
circleOuterBackground.FadeTo(1, transition_time, EasingTypes.OutQuint);
circleOuterBackground
.FadeIn(transition_time, EasingTypes.OutQuint)
.ScaleTo(1, transition_time, EasingTypes.OutQuint);
using (BeginDelayedSequence(transition_time * 0.25f, true))
{
circleOuter.ScaleTo(1, transition_time, EasingTypes.OutQuint);
circleOuter.FadeTo(1, transition_time, EasingTypes.OutQuint);
circleOuter
.FadeIn(transition_time, EasingTypes.OutQuint)
.ScaleTo(1, transition_time, EasingTypes.OutQuint);
using (BeginDelayedSequence(transition_time * 0.3f, true))
{
backgroundParallax.FadeIn(transition_time, EasingTypes.OutQuint);
circleInner.ScaleTo(1, transition_time, EasingTypes.OutQuint);
circleInner.FadeTo(1, transition_time, EasingTypes.OutQuint);
circleInner
.FadeIn(transition_time, EasingTypes.OutQuint)
.ScaleTo(1, transition_time, EasingTypes.OutQuint);
using (BeginDelayedSequence(transition_time * 0.4f, true))
{

3
osu.Game/Screens/Ranking/ResultsPage.cs
View File

@ -33,8 +33,7 @@ namespace osu.Game.Screens.Ranking
protected override void LoadComplete()
{
base.LoadComplete();
fill.Delay(400);
fill.FadeInFromZero(600);
fill.Delay(400).FadeInFromZero(600);
}
[BackgroundDependencyLoader]

6
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -178,9 +178,9 @@ namespace osu.Game.Screens.Ranking
int delay = 0;
foreach (var s in statisticsContainer.Children)
{
s.FadeOut();
s.Delay(delay += 200);
s.FadeIn(300 + delay, EasingTypes.Out);
s.FadeOut()
.Then(delay += 200)
.FadeIn(300 + delay, EasingTypes.Out);
}
});
}

13
osu.Game/Screens/ScreenWhiteBox.cs
View File

@ -44,13 +44,14 @@ namespace osu.Game.Screens
boxContainer.ScaleTo(0.2f);
boxContainer.RotateTo(-20);
Content.Delay(300, true);
using (Content.BeginDelayedSequence(300, true))
{
boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic);
boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint);
boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic);
boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint);
textContainer.MoveTo(Vector2.Zero, transition_time, EasingTypes.OutExpo);
Content.FadeIn(transition_time, EasingTypes.OutExpo);
textContainer.MoveTo(Vector2.Zero, transition_time, EasingTypes.OutExpo);
Content.FadeIn(transition_time, EasingTypes.OutExpo);
}
}
protected override bool OnExiting(Screen next)

10
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -57,14 +57,14 @@ namespace osu.Game.Screens.Select
protected override void PopIn()
{
MoveToX(0, 800, EasingTypes.OutQuint);
RotateTo(0, 800, EasingTypes.OutQuint);
this.MoveToX(0, 800, EasingTypes.OutQuint);
this.RotateTo(0, 800, EasingTypes.OutQuint);
}
protected override void PopOut()
{
MoveToX(-100, 800, EasingTypes.InQuint);
RotateTo(10, 800, EasingTypes.InQuint);
this.MoveToX(-100, 800, EasingTypes.InQuint);
this.RotateTo(10, 800, EasingTypes.InQuint);
}
public void UpdateBeatmap(WorkingBeatmap beatmap)
@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
Shear = -Shear,
OnLoadComplete = d =>
{
FadeIn(250);
this.FadeIn(250);
lastContainer?.FadeOut(250);
lastContainer?.Expire();

4
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -63,8 +63,8 @@ namespace osu.Game.Screens.Select.Leaderboards
};
scrollFlow.Add(ls);
ls.Delay(i++ * 50, true);
ls.Show();
using (BeginDelayedSequence(i++ * 50, true))
ls.Show();
}
scrollContainer.ScrollTo(0f, false);

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