h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 18:52:55 +08:00
Code Issues Releases Wiki Activity

Update async load usage to new style.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-02 15:56:12 +09:00
parent 9bd19e99ee
commit 6f1fff4ee7
18 changed files with 146 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit bf6a3dc40176ee4f921012808070e014fc4a5779 Subproject commit 84200e72acaacd6441ae81291aef251ac31cbd63

2
osu.Desktop.VisualTests/VisualTestGame.cs
View File

@ -14,7 +14,7 @@ namespace osu.Desktop.VisualTests
{ {
base.LoadComplete(); base.LoadComplete();
new BackgroundScreenDefault { Depth = 10 }.LoadAsync(this, AddInternal); LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
// Have to construct this here, rather than in the constructor, because // Have to construct this here, rather than in the constructor, because
// we depend on some dependencies to be loaded within OsuGameBase.load(). // we depend on some dependencies to be loaded within OsuGameBase.load().

2
osu.Desktop/OsuGameDesktop.cs
View File

@ -29,7 +29,7 @@ namespace osu.Desktop
{ {
base.LoadComplete(); base.LoadComplete();
versionManager.LoadAsync(this); LoadComponentAsync(versionManager);
ScreenChanged += s => ScreenChanged += s =>
{ {
if (!versionManager.IsAlive && s is Intro) if (!versionManager.IsAlive && s is Intro)

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

@ -33,19 +33,15 @@ namespace osu.Game.Beatmaps.Drawables
Children = new Drawable[] Children = new Drawable[]
{ {
new DelayedLoadContainer new DelayedLoadContainer(
{ new PanelBackground(beatmap)
RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300,
FinishedLoading = d => d.FadeInFromZero(400, EasingTypes.Out),
Children = new[]
{ {
new PanelBackground(beatmap) RelativeSizeAxes = Axes.Both,
{ OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out),
RelativeSizeAxes = Axes.Both,
Depth = 1,
}
} }
)
{
TimeBeforeLoad = 300,
}, },
new FillFlowContainer new FillFlowContainer
{ {

22
osu.Game/OsuGame.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game
} }
}); });
(screenStack = new Loader()).LoadAsync(this, d => LoadComponentAsync(screenStack = new Loader(), d =>
{ {
screenStack.ModePushed += screenAdded; screenStack.ModePushed += screenAdded;
screenStack.Exited += screenRemoved; screenStack.Exited += screenRemoved;
@ -158,27 +158,27 @@ namespace osu.Game
}); });
//overlay elements //overlay elements
(chat = new ChatOverlay { Depth = 0 }).LoadAsync(this, overlayContent.Add); LoadComponentAsync(chat = new ChatOverlay { Depth = 0 }, overlayContent.Add);
(options = new OptionsOverlay { Depth = -1 }).LoadAsync(this, overlayContent.Add); LoadComponentAsync(options = new OptionsOverlay { Depth = -1 }, overlayContent.Add);
(musicController = new MusicController LoadComponentAsync(musicController = new MusicController
{ {
Depth = -2, Depth = -2,
Position = new Vector2(0, Toolbar.HEIGHT), Position = new Vector2(0, Toolbar.HEIGHT),
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
}).LoadAsync(this, overlayContent.Add); }, overlayContent.Add);
(notificationManager = new NotificationManager LoadComponentAsync(notificationManager = new NotificationManager
{ {
Depth = -2, Depth = -2,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
}).LoadAsync(this, overlayContent.Add); }, overlayContent.Add);
(dialogOverlay = new DialogOverlay LoadComponentAsync(dialogOverlay = new DialogOverlay
{ {
Depth = -4, Depth = -4,
}).LoadAsync(this, overlayContent.Add); }, overlayContent.Add);
Logger.NewEntry += entry => Logger.NewEntry += entry =>
{ {
@ -195,12 +195,12 @@ namespace osu.Game
Dependencies.Cache(notificationManager); Dependencies.Cache(notificationManager);
Dependencies.Cache(dialogOverlay); Dependencies.Cache(dialogOverlay);
(Toolbar = new Toolbar LoadComponentAsync(Toolbar = new Toolbar
{ {
Depth = -3, Depth = -3,
OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); }, OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
OnPlayModeChange = m => PlayMode.Value = m, OnPlayModeChange = m => PlayMode.Value = m,
}).LoadAsync(this, t => }, t =>
{ {
PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); }; PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };
PlayMode.TriggerChange(); PlayMode.TriggerChange();

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

@ -347,12 +347,9 @@ namespace osu.Game.Overlays
} }
}); });
dragContainer.Add(new AsyncLoadContainer dragContainer.Add(new AsyncLoadContainer(new MusicControllerBackground(beatmap)
{ {
RelativeSizeAxes = Axes.Both, OnLoadComplete = d =>
Depth = float.MaxValue,
Children = new[] { new MusicControllerBackground(beatmap) },
FinishedLoading = d =>
{ {
switch (direction) switch (direction)
{ {
@ -370,6 +367,9 @@ namespace osu.Game.Overlays
currentBackground.Expire(); currentBackground.Expire();
currentBackground = d; currentBackground = d;
} }
})
{
Depth = float.MaxValue,
}); });
}; };
} }

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

