From 0624f578eb997a4e7d806ed4e0a43e56ea33f49a Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 13 Jul 2017 01:06:46 -0300 Subject: [PATCH] Update with online beatmap changes. --- .../Tests/TestCaseDrawableRoom.cs | 20 ++++++++++++++---- osu.Game/Screens/Multiplayer/DrawableRoom.cs | 21 ++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs index bf7a71a10f..4f4ef9bbb5 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs @@ -49,9 +49,15 @@ namespace osu.Desktop.VisualTests.Tests Title = @"Critical Crystal", Artist = @"Seiryu", }, - OnlineInfo = new BeatmapOnlineInfo + BeatmapSet = new BeatmapSetInfo { - Covers = new[] { @"https://assets.ppy.sh//beatmaps/376340/covers/cover.jpg?1456478455" }, + OnlineInfo = new BeatmapSetOnlineInfo + { + Covers = new BeatmapSetOnlineCovers + { + Cover = @"https://assets.ppy.sh//beatmaps/376340/covers/cover.jpg?1456478455", + }, + }, }, }, }, @@ -81,9 +87,15 @@ namespace osu.Desktop.VisualTests.Tests Title = @"Serendipity", Artist = @"ZAQ", }, - OnlineInfo = new BeatmapOnlineInfo + BeatmapSet = new BeatmapSetInfo { - Covers = new[] { @"https://assets.ppy.sh//beatmaps/526839/covers/cover.jpg?1493815706" }, + OnlineInfo = new BeatmapSetOnlineInfo + { + Covers = new BeatmapSetOnlineCovers + { + Cover = @"https://assets.ppy.sh//beatmaps/526839/covers/cover.jpg?1493815706", + }, + }, }, }, }, diff --git a/osu.Game/Screens/Multiplayer/DrawableRoom.cs b/osu.Game/Screens/Multiplayer/DrawableRoom.cs index f1b8f95d7b..8e17adc490 100644 --- a/osu.Game/Screens/Multiplayer/DrawableRoom.cs +++ b/osu.Game/Screens/Multiplayer/DrawableRoom.cs @@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; +using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Framework.Localisation; using osu.Game.Beatmaps.Drawables; @@ -233,7 +234,7 @@ namespace osu.Game.Screens.Multiplayer coverContainer.FadeIn(transition_duration); coverContainer.Children = new[] { - new AsyncLoadWrapper(new BeatmapBackgroundSprite(new OnlineWorkingBeatmap(value, textures, null)) + new AsyncLoadWrapper(new BeatmapSetBackgroundSprite(value.BeatmapSet) { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -262,5 +263,23 @@ namespace osu.Game.Screens.Multiplayer { participantInfo.Participants = value; } + + private class BeatmapSetBackgroundSprite : Sprite + { + private readonly BeatmapSetInfo set; + public BeatmapSetBackgroundSprite(BeatmapSetInfo set) + { + this.set = set; + } + + [BackgroundDependencyLoader] + private void load(TextureStore textures) + { + string resource = set.OnlineInfo.Covers.Cover; + + if (resource != null) + Texture = textures.Get(resource); + } + } } }