RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-23 23:33:36 +00:00
Code Issues Packages Projects 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();
new BackgroundScreenDefault { Depth = 10 }.LoadAsync(this, AddInternal);
LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
// Have to construct this here, rather than in the constructor, because
// 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();
versionManager.LoadAsync(this);
LoadComponentAsync(versionManager);
ScreenChanged += s =>
{
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[]
{
new DelayedLoadContainer
{
RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300,
FinishedLoading = d => d.FadeInFromZero(400, EasingTypes.Out),
Children = new[]
new DelayedLoadContainer(
new PanelBackground(beatmap)
{
new PanelBackground(beatmap)
{
RelativeSizeAxes = Axes.Both,
Depth = 1,
}
RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(400, EasingTypes.Out),
}
)
{
TimeBeforeLoad = 300,
},
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.Exited += screenRemoved;
@ -158,27 +158,27 @@ namespace osu.Game
});
//overlay elements
(chat = new ChatOverlay { Depth = 0 }).LoadAsync(this, overlayContent.Add);
(options = new OptionsOverlay { Depth = -1 }).LoadAsync(this, overlayContent.Add);
(musicController = new MusicController
LoadComponentAsync(chat = new ChatOverlay { Depth = 0 }, overlayContent.Add);
LoadComponentAsync(options = new OptionsOverlay { Depth = -1 }, overlayContent.Add);
LoadComponentAsync(musicController = new MusicController
{
Depth = -2,
Position = new Vector2(0, Toolbar.HEIGHT),
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}).LoadAsync(this, overlayContent.Add);
}, overlayContent.Add);
(notificationManager = new NotificationManager
LoadComponentAsync(notificationManager = new NotificationManager
{
Depth = -2,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}).LoadAsync(this, overlayContent.Add);
}, overlayContent.Add);
(dialogOverlay = new DialogOverlay
LoadComponentAsync(dialogOverlay = new DialogOverlay
{
Depth = -4,
}).LoadAsync(this, overlayContent.Add);
}, overlayContent.Add);
Logger.NewEntry += entry =>
{
@ -195,12 +195,12 @@ namespace osu.Game
Dependencies.Cache(notificationManager);
Dependencies.Cache(dialogOverlay);
(Toolbar = new Toolbar
LoadComponentAsync(Toolbar = new Toolbar
{
Depth = -3,
OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
OnPlayModeChange = m => PlayMode.Value = m,
}).LoadAsync(this, t =>
}, t =>
{
PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };
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,
Depth = float.MaxValue,
Children = new[] { new MusicControllerBackground(beatmap) },
FinishedLoading = d =>
OnLoadComplete = d =>
{
switch (direction)
{
@ -370,6 +367,9 @@ namespace osu.Game.Overlays
currentBackground.Expire();
currentBackground = d;
}
})
{
Depth = float.MaxValue,
});
};
}

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

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

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

@ -20,9 +20,9 @@ namespace osu.Game.Screens
private void load(OsuGame game)
{
if (game.IsDeployedBuild)
new Disclaimer().LoadAsync(game, d => Push((Screen)d));
LoadComponentAsync(new Disclaimer(), d => Push((Screen)d));
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]
private void load(OsuGame game, OsuColour colours)
private void load(OsuColour colours)
{
(intro = new Intro()).LoadAsync(game);
LoadComponentAsync(intro = new Intro());
iconColour = colours.Yellow;
}

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

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

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

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(OsuGame game)
{
background.LoadAsync(game);
LoadComponentAsync(background);
buttons.OnSettings = game.ToggleOptions;
@ -67,10 +67,7 @@ namespace osu.Game.Screens.Menu
private void preloadSongSelect()
{
if (songSelect == null)
{
songSelect = new PlaySongSelect();
songSelect.LoadAsync(Game);
}
LoadComponentAsync(songSelect = new PlaySongSelect());
}
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();
newPlayer.LoadAsync(Game, delegate
LoadComponentAsync(newPlayer, delegate
{
newPlayer.RestartCount = RestartCount + 1;
ValidForResume = false;

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

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
Origin = Anchor.Centre,
});
player.LoadAsync(Game);
LoadComponentAsync(player);
}
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)));
}
Add(beatmapInfoContainer = new AsyncLoadContainer
{
FinishedLoading = d =>
{
FadeIn(250);
AlwaysPresent = true;
lastContainer?.FadeOut(250);
lastContainer?.Expire();
},
Depth = newDepth,
RelativeSizeAxes = Axes.Both,
Children = new[]
Add(beatmapInfoContainer = new AsyncLoadContainer(
new BufferedContainer
{
new BufferedContainer
OnLoadComplete = d =>
{
PixelSnapping = true,
CacheDrawnFrameBuffer = true,
Shear = -Shear,
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
FadeIn(250);
lastContainer?.FadeOut(250);
lastContainer?.Expire();
},
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
// a black backdrop. This results in an sRGB-space gradient and not linear space,
// transitioning from white to black more perceptually uniformly.
new Box
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
// 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,
Colour = Color4.Black,
},
// 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
new BeatmapBackgroundSprite(beatmap)
{
// Zoomed-in and cropped beatmap background
new BeatmapBackgroundSprite(beatmap)
{
Anchor = Anchor.Centre,
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,
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
{
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",
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
{
new OsuSpriteText
{
Font = @"Exo2.0-Medium",
Text = "mapped by ",
TextSize = 15,
Shadow = true,
},
new OsuSpriteText
{
Font = @"Exo2.0-Bold",
Text = metadata.Author,
TextSize = 15,
Shadow = true,
},
}
},
new FillFlowContainer
{
Margin = new MarginPadding { Top = 20 },
Spacing = new Vector2(40, 0),
AutoSizeAxes = Axes.Both,
Children = labels
},
}
},
}
Font = @"Exo2.0-Medium",
Text = "mapped by ",
TextSize = 15,
Shadow = true,
},
new OsuSpriteText
{
Font = @"Exo2.0-Bold",
Text = metadata.Author,
TextSize = 15,
Shadow = true,
},
}
},
new FillFlowContainer
{
Margin = new MarginPadding { Top = 20 },
Spacing = new Vector2(40, 0),
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),
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,
FinishedLoading = d => d.FadeInFromZero(200),
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
{

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

@ -81,10 +81,10 @@ namespace osu.Game.Screens.Select
{
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.
})).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?.Expire();
Add(displayedAvatar = new AsyncLoadContainer
Add(displayedAvatar = new AsyncLoadContainer(new Avatar(user)
{
RelativeSizeAxes = Axes.Both,
FinishedLoading = d => d.FadeInFromZero(200),
Children = new[]
{
new Avatar(user) { RelativeSizeAxes = Axes.Both }
}
});
OnLoadComplete = d => d.FadeInFromZero(200),
}));
}
}
}