@ -27,21 +27,13 @@ namespace osu.Game.Screens
return false; return false;
} }
private Framework.Game game;
[BackgroundDependencyLoader]
private void load(Framework.Game game)
{
this.game = game;
}
public override bool Push(Screen screen) public override bool Push(Screen screen)
{ {
// When trying to push a non-loaded GameMode, load it asynchronously and re-invoke Push // When trying to push a non-loaded GameMode, load it asynchronously and re-invoke Push
// once it's done. // once it's done.
if (screen.LoadState == LoadState.NotLoaded) if (screen.LoadState == LoadState.NotLoaded)
{ {
screen.LoadAsync(game, d => Push((BackgroundScreen)d)); LoadComponentAsync(screen, d => Push((BackgroundScreen)d));
return true; return true;
} }

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

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Backgrounds
{ {
var newBackground = beatmap == null ? new Background(@"Backgrounds/bg1") : new BeatmapBackground(beatmap); var newBackground = beatmap == null ? new Background(@"Backgrounds/bg1") : new BeatmapBackground(beatmap);
newBackground.LoadAsync(Game, delegate LoadComponentAsync(newBackground, delegate
{ {
float newDepth = 0; float newDepth = 0;
if (background != null) if (background != null)

4
osu.Game/Screens/Loader.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Screens
private void load(OsuGame game) private void load(OsuGame game)
{ {
if (game.IsDeployedBuild) if (game.IsDeployedBuild)
new Disclaimer().LoadAsync(game, d => Push((Screen)d)); LoadComponentAsync(new Disclaimer(), d => Push((Screen)d));
else else
new Intro().LoadAsync(game, d => Push((Screen)d)); LoadComponentAsync(new Intro(), d => Push((Screen)d));
} }
} }
} }

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

@ -88,9 +88,9 @@ namespace osu.Game.Screens.Menu
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGame game, OsuColour colours) private void load(OsuColour colours)
{ {
(intro = new Intro()).LoadAsync(game); LoadComponentAsync(intro = new Intro());
iconColour = colours.Yellow; iconColour = colours.Yellow;
} }

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

@ -76,7 +76,7 @@ namespace osu.Game.Screens.Menu
{ {
bgm.Start(); bgm.Start();
(mainMenu = new MainMenu()).LoadAsync(Game); LoadComponentAsync(mainMenu = new MainMenu());
Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {

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

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGame game) private void load(OsuGame game)
{ {
background.LoadAsync(game); LoadComponentAsync(background);
buttons.OnSettings = game.ToggleOptions; buttons.OnSettings = game.ToggleOptions;
@ -67,10 +67,7 @@ namespace osu.Game.Screens.Menu
private void preloadSongSelect() private void preloadSongSelect()
{ {
if (songSelect == null) if (songSelect == null)
{ LoadComponentAsync(songSelect = new PlaySongSelect());
songSelect = new PlaySongSelect();
songSelect.LoadAsync(Game);
}
} }
private Screen consumeSongSelect() private Screen consumeSongSelect()

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

@ -225,7 +225,7 @@ namespace osu.Game.Screens.Play
var newPlayer = new Player(); var newPlayer = new Player();
newPlayer.LoadAsync(Game, delegate LoadComponentAsync(newPlayer, delegate
{ {
newPlayer.RestartCount = RestartCount + 1; newPlayer.RestartCount = RestartCount + 1;
ValidForResume = false; ValidForResume = false;

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

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
Origin = Anchor.Centre, Origin = Anchor.Centre,
}); });
player.LoadAsync(Game); LoadComponentAsync(player);
} }
protected override void OnEntering(Screen last) protected override void OnEntering(Screen last)

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

@ -103,111 +103,109 @@ namespace osu.Game.Screens.Select
labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s))); labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s)));
} }
Add(beatmapInfoContainer = new AsyncLoadContainer AlwaysPresent = true;
{
FinishedLoading = d =>
{
FadeIn(250);
lastContainer?.FadeOut(250); Add(beatmapInfoContainer = new AsyncLoadContainer(
lastContainer?.Expire(); new BufferedContainer
},
Depth = newDepth,
RelativeSizeAxes = Axes.Both,
Children = new[]
{ {
new BufferedContainer OnLoadComplete = d =>
{ {
PixelSnapping = true, FadeIn(250);
CacheDrawnFrameBuffer = true,
Shear = -Shear, lastContainer?.FadeOut(250);
RelativeSizeAxes = Axes.Both, lastContainer?.Expire();
Children = new Drawable[] },
PixelSnapping = true,
CacheDrawnFrameBuffer = true,
Shear = -Shear,
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
// We will create the white-to-black gradient by modulating transparency and having
// a black backdrop. This results in an sRGB-space gradient and not linear space,
// transitioning from white to black more perceptually uniformly.
new Box
{ {
// We will create the white-to-black gradient by modulating transparency and having RelativeSizeAxes = Axes.Both,
// a black backdrop. This results in an sRGB-space gradient and not linear space, Colour = Color4.Black,
// transitioning from white to black more perceptually uniformly. },
new Box // We use a container, such that we can set the colour gradient to go across the
// vertices of the masked container instead of the vertices of the (larger) sprite.
new Container
{
RelativeSizeAxes = Axes.Both,
ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
Children = new[]
{ {
RelativeSizeAxes = Axes.Both, // Zoomed-in and cropped beatmap background
Colour = Color4.Black, new BeatmapBackgroundSprite(beatmap)
},
// We use a container, such that we can set the colour gradient to go across the
// vertices of the masked container instead of the vertices of the (larger) sprite.
new Container
{
RelativeSizeAxes = Axes.Both,
ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
Children = new[]
{ {
// Zoomed-in and cropped beatmap background Anchor = Anchor.Centre,
new BeatmapBackgroundSprite(beatmap) Origin = Anchor.Centre,
{ FillMode = FillMode.Fill,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
FillMode = FillMode.Fill,
},
}, },
}, },
// Text for beatmap info },
new FillFlowContainer // Text for beatmap info
new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Direction = FillDirection.Vertical,
Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{ {
Anchor = Anchor.BottomLeft, new OsuSpriteText
Origin = Anchor.BottomLeft,
Direction = FillDirection.Vertical,
Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{ {
new OsuSpriteText Font = @"Exo2.0-MediumItalic",
Text = metadata.Artist + " -- " + metadata.Title,
TextSize = 28,
Shadow = true,
},
new OsuSpriteText
{
Font = @"Exo2.0-MediumItalic",
Text = beatmapInfo.Version,
TextSize = 17,
Shadow = true,
},
new FillFlowContainer
{
Margin = new MarginPadding { Top = 10 },
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
Children = new[]
{ {
Font = @"Exo2.0-MediumItalic", new OsuSpriteText
Text = metadata.Artist + " -- " + metadata.Title,
TextSize = 28,
Shadow = true,
},
new OsuSpriteText
{
Font = @"Exo2.0-MediumItalic",
Text = beatmapInfo.Version,
TextSize = 17,
Shadow = true,
},
new FillFlowContainer
{
Margin = new MarginPadding { Top = 10 },
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
Children = new[]
{ {
new OsuSpriteText Font = @"Exo2.0-Medium",
{ Text = "mapped by ",
Font = @"Exo2.0-Medium", TextSize = 15,
Text = "mapped by ", Shadow = true,
TextSize = 15, },
Shadow = true, new OsuSpriteText
}, {
new OsuSpriteText Font = @"Exo2.0-Bold",
{ Text = metadata.Author,
Font = @"Exo2.0-Bold", TextSize = 15,
Text = metadata.Author, Shadow = true,
TextSize = 15, },
Shadow = true, }
}, },
} new FillFlowContainer
}, {
new FillFlowContainer Margin = new MarginPadding { Top = 20 },
{ Spacing = new Vector2(40, 0),
Margin = new MarginPadding { Top = 20 }, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(40, 0), Children = labels
AutoSizeAxes = Axes.Both, },
Children = labels }
}, },
}
},
}
} }
} })
{
Depth = newDepth,
}); });
} }

31
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -141,26 +141,23 @@ namespace osu.Game.Screens.Select.Leaderboards
Padding = new MarginPadding(edge_margin), Padding = new MarginPadding(edge_margin),
Children = new Drawable[] Children = new Drawable[]
{ {
avatar = new DelayedLoadContainer avatar = new DelayedLoadContainer(
new Avatar(Score.User ?? new User { Id = Score.UserID })
{
RelativeSizeAxes = Axes.Both,
CornerRadius = corner_radius,
Masking = true,
OnLoadComplete = d => d.FadeInFromZero(200),
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Radius = 1,
Colour = Color4.Black.Opacity(0.2f),
},
})
{ {
TimeBeforeLoad = 500, TimeBeforeLoad = 500,
FinishedLoading = d => d.FadeInFromZero(200),
Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2), Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
Children = new Drawable[]
{
new Avatar(Score.User ?? new User { Id = Score.UserID })
{
RelativeSizeAxes = Axes.Both,
CornerRadius = corner_radius,
Masking = true,
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Radius = 1,
Colour = Color4.Black.Opacity(0.2f),
},
},
}
}, },
new Container new Container
{ {

4
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -81,10 +81,10 @@ namespace osu.Game.Screens.Select
{ {
if (player != null) return; if (player != null) return;
(player = new PlayerLoader(new Player LoadComponentAsync(player = new PlayerLoader(new Player
{ {
Beatmap = Beatmap, //eagerly set this so it's present before push. Beatmap = Beatmap, //eagerly set this so it's present before push.
})).LoadAsync(Game, l => Push(player)); }), l => Push(player));
} }
} }
} }

10
osu.Game/Users/UpdateableAvatar.cs
View File

@ -40,15 +40,11 @@ namespace osu.Game.Users
{ {
displayedAvatar?.FadeOut(300); displayedAvatar?.FadeOut(300);
displayedAvatar?.Expire(); displayedAvatar?.Expire();
Add(displayedAvatar = new AsyncLoadContainer Add(displayedAvatar = new AsyncLoadContainer(new Avatar(user)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FinishedLoading = d => d.FadeInFromZero(200), OnLoadComplete = d => d.FadeInFromZero(200),
Children = new[] }));
{
new Avatar(user) { RelativeSizeAxes = Axes.Both }
}
});
} }
} }
} }