From aec3753863db310227c684e1686eb57c5bc68585 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 3 Jan 2019 13:57:56 +0900 Subject: [PATCH 01/86] Fix imported replays having excess statistics --- .../Scoring/CatchScoreProcessor.cs | 2 +- .../Scoring/ManiaScoreProcessor.cs | 2 +- .../Scoring/OsuScoreProcessor.cs | 2 +- .../Scoring/TaikoScoreProcessor.cs | 2 +- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 2 +- osu.Game/Scoring/Legacy/LegacyScoreParser.cs | 32 ++++++++++++------- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs index 57f4355d6a..54c572bcab 100644 --- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs +++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs @@ -43,6 +43,6 @@ namespace osu.Game.Rulesets.Catch.Scoring Health.Value += Math.Max(result.Judgement.HealthIncreaseFor(result) - hpDrainRate, 0) * harshness; } - protected override HitWindows CreateHitWindows() => new CatchHitWindows(); + public override HitWindows CreateHitWindows() => new CatchHitWindows(); } } diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs index 20a665c314..a053a6be97 100644 --- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs +++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs @@ -159,6 +159,6 @@ namespace osu.Game.Rulesets.Mania.Scoring } } - protected override HitWindows CreateHitWindows() => new ManiaHitWindows(); + public override HitWindows CreateHitWindows() => new ManiaHitWindows(); } } diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs index a24efe4a1e..1a63ff75c4 100644 --- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs +++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs @@ -74,6 +74,6 @@ namespace osu.Game.Rulesets.Osu.Scoring protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(judgement); - protected override HitWindows CreateHitWindows() => new OsuHitWindows(); + public override HitWindows CreateHitWindows() => new OsuHitWindows(); } } diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs index 87481c800d..900a2c8148 100644 --- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs +++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs @@ -67,6 +67,6 @@ namespace osu.Game.Rulesets.Taiko.Scoring Health.Value = 0; } - protected override HitWindows CreateHitWindows() => new TaikoHitWindows(); + public override HitWindows CreateHitWindows() => new TaikoHitWindows(); } } diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index 4b3012192d..576937f94e 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Scoring /// /// Create a for this processor. /// - protected virtual HitWindows CreateHitWindows() => new HitWindows(); + public virtual HitWindows CreateHitWindows() => new HitWindows(); /// /// The current rank. diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs index 3184f776a7..1009e7065e 100644 --- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs +++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs @@ -57,12 +57,20 @@ namespace osu.Game.Scoring.Legacy var countKatu = (int)sr.ReadUInt16(); var countMiss = (int)sr.ReadUInt16(); - score.ScoreInfo.Statistics[HitResult.Great] = count300; - score.ScoreInfo.Statistics[HitResult.Good] = count100; - score.ScoreInfo.Statistics[HitResult.Meh] = count50; - score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki; - score.ScoreInfo.Statistics[HitResult.Ok] = countKatu; - score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + var windows = currentRuleset.CreateRulesetContainerWith(workingBeatmap).CreateScoreProcessor().CreateHitWindows(); + + if (windows.IsHitResultAllowed(HitResult.Great)) + score.ScoreInfo.Statistics[HitResult.Great] = count300; + if (windows.IsHitResultAllowed(HitResult.Good)) + score.ScoreInfo.Statistics[HitResult.Good] = count100; + if (windows.IsHitResultAllowed(HitResult.Meh)) + score.ScoreInfo.Statistics[HitResult.Meh] = count50; + if (windows.IsHitResultAllowed(HitResult.Perfect)) + score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki; + if (windows.IsHitResultAllowed(HitResult.Ok)) + score.ScoreInfo.Statistics[HitResult.Ok] = countKatu; + if (windows.IsHitResultAllowed(HitResult.Miss)) + score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; score.ScoreInfo.TotalScore = sr.ReadInt32(); score.ScoreInfo.MaxCombo = sr.ReadUInt16(); @@ -116,12 +124,12 @@ namespace osu.Game.Scoring.Legacy private void calculateAccuracy(ScoreInfo score) { - int countMiss = score.Statistics[HitResult.Miss]; - int count50 = score.Statistics[HitResult.Meh]; - int count100 = score.Statistics[HitResult.Good]; - int count300 = score.Statistics[HitResult.Great]; - int countGeki = score.Statistics[HitResult.Perfect]; - int countKatu = score.Statistics[HitResult.Ok]; + score.Statistics.TryGetValue(HitResult.Miss, out int countMiss); + score.Statistics.TryGetValue(HitResult.Meh, out int count50); + score.Statistics.TryGetValue(HitResult.Good, out int count100); + score.Statistics.TryGetValue(HitResult.Great, out int count300); + score.Statistics.TryGetValue(HitResult.Perfect, out int countGeki); + score.Statistics.TryGetValue(HitResult.Ok, out int countKatu); switch (score.Ruleset.ID) { From ca5c8d37d1b65902815626f4afe73d244c0a502f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 1 Feb 2019 15:42:15 +0900 Subject: [PATCH 02/86] Use leased bindables --- .../UI/Cursor/GameplayCursor.cs | 2 +- .../Visual/TestCaseEditorComposeTimeline.cs | 2 +- osu.Game.Tests/Visual/TestCaseMatchResults.cs | 2 +- osu.Game/Beatmaps/BindableBeatmap.cs | 7 +- osu.Game/Beatmaps/IBindableBeatmap.cs | 19 ----- .../Containers/BeatSyncedContainer.cs | 2 +- osu.Game/OsuGame.cs | 37 +--------- osu.Game/OsuGameBase.cs | 12 +-- osu.Game/Overlays/Music/PlaylistList.cs | 2 +- osu.Game/Overlays/Music/PlaylistOverlay.cs | 2 +- osu.Game/Overlays/MusicController.cs | 2 +- osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +- osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 2 +- osu.Game/Rulesets/UI/Playfield.cs | 2 +- .../Edit/Components/BottomBarContainer.cs | 2 +- .../Timelines/Summary/Parts/TimelinePart.cs | 2 +- .../Compose/Components/Timeline/Timeline.cs | 2 +- osu.Game/Screens/Edit/Editor.cs | 3 +- osu.Game/Screens/Edit/EditorScreen.cs | 2 +- osu.Game/Screens/IOsuScreen.cs | 11 ++- osu.Game/Screens/Menu/Intro.cs | 8 +- osu.Game/Screens/Menu/LogoVisualisation.cs | 2 +- osu.Game/Screens/Menu/MenuSideFlashes.cs | 2 +- .../Multi/Match/Components/ReadyButton.cs | 2 +- .../Screens/Multi/Match/MatchSubScreen.cs | 8 +- osu.Game/Screens/Multi/Multiplayer.cs | 26 ++++--- .../Screens/Multi/MultiplayerSubScreen.cs | 17 ++++- .../Screens/Multi/Ranking/MatchResults.cs | 6 +- osu.Game/Screens/OsuScreen.cs | 74 ++++++++++++++++--- osu.Game/Screens/Play/PlayerLoader.cs | 2 + .../Play/ScreenWithBeatmapBackground.cs | 2 - osu.Game/Screens/Play/SoloResults.cs | 4 +- osu.Game/Screens/Ranking/Results.cs | 2 +- osu.Game/Screens/Select/MatchSongSelect.cs | 16 ++++ osu.Game/Screens/Select/SongSelect.cs | 26 ++++--- .../Drawables/DrawableStoryboardAnimation.cs | 3 +- .../Drawables/DrawableStoryboardSample.cs | 3 +- .../Drawables/DrawableStoryboardSprite.cs | 3 +- osu.Game/Tests/Visual/OsuTestCase.cs | 2 +- osu.sln.DotSettings | 2 + 40 files changed, 186 insertions(+), 141 deletions(-) delete mode 100644 osu.Game/Beatmaps/IBindableBeatmap.cs diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs index 3fef769174..3167e93923 100644 --- a/osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs +++ b/osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs @@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor } [BackgroundDependencyLoader] - private void load(OsuConfigManager config, IBindableBeatmap beatmap) + private void load(OsuConfigManager config, IBindable beatmap) { InternalChild = expandTarget = new Container { diff --git a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs index 7e6edf78fc..a2f40f1903 100644 --- a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs +++ b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs @@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual } [BackgroundDependencyLoader] - private void load(IAdjustableClock adjustableClock, IBindableBeatmap beatmap) + private void load(IAdjustableClock adjustableClock, IBindable beatmap) { this.adjustableClock = adjustableClock; this.beatmap.BindTo(beatmap); diff --git a/osu.Game.Tests/Visual/TestCaseMatchResults.cs b/osu.Game.Tests/Visual/TestCaseMatchResults.cs index 3ce03cf723..cfba5f7016 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchResults.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchResults.cs @@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual this.room = room; } - protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap, room) }; + protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap.Value, room) }; } private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo diff --git a/osu.Game/Beatmaps/BindableBeatmap.cs b/osu.Game/Beatmaps/BindableBeatmap.cs index bbd0fbfb06..ca03aac685 100644 --- a/osu.Game/Beatmaps/BindableBeatmap.cs +++ b/osu.Game/Beatmaps/BindableBeatmap.cs @@ -12,9 +12,9 @@ namespace osu.Game.Beatmaps { /// /// A for the beatmap. - /// This should be used sparingly in-favour of . + /// This should be used sparingly in-favour of . /// - public abstract class BindableBeatmap : NonNullableBindable, IBindableBeatmap + public abstract class BindableBeatmap : NonNullableBindable { private AudioManager audioManager; private WorkingBeatmap lastBeatmap; @@ -62,9 +62,6 @@ namespace osu.Game.Beatmaps lastBeatmap = beatmap; } - [NotNull] - IBindableBeatmap IBindableBeatmap.GetBoundCopy() => GetBoundCopy(); - /// /// Retrieve a new instance weakly bound to this . /// If you are further binding to events of the retrieved , ensure a local reference is held. diff --git a/osu.Game/Beatmaps/IBindableBeatmap.cs b/osu.Game/Beatmaps/IBindableBeatmap.cs deleted file mode 100644 index 22b7a5a956..0000000000 --- a/osu.Game/Beatmaps/IBindableBeatmap.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using osu.Framework.Configuration; - -namespace osu.Game.Beatmaps -{ - /// - /// Read-only interface for the beatmap. - /// - public interface IBindableBeatmap : IBindable - { - /// - /// Retrieve a new instance weakly bound to this . - /// If you are further binding to events of the retrieved , ensure a local reference is held. - /// - IBindableBeatmap GetBoundCopy(); - } -} diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs index 31eea2cd0c..b929217ae4 100644 --- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs +++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs @@ -74,7 +74,7 @@ namespace osu.Game.Graphics.Containers } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap) + private void load(IBindable beatmap) { Beatmap.BindTo(beatmap); } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index b1f18341d2..3b71324644 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -292,7 +292,7 @@ namespace osu.Game return; } - if ((screenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange != true) + if ((screenStack.CurrentScreen as IOsuScreen)?.DisallowExternalBeatmapRulesetChanges != false) { notifications.Post(new SimpleNotification { @@ -723,46 +723,13 @@ namespace osu.Game { base.UpdateAfterChildren(); - // we only want to apply these restrictions when we are inside a screen stack. - // the use case for not applying is in visual/unit tests. - bool applyBeatmapRulesetRestrictions = !(screenStack.CurrentScreen as IOsuScreen)?.AllowBeatmapRulesetChange ?? false; - - ruleset.Disabled = applyBeatmapRulesetRestrictions; - Beatmap.Disabled = applyBeatmapRulesetRestrictions; - screenContainer.Padding = new MarginPadding { Top = ToolbarOffset }; overlayContent.Padding = new MarginPadding { Top = ToolbarOffset }; MenuCursorContainer.CanShowCursor = (screenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false; } - /// - /// Sets while ignoring any beatmap. - /// - /// The beatmap to set. - public void ForcefullySetBeatmap(WorkingBeatmap beatmap) - { - var beatmapDisabled = Beatmap.Disabled; - - Beatmap.Disabled = false; - Beatmap.Value = beatmap; - Beatmap.Disabled = beatmapDisabled; - } - - /// - /// Sets while ignoring any ruleset restrictions. - /// - /// The beatmap to set. - public void ForcefullySetRuleset(RulesetInfo ruleset) - { - var rulesetDisabled = this.ruleset.Disabled; - - this.ruleset.Disabled = false; - this.ruleset.Value = ruleset; - this.ruleset.Disabled = rulesetDisabled; - } - - protected virtual void ScreenChanged(IScreen lastScreen, IScreen newScreen) + protected virtual void ScreenChanged(IScreen current, IScreen newScreen) { switch (newScreen) { diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 8154466c4f..b6fe20b3a8 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -69,8 +69,9 @@ namespace osu.Game protected override Container Content => content; - private OsuBindableBeatmap beatmap; - protected BindableBeatmap Beatmap => beatmap; + private Bindable beatmap; + + protected Bindable Beatmap => beatmap; private Bindable fpsDisplayVisible; @@ -155,7 +156,6 @@ namespace osu.Game dependencies.CacheAs(API); var defaultBeatmap = new DummyWorkingBeatmap(this); - beatmap = new OsuBindableBeatmap(defaultBeatmap, Audio); dependencies.Cache(RulesetStore = new RulesetStore(contextFactory)); dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage)); @@ -174,8 +174,10 @@ namespace osu.Game // this adds a global reduction of track volume for the time being. Audio.Track.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8)); - dependencies.CacheAs(beatmap); - dependencies.CacheAs(beatmap); + beatmap = new OsuBindableBeatmap(defaultBeatmap, Audio); + + dependencies.CacheAs>(beatmap); + dependencies.CacheAs(beatmap); FileStore.Cleanup(); diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs index b8cf7abd63..b388bb1632 100644 --- a/osu.Game/Overlays/Music/PlaylistList.cs +++ b/osu.Game/Overlays/Music/PlaylistList.cs @@ -73,7 +73,7 @@ namespace osu.Game.Overlays.Music } [BackgroundDependencyLoader] - private void load(BeatmapManager beatmaps, IBindableBeatmap beatmap) + private void load(BeatmapManager beatmaps, IBindable beatmap) { beatmaps.GetAllUsableBeatmapSets().ForEach(b => addBeatmapSet(b, false, false)); beatmaps.ItemAdded += addBeatmapSet; diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs index 7b5a59836f..5b1b7f4da9 100644 --- a/osu.Game/Overlays/Music/PlaylistOverlay.cs +++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs @@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Music private PlaylistList list; [BackgroundDependencyLoader] - private void load(OsuColour colours, BindableBeatmap beatmap, BeatmapManager beatmaps) + private void load(OsuColour colours, Bindable beatmap, BeatmapManager beatmaps) { this.beatmap.BindTo(beatmap); this.beatmaps = beatmaps; diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index a70dc63c50..5218edd7d5 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -66,7 +66,7 @@ namespace osu.Game.Overlays } [BackgroundDependencyLoader] - private void load(BindableBeatmap beatmap, BeatmapManager beatmaps, OsuColour colours) + private void load(Bindable beatmap, BeatmapManager beatmaps, OsuColour colours) { this.beatmap.BindTo(beatmap); this.beatmaps = beatmaps; diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs index 122f74b0b1..635e32d489 100644 --- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs +++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs @@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, IFrameBasedClock framedClock) + private void load(IBindable beatmap, IFrameBasedClock framedClock) { Beatmap.BindTo(beatmap); diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs index cff64bc447..3ab62160cd 100644 --- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs +++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs @@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Edit } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, IAdjustableClock clock) + private void load(IBindable beatmap, IAdjustableClock clock) { this.beatmap.BindTo(beatmap); diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs index f0a0de6604..572f41b7e6 100644 --- a/osu.Game/Rulesets/UI/Playfield.cs +++ b/osu.Game/Rulesets/UI/Playfield.cs @@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.UI private WorkingBeatmap beatmap; [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap) + private void load(IBindable beatmap) { this.beatmap = beatmap.Value; } diff --git a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs index 4d466d743a..726f6d2025 100644 --- a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs +++ b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs @@ -42,7 +42,7 @@ namespace osu.Game.Screens.Edit.Components } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, OsuColour colours) + private void load(IBindable beatmap, OsuColour colours) { Beatmap.BindTo(beatmap); background.Colour = colours.Gray1; diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs index f07fd59afd..edf7baf687 100644 --- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs +++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs @@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap) + private void load(IBindable beatmap) { Beatmap.BindTo(beatmap); } diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs index c0ad53b4bf..b00d0b0b46 100644 --- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs +++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs @@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline private WaveformGraph waveform; [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, IAdjustableClock adjustableClock, OsuColour colours) + private void load(IBindable beatmap, IAdjustableClock adjustableClock, OsuColour colours) { this.adjustableClock = adjustableClock; diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs index ac5ff504a2..b147679cca 100644 --- a/osu.Game/Screens/Edit/Editor.cs +++ b/osu.Game/Screens/Edit/Editor.cs @@ -29,7 +29,8 @@ namespace osu.Game.Screens.Edit protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4"); public override bool HideOverlaysOnEnter => true; - public override bool AllowBeatmapRulesetChange => false; + + public override bool DisallowExternalBeatmapRulesetChanges => true; private Box bottomBackground; private Container screenContainer; diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs index ededd90a14..bfe0423c8a 100644 --- a/osu.Game/Screens/Edit/EditorScreen.cs +++ b/osu.Game/Screens/Edit/EditorScreen.cs @@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap) + private void load(IBindable beatmap) { Beatmap.BindTo(beatmap); } diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs index 532d4963a0..f256760a0a 100644 --- a/osu.Game/Screens/IOsuScreen.cs +++ b/osu.Game/Screens/IOsuScreen.cs @@ -1,8 +1,11 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.Configuration; using osu.Framework.Screens; +using osu.Game.Beatmaps; using osu.Game.Overlays; +using osu.Game.Rulesets; namespace osu.Game.Screens { @@ -12,9 +15,7 @@ namespace osu.Game.Screens /// Whether the beatmap or ruleset should be allowed to be changed by the user or game. /// Used to mark exclusive areas where this is strongly prohibited, like gameplay. /// - bool AllowBeatmapRulesetChange { get; } - - bool AllowExternalScreenChange { get; } + bool DisallowExternalBeatmapRulesetChanges { get; } /// /// Whether this allows the cursor to be displayed. @@ -35,5 +36,9 @@ namespace osu.Game.Screens /// The amount of parallax to be applied while this screen is displayed. /// float BackgroundParallaxAmount { get; } + + Bindable Beatmap { get; } + + Bindable Ruleset { get; } } } diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 3a347342d7..10cfc4a299 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -28,8 +28,6 @@ namespace osu.Game.Screens.Menu /// public bool DidLoadMenu; - private readonly Bindable beatmap = new Bindable(); - private MainMenu mainMenu; private SampleChannel welcome; private SampleChannel seeya; @@ -47,10 +45,8 @@ namespace osu.Game.Screens.Menu private WorkingBeatmap introBeatmap; [BackgroundDependencyLoader] - private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, BindableBeatmap beatmap) + private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game) { - this.beatmap.BindTo(beatmap); - menuVoice = config.GetBindable(OsuSetting.MenuVoice); menuMusic = config.GetBindable(OsuSetting.MenuMusic); @@ -95,7 +91,7 @@ namespace osu.Game.Screens.Menu if (!resuming) { - beatmap.Value = introBeatmap; + Beatmap.Value = introBeatmap; if (menuVoice) welcome.Play(); diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs index a87b7aea40..2534c57b1e 100644 --- a/osu.Game/Screens/Menu/LogoVisualisation.cs +++ b/osu.Game/Screens/Menu/LogoVisualisation.cs @@ -74,7 +74,7 @@ namespace osu.Game.Screens.Menu } [BackgroundDependencyLoader] - private void load(ShaderManager shaders, IBindableBeatmap beatmap) + private void load(ShaderManager shaders, IBindable beatmap) { this.beatmap.BindTo(beatmap); shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED); diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs index 40ae8a25c5..7288cc8db5 100644 --- a/osu.Game/Screens/Menu/MenuSideFlashes.cs +++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs @@ -42,7 +42,7 @@ namespace osu.Game.Screens.Menu } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, OsuColour colours) + private void load(IBindable beatmap, OsuColour colours) { this.beatmap.BindTo(beatmap); diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs index 1bde6270f6..e2733b0cf8 100644 --- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs +++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs @@ -19,7 +19,7 @@ namespace osu.Game.Screens.Multi.Match.Components private readonly Room room; [Resolved] - private IBindableBeatmap gameBeatmap { get; set; } + private IBindable gameBeatmap { get; set; } [Resolved] private BeatmapManager beatmaps { get; set; } diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 980f321c92..a1346c9615 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -20,7 +20,7 @@ namespace osu.Game.Screens.Multi.Match { public class MatchSubScreen : MultiplayerSubScreen { - public override bool AllowBeatmapRulesetChange => false; + public override bool DisallowExternalBeatmapRulesetChanges => true; public override string Title => room.RoomID.Value == null ? "New room" : room.Name.Value; public override string ShortTitle => "room"; @@ -167,7 +167,7 @@ namespace osu.Game.Screens.Multi.Match // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID); - Game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); + Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); } private void setRuleset(RulesetInfo ruleset) @@ -175,7 +175,7 @@ namespace osu.Game.Screens.Multi.Match if (ruleset == null) return; - Game?.ForcefullySetRuleset(ruleset); + Ruleset.Value = ruleset; } private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => @@ -190,7 +190,7 @@ namespace osu.Game.Screens.Multi.Match var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == bindings.CurrentBeatmap.Value.OnlineBeatmapID); if (localBeatmap != null) - Game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); + Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); }); private void addPlaylistItem(PlaylistItem item) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 1741ac0b7b..d9a2fb7507 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -18,6 +18,7 @@ using osu.Game.Online.API; using osu.Game.Online.Multiplayer; using osu.Game.Overlays; using osu.Game.Overlays.BeatmapSet.Buttons; +using osu.Game.Rulesets; using osu.Game.Screens.Menu; using osu.Game.Screens.Multi.Lounge; using osu.Game.Screens.Multi.Match; @@ -28,9 +29,9 @@ namespace osu.Game.Screens.Multi [Cached] public class Multiplayer : CompositeDrawable, IOsuScreen, IOnlineComponent { - public bool AllowBeatmapRulesetChange => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.AllowBeatmapRulesetChange ?? true; - public bool AllowExternalScreenChange => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.AllowExternalScreenChange ?? true; - public bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.AllowExternalScreenChange ?? true; + public bool DisallowExternalBeatmapRulesetChanges => false; + + public bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true; public bool HideOverlaysOnEnter => false; public OverlayActivation InitialOverlayActivationMode => OverlayActivation.All; @@ -51,9 +52,6 @@ namespace osu.Game.Screens.Multi [Cached(Type = typeof(IRoomManager))] private RoomManager roomManager; - [Resolved] - private IBindableBeatmap beatmap { get; set; } - [Resolved] private OsuGameBase game { get; set; } @@ -63,6 +61,14 @@ namespace osu.Game.Screens.Multi [Resolved(CanBeNull = true)] private OsuLogo logo { get; set; } + public Bindable Beatmap => screenDependencies.Beatmap; + + public Bindable Ruleset => screenDependencies.Ruleset; + + private OsuScreenDependencies screenDependencies; + + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); + public Multiplayer() { Anchor = Anchor.Centre; @@ -182,6 +188,8 @@ namespace osu.Game.Screens.Multi { waves.Hide(); + screenDependencies.Dispose(); + this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut(); cancelLooping(); @@ -218,7 +226,7 @@ namespace osu.Game.Screens.Multi private void cancelLooping() { - var track = beatmap.Value.Track; + var track = Beatmap.Value.Track; if (track != null) track.Looping = false; } @@ -231,7 +239,7 @@ namespace osu.Game.Screens.Multi if (screenStack.CurrentScreen is MatchSubScreen) { - var track = beatmap.Value.Track; + var track = Beatmap.Value.Track; if (track != null) { track.Looping = true; @@ -239,7 +247,7 @@ namespace osu.Game.Screens.Multi if (!track.IsRunning) { game.Audio.AddItemToList(track); - track.Seek(beatmap.Value.Metadata.PreviewTime); + track.Seek(Beatmap.Value.Metadata.PreviewTime); track.Start(); } } diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs index ddea4d5dad..1d6561622a 100644 --- a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs +++ b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input.Bindings; @@ -10,13 +11,14 @@ using osu.Game.Beatmaps; using osu.Game.Graphics.Containers; using osu.Game.Input.Bindings; using osu.Game.Overlays; +using osu.Game.Rulesets; namespace osu.Game.Screens.Multi { public abstract class MultiplayerSubScreen : CompositeDrawable, IMultiplayerSubScreen, IKeyBindingHandler { - public virtual bool AllowBeatmapRulesetChange => true; - public bool AllowExternalScreenChange => true; + public virtual bool DisallowExternalBeatmapRulesetChanges => false; + public bool CursorVisible => true; public bool HideOverlaysOnEnter => false; @@ -32,8 +34,13 @@ namespace osu.Game.Screens.Multi public abstract string Title { get; } public virtual string ShortTitle => Title; - [Resolved] - protected IBindableBeatmap Beatmap { get; private set; } + public Bindable Beatmap => screenDependencies.Beatmap; + + public Bindable Ruleset => screenDependencies.Ruleset; + + private OsuScreenDependencies screenDependencies; + + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); [Resolved(CanBeNull = true)] protected OsuGame Game { get; private set; } @@ -60,6 +67,8 @@ namespace osu.Game.Screens.Multi this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); this.MoveToX(200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); + screenDependencies.Dispose(); + return false; } diff --git a/osu.Game/Screens/Multi/Ranking/MatchResults.cs b/osu.Game/Screens/Multi/Ranking/MatchResults.cs index d14d94928d..4e00b7853b 100644 --- a/osu.Game/Screens/Multi/Ranking/MatchResults.cs +++ b/osu.Game/Screens/Multi/Ranking/MatchResults.cs @@ -22,9 +22,9 @@ namespace osu.Game.Screens.Multi.Ranking protected override IEnumerable CreateResultPages() => new IResultPageInfo[] { - new ScoreOverviewPageInfo(Score, Beatmap), - new LocalLeaderboardPageInfo(Score, Beatmap), - new RoomLeaderboardPageInfo(Score, Beatmap, room), + new ScoreOverviewPageInfo(Score, Beatmap.Value), + new LocalLeaderboardPageInfo(Score, Beatmap.Value), + new RoomLeaderboardPageInfo(Score, Beatmap.Value, room), }; } } diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index ba5c7b2f0a..bfed4345f1 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using System; using Microsoft.EntityFrameworkCore.Internal; using osu.Framework.Allocation; using osu.Framework.Audio; @@ -50,15 +51,23 @@ namespace osu.Game.Screens protected new OsuGameBase Game => base.Game as OsuGameBase; - public virtual bool AllowBeatmapRulesetChange => true; - protected readonly Bindable Beatmap = new Bindable(); + /// + /// Disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children). + /// + public virtual bool DisallowExternalBeatmapRulesetChanges => false; + + private SampleChannel sampleExit; public virtual float BackgroundParallaxAmount => 1; - protected readonly Bindable Ruleset = new Bindable(); + public Bindable Beatmap => screenDependencies.Beatmap; - private SampleChannel sampleExit; + public Bindable Ruleset => screenDependencies.Ruleset; + + private OsuScreenDependencies screenDependencies; + + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); protected BackgroundScreen Background => backgroundStack?.CurrentScreen as BackgroundScreen; @@ -77,11 +86,8 @@ namespace osu.Game.Screens } [BackgroundDependencyLoader(true)] - private void load(BindableBeatmap beatmap, OsuGame osu, AudioManager audio, Bindable ruleset) + private void load(OsuGame osu, AudioManager audio) { - Beatmap.BindTo(beatmap); - Ruleset.BindTo(ruleset); - sampleExit = audio.Sample.Get(@"UI/screen-back"); } @@ -134,7 +140,8 @@ namespace osu.Game.Screens if (localBackground != null && backgroundStack?.CurrentScreen == localBackground) backgroundStack?.Exit(); - Beatmap.UnbindAll(); + screenDependencies.Dispose(); + return false; } @@ -201,4 +208,53 @@ namespace osu.Game.Screens /// protected virtual BackgroundScreen CreateBackground() => null; } + + public class OsuScreenDependencies : DependencyContainer, IDisposable + { + private readonly bool leaseOwner; + + public Bindable Beatmap { get; private set; } + + public Bindable Ruleset { get; private set; } + + public OsuScreenDependencies(bool requireLease, IReadOnlyDependencyContainer parent) + : base(parent) + { + if (requireLease) + { + Beatmap = parent.Get>()?.GetBoundCopy(); + if (Beatmap == null) + { + leaseOwner = true; + Cache(Beatmap = parent.Get>().BeginLease(true)); + } + + Ruleset = parent.Get>()?.GetBoundCopy(); + if (Ruleset == null) + { + leaseOwner = true; + Cache(Ruleset = parent.Get>().BeginLease(true)); + } + } + else + { + Beatmap = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); + Ruleset = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); + } + } + + public void Dispose() + { + if (leaseOwner) + { + ((LeasedBindable)Beatmap).Return(); + ((LeasedBindable)Ruleset).Return(); + } + else + { + Beatmap.UnbindAll(); + Ruleset.UnbindAll(); + } + } + } } diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 58e59604dd..c55c05f61c 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -37,6 +37,8 @@ namespace osu.Game.Screens.Play private bool hideOverlays; public override bool HideOverlaysOnEnter => hideOverlays; + public override bool DisallowExternalBeatmapRulesetChanges => true; + private Task loadTask; public PlayerLoader(Func createPlayer) diff --git a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs index 93ec7347c8..7e01a84da2 100644 --- a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs +++ b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs @@ -18,8 +18,6 @@ namespace osu.Game.Screens.Play protected new BackgroundScreenBeatmap Background => base.Background as BackgroundScreenBeatmap; - public override bool AllowBeatmapRulesetChange => false; - protected const float BACKGROUND_FADE_DURATION = 800; protected float BackgroundOpacity => 1 - (float)DimLevel; diff --git a/osu.Game/Screens/Play/SoloResults.cs b/osu.Game/Screens/Play/SoloResults.cs index 54392abe61..2b9aec257c 100644 --- a/osu.Game/Screens/Play/SoloResults.cs +++ b/osu.Game/Screens/Play/SoloResults.cs @@ -17,8 +17,8 @@ namespace osu.Game.Screens.Play protected override IEnumerable CreateResultPages() => new IResultPageInfo[] { - new ScoreOverviewPageInfo(Score, Beatmap), - new LocalLeaderboardPageInfo(Score, Beatmap) + new ScoreOverviewPageInfo(Score, Beatmap.Value), + new LocalLeaderboardPageInfo(Score, Beatmap.Value) }; } } diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs index 31863cea9b..a70d6bd87f 100644 --- a/osu.Game/Screens/Ranking/Results.cs +++ b/osu.Game/Screens/Ranking/Results.cs @@ -32,7 +32,7 @@ namespace osu.Game.Screens.Ranking private ResultModeTabControl modeChangeButtons; - public override bool AllowBeatmapRulesetChange => false; + public override bool DisallowExternalBeatmapRulesetChanges => true; protected readonly ScoreInfo Score; diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs index 298e936c1c..cfeaa1785e 100644 --- a/osu.Game/Screens/Select/MatchSongSelect.cs +++ b/osu.Game/Screens/Select/MatchSongSelect.cs @@ -40,5 +40,21 @@ namespace osu.Game.Screens.Select return true; } + + public override bool OnExiting(IScreen next) + { + Beatmap.Disabled = true; + Ruleset.Disabled = true; + + return base.OnExiting(next); + } + + public override void OnEntering(IScreen last) + { + base.OnEntering(last); + + Beatmap.Disabled = false; + Ruleset.Disabled = false; + } } } diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index d800cea736..5b25cc9db7 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -77,7 +77,7 @@ namespace osu.Game.Screens.Select protected readonly BeatmapDetailArea BeatmapDetails; - protected new readonly Bindable Ruleset = new Bindable(); + private readonly Bindable decoupledRuleset = new Bindable(); [Cached] [Cached(Type = typeof(IBindable>))] @@ -267,8 +267,8 @@ namespace osu.Game.Screens.Select { dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); dependencies.CacheAs(this); - dependencies.CacheAs(Ruleset); - dependencies.CacheAs>(Ruleset); + dependencies.CacheAs(decoupledRuleset); + dependencies.CacheAs>(decoupledRuleset); return dependencies; } @@ -333,9 +333,9 @@ namespace osu.Game.Screens.Select if (this.IsCurrentScreen() && !Carousel.SelectBeatmap(beatmap?.BeatmapInfo, false)) // If selecting new beatmap without bypassing filters failed, there's possibly a ruleset mismatch - if (beatmap?.BeatmapInfo?.Ruleset != null && beatmap.BeatmapInfo.Ruleset != Ruleset.Value) + if (beatmap?.BeatmapInfo?.Ruleset != null && beatmap.BeatmapInfo.Ruleset != decoupledRuleset.Value) { - base.Ruleset.Value = beatmap.BeatmapInfo.Ruleset; + Ruleset.Value = beatmap.BeatmapInfo.Ruleset; Carousel.SelectBeatmap(beatmap.BeatmapInfo); } } @@ -376,12 +376,12 @@ namespace osu.Game.Screens.Select bool preview = false; - if (ruleset?.Equals(Ruleset.Value) == false) + if (ruleset?.Equals(decoupledRuleset.Value) == false) { - Logger.Log($"ruleset changed from \"{Ruleset.Value}\" to \"{ruleset}\""); + Logger.Log($"ruleset changed from \"{decoupledRuleset.Value}\" to \"{ruleset}\""); Beatmap.Value.Mods.Value = Enumerable.Empty(); - Ruleset.Value = ruleset; + decoupledRuleset.Value = ruleset; // force a filter before attempting to change the beatmap. // we may still be in the wrong ruleset as there is a debounce delay on ruleset changes. @@ -538,7 +538,7 @@ namespace osu.Game.Screens.Select { base.Dispose(isDisposing); - Ruleset.UnbindAll(); + decoupledRuleset.UnbindAll(); if (beatmaps != null) { @@ -599,9 +599,11 @@ namespace osu.Game.Screens.Select if (rulesetNoDebounce == null) { // manual binding to parent ruleset to allow for delayed load in the incoming direction. - rulesetNoDebounce = Ruleset.Value = base.Ruleset.Value; - base.Ruleset.ValueChanged += updateSelectedRuleset; - Ruleset.ValueChanged += r => base.Ruleset.Value = r; + rulesetNoDebounce = decoupledRuleset.Value = Ruleset.Value; + Ruleset.ValueChanged += updateSelectedRuleset; + + decoupledRuleset.ValueChanged += r => Ruleset.Value = r; + decoupledRuleset.DisabledChanged += r => Ruleset.Disabled = r; Beatmap.BindDisabledChanged(disabled => Carousel.AllowSelection = !disabled, true); Beatmap.BindValueChanged(workingBeatmapChanged); diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs index 22175cf24b..94bb4f2525 100644 --- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs +++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs @@ -3,6 +3,7 @@ using osuTK; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Animations; using osu.Framework.Graphics.Textures; @@ -63,7 +64,7 @@ namespace osu.Game.Storyboards.Drawables } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, TextureStore textureStore) + private void load(IBindable beatmap, TextureStore textureStore) { var basePath = Animation.Path.ToLowerInvariant(); for (var frame = 0; frame < Animation.FrameCount; frame++) diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs index e94a03fc16..1591823bc1 100644 --- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs +++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs @@ -4,6 +4,7 @@ using System.IO; using osu.Framework.Allocation; using osu.Framework.Audio.Sample; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Game.Beatmaps; @@ -28,7 +29,7 @@ namespace osu.Game.Storyboards.Drawables } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap) + private void load(IBindable beatmap) { // Try first with the full name, then attempt with no path channel = beatmap.Value.Skin.GetSample(sample.Path) ?? beatmap.Value.Skin.GetSample(Path.ChangeExtension(sample.Path, null)); diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs index f904d7cc28..05cde37eb7 100644 --- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs +++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs @@ -3,6 +3,7 @@ using osuTK; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; @@ -62,7 +63,7 @@ namespace osu.Game.Storyboards.Drawables } [BackgroundDependencyLoader] - private void load(IBindableBeatmap beatmap, TextureStore textureStore) + private void load(IBindable beatmap, TextureStore textureStore) { var spritePath = Sprite.Path.ToLowerInvariant(); var path = beatmap.Value.BeatmapSetInfo.Files.Find(f => f.Filename.ToLowerInvariant() == spritePath)?.FileInfo.StoragePath; diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs index 8a723ec647..3dfcd0febd 100644 --- a/osu.Game/Tests/Visual/OsuTestCase.cs +++ b/osu.Game/Tests/Visual/OsuTestCase.cs @@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual beatmap.Default = new DummyWorkingBeatmap(Dependencies.Get()); Dependencies.CacheAs(beatmap); - Dependencies.CacheAs(beatmap); + Dependencies.CacheAs>(beatmap); Dependencies.CacheAs(Ruleset); Dependencies.CacheAs>(Ruleset); diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings index 3f5bd9d34d..5efd16c357 100644 --- a/osu.sln.DotSettings +++ b/osu.sln.DotSettings @@ -68,6 +68,7 @@ HINT HINT HINT + HINT HINT WARNING WARNING @@ -204,6 +205,7 @@ HID HUD ID + IL IP IPC LTRB From 4c866e7940fe35beb88399b122ede5ceb874dbea Mon Sep 17 00:00:00 2001 From: Roman Kapustin Date: Fri, 1 Feb 2019 22:37:27 +0300 Subject: [PATCH 03/86] Add PlaylistItemHandle.HandlePositionalInput override --- osu.Game/Overlays/Music/PlaylistItem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs index 910f7698c0..7c7b78afc7 100644 --- a/osu.Game/Overlays/Music/PlaylistItem.cs +++ b/osu.Game/Overlays/Music/PlaylistItem.cs @@ -169,6 +169,8 @@ namespace osu.Game.Overlays.Music Alpha = 0f; Margin = new MarginPadding { Left = 5, Top = 2 }; } + + public override bool HandlePositionalInput => IsPresent; } } From e01f342ab0b01799792310fa3679a15ca590d0e2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 2 Feb 2019 17:11:25 +0900 Subject: [PATCH 04/86] wip --- osu.Game/Screens/Multi/Multiplayer.cs | 16 +++-- .../Screens/Multi/MultiplayerSubScreen.cs | 16 +++-- osu.Game/Screens/OsuScreen.cs | 67 +++---------------- osu.Game/Screens/OsuScreenDependencies.cs | 41 ++++++++++++ 4 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 osu.Game/Screens/OsuScreenDependencies.cs diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index d9a2fb7507..6bd47ff810 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -61,13 +61,19 @@ namespace osu.Game.Screens.Multi [Resolved(CanBeNull = true)] private OsuLogo logo { get; set; } - public Bindable Beatmap => screenDependencies.Beatmap; + public Bindable Beatmap { get; set; } - public Bindable Ruleset => screenDependencies.Ruleset; + public Bindable Ruleset { get; set; } - private OsuScreenDependencies screenDependencies; + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); + Beatmap = deps.Beatmap; + Ruleset = deps.Ruleset; + + return deps; + } public Multiplayer() { @@ -188,8 +194,6 @@ namespace osu.Game.Screens.Multi { waves.Hide(); - screenDependencies.Dispose(); - this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut(); cancelLooping(); diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs index 1d6561622a..b0d89c9bba 100644 --- a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs +++ b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs @@ -34,13 +34,19 @@ namespace osu.Game.Screens.Multi public abstract string Title { get; } public virtual string ShortTitle => Title; - public Bindable Beatmap => screenDependencies.Beatmap; + public Bindable Beatmap { get; set; } - public Bindable Ruleset => screenDependencies.Ruleset; + public Bindable Ruleset { get; set; } - private OsuScreenDependencies screenDependencies; + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); + Beatmap = deps.Beatmap; + Ruleset = deps.Ruleset; + + return deps; + } [Resolved(CanBeNull = true)] protected OsuGame Game { get; private set; } @@ -67,8 +73,6 @@ namespace osu.Game.Screens.Multi this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); this.MoveToX(200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); - screenDependencies.Dispose(); - return false; } diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index bfed4345f1..86f1f3a9d9 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -1,7 +1,6 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System; using Microsoft.EntityFrameworkCore.Internal; using osu.Framework.Allocation; using osu.Framework.Audio; @@ -51,7 +50,6 @@ namespace osu.Game.Screens protected new OsuGameBase Game => base.Game as OsuGameBase; - /// /// Disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children). /// @@ -61,13 +59,19 @@ namespace osu.Game.Screens public virtual float BackgroundParallaxAmount => 1; - public Bindable Beatmap => screenDependencies.Beatmap; + public Bindable Beatmap { get; set; } - public Bindable Ruleset => screenDependencies.Ruleset; + public Bindable Ruleset { get; set; } - private OsuScreenDependencies screenDependencies; + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); + Beatmap = deps.Beatmap; + Ruleset = deps.Ruleset; + + return deps; + } protected BackgroundScreen Background => backgroundStack?.CurrentScreen as BackgroundScreen; @@ -140,8 +144,6 @@ namespace osu.Game.Screens if (localBackground != null && backgroundStack?.CurrentScreen == localBackground) backgroundStack?.Exit(); - screenDependencies.Dispose(); - return false; } @@ -208,53 +210,4 @@ namespace osu.Game.Screens /// protected virtual BackgroundScreen CreateBackground() => null; } - - public class OsuScreenDependencies : DependencyContainer, IDisposable - { - private readonly bool leaseOwner; - - public Bindable Beatmap { get; private set; } - - public Bindable Ruleset { get; private set; } - - public OsuScreenDependencies(bool requireLease, IReadOnlyDependencyContainer parent) - : base(parent) - { - if (requireLease) - { - Beatmap = parent.Get>()?.GetBoundCopy(); - if (Beatmap == null) - { - leaseOwner = true; - Cache(Beatmap = parent.Get>().BeginLease(true)); - } - - Ruleset = parent.Get>()?.GetBoundCopy(); - if (Ruleset == null) - { - leaseOwner = true; - Cache(Ruleset = parent.Get>().BeginLease(true)); - } - } - else - { - Beatmap = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); - Ruleset = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); - } - } - - public void Dispose() - { - if (leaseOwner) - { - ((LeasedBindable)Beatmap).Return(); - ((LeasedBindable)Ruleset).Return(); - } - else - { - Beatmap.UnbindAll(); - Ruleset.UnbindAll(); - } - } - } } diff --git a/osu.Game/Screens/OsuScreenDependencies.cs b/osu.Game/Screens/OsuScreenDependencies.cs new file mode 100644 index 0000000000..1c355d6320 --- /dev/null +++ b/osu.Game/Screens/OsuScreenDependencies.cs @@ -0,0 +1,41 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Game.Beatmaps; +using osu.Game.Rulesets; + +namespace osu.Game.Screens +{ + public class OsuScreenDependencies : DependencyContainer + { + public Bindable Beatmap { get; } + + public Bindable Ruleset { get; } + + public OsuScreenDependencies(bool requireLease, IReadOnlyDependencyContainer parent) + : base(parent) + { + if (requireLease) + { + Beatmap = parent.Get>()?.GetBoundCopy(); + if (Beatmap == null) + { + Cache(Beatmap = parent.Get>().BeginLease(true)); + } + + Ruleset = parent.Get>()?.GetBoundCopy(); + if (Ruleset == null) + { + Cache(Ruleset = parent.Get>().BeginLease(true)); + } + } + else + { + Beatmap = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); + Ruleset = (parent.Get>() ?? parent.Get>()).GetBoundCopy(); + } + } + } +} \ No newline at end of file From 257321b500d51307404774e552184a3a41392b85 Mon Sep 17 00:00:00 2001 From: Joehu Date: Sat, 2 Feb 2019 12:26:23 -0800 Subject: [PATCH 05/86] Move regular issue template to .github --- ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%) diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md similarity index 100% rename from ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE.md From 3b529b7bda22119a6102a356d9a0422182b99f5b Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Sun, 3 Feb 2019 14:34:04 +0300 Subject: [PATCH 06/86] Enable the sidebar and move "back" button to the key binding overlay --- osu.Game/Overlays/KeyBindingOverlay.cs | 83 +++++++++++++++++++++++- osu.Game/Overlays/MainSettings.cs | 89 +------------------------- 2 files changed, 85 insertions(+), 87 deletions(-) diff --git a/osu.Game/Overlays/KeyBindingOverlay.cs b/osu.Game/Overlays/KeyBindingOverlay.cs index 38ac83f041..bd3bb3b9de 100644 --- a/osu.Game/Overlays/KeyBindingOverlay.cs +++ b/osu.Game/Overlays/KeyBindingOverlay.cs @@ -3,10 +3,17 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; +using osu.Framework.Input.Bindings; +using osu.Framework.Input.Events; +using osu.Game.Graphics; +using osu.Game.Graphics.Containers; +using osu.Game.Graphics.Sprites; using osu.Game.Input.Bindings; using osu.Game.Overlays.KeyBinding; using osu.Game.Overlays.Settings; using osu.Game.Rulesets; +using osu.Game.Screens.Ranking; +using osuTK; namespace osu.Game.Overlays { @@ -21,11 +28,85 @@ namespace osu.Game.Overlays foreach (var ruleset in rulesets.AvailableRulesets) AddSection(new RulesetBindingsSection(ruleset)); + + AddInternal(new BackButton + { + Anchor = Anchor.BottomLeft, + Origin = Anchor.BottomLeft, + Action = () => Hide() + }); } public KeyBindingOverlay() - : base(false) + : base(true) { } + + private class BackButton : OsuClickableContainer, IKeyBindingHandler + { + private AspectContainer aspect; + + [BackgroundDependencyLoader] + private void load() + { + Size = new Vector2(Sidebar.DEFAULT_WIDTH); + Children = new Drawable[] + { + aspect = new AspectContainer + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + RelativeSizeAxes = Axes.Y, + Children = new Drawable[] + { + new SpriteIcon + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + Y = -15, + Size = new Vector2(15), + Shadow = true, + Icon = FontAwesome.fa_chevron_left + }, + new OsuSpriteText + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + Y = 15, + TextSize = 12, + Font = @"Exo2.0-Bold", + Text = @"back", + }, + } + } + }; + } + + protected override bool OnMouseDown(MouseDownEvent e) + { + aspect.ScaleTo(0.75f, 2000, Easing.OutQuint); + return base.OnMouseDown(e); + } + + protected override bool OnMouseUp(MouseUpEvent e) + { + aspect.ScaleTo(1, 1000, Easing.OutElastic); + return base.OnMouseUp(e); + } + + public bool OnPressed(GlobalAction action) + { + switch (action) + { + case GlobalAction.Back: + Click(); + return true; + } + + return false; + } + + public bool OnReleased(GlobalAction action) => false; + } } } diff --git a/osu.Game/Overlays/MainSettings.cs b/osu.Game/Overlays/MainSettings.cs index 68fa651dfa..62a2ee6fe3 100644 --- a/osu.Game/Overlays/MainSettings.cs +++ b/osu.Game/Overlays/MainSettings.cs @@ -22,7 +22,6 @@ namespace osu.Game.Overlays public class MainSettings : SettingsOverlay { private readonly KeyBindingOverlay keyBindingOverlay; - private BackButton backButton; protected override IEnumerable CreateSections() => new SettingsSection[] { @@ -53,8 +52,6 @@ namespace osu.Game.Overlays public override bool AcceptsFocus => keyBindingOverlay.State != Visibility.Visible; - private const float hidden_width = 120; - private void keyBindingOverlay_StateChanged(Visibility visibility) { switch (visibility) @@ -64,9 +61,7 @@ namespace osu.Game.Overlays Sidebar?.FadeColour(Color4.DarkGray, 300, Easing.OutQuint); SectionsContainer.FadeOut(300, Easing.OutQuint); - ContentContainer.MoveToX(hidden_width - WIDTH, 500, Easing.OutQuint); - - backButton.Delay(100).FadeIn(100); + ContentContainer.MoveToX(-WIDTH, 500, Easing.OutQuint); break; case Visibility.Hidden: Background.FadeTo(0.6f, 500, Easing.OutQuint); @@ -74,94 +69,16 @@ namespace osu.Game.Overlays SectionsContainer.FadeIn(500, Easing.OutQuint); ContentContainer.MoveToX(0, 500, Easing.OutQuint); - - backButton.FadeOut(100); break; } } - protected override float ExpandedPosition => keyBindingOverlay.State == Visibility.Visible ? hidden_width - WIDTH : base.ExpandedPosition; + protected override float ExpandedPosition => keyBindingOverlay.State == Visibility.Visible ? -WIDTH : base.ExpandedPosition; [BackgroundDependencyLoader] private void load() { ContentContainer.Add(keyBindingOverlay); - - ContentContainer.Add(backButton = new BackButton - { - Alpha = 0, - Width = hidden_width, - RelativeSizeAxes = Axes.Y, - Anchor = Anchor.CentreRight, - Origin = Anchor.CentreRight, - Action = () => keyBindingOverlay.Hide() - }); - } - - private class BackButton : OsuClickableContainer, IKeyBindingHandler - { - private AspectContainer aspect; - - [BackgroundDependencyLoader] - private void load() - { - Children = new Drawable[] - { - aspect = new AspectContainer - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - RelativeSizeAxes = Axes.Y, - Children = new Drawable[] - { - new SpriteIcon - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Y = -15, - Size = new Vector2(15), - Shadow = true, - Icon = FontAwesome.fa_chevron_left - }, - new OsuSpriteText - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Y = 15, - TextSize = 12, - Font = @"Exo2.0-Bold", - Text = @"back", - }, - } - } - }; - } - - protected override bool OnMouseDown(MouseDownEvent e) - { - aspect.ScaleTo(0.75f, 2000, Easing.OutQuint); - return base.OnMouseDown(e); - } - - protected override bool OnMouseUp(MouseUpEvent e) - { - aspect.ScaleTo(1, 1000, Easing.OutElastic); - return base.OnMouseUp(e); - } - - public bool OnPressed(GlobalAction action) - { - switch (action) - { - case GlobalAction.Back: - Click(); - return true; - } - - return false; - } - - public bool OnReleased(GlobalAction action) => false; - } + } } } From ead28e71023e0875d4eb55d39de6e48779f7125c Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 Feb 2019 12:34:38 +0100 Subject: [PATCH 07/86] stop logging keyboard events from password textbox --- osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs | 3 ++- osu.Game/osu.Game.csproj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs index 81690f3728..aeb974681d 100644 --- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs +++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs @@ -9,12 +9,13 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Shapes; +using osu.Framework.Input; using osu.Framework.Input.Events; using osu.Framework.Platform; namespace osu.Game.Graphics.UserInterface { - public class OsuPasswordTextBox : OsuTextBox + public class OsuPasswordTextBox : OsuTextBox, ISuppressKeyEventLogging { protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize); diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 596190fcf7..15cc72d77c 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + From 4b17ca085781de3403d3fd60d46ba468031f4f07 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Sun, 3 Feb 2019 14:50:03 +0300 Subject: [PATCH 08/86] Fix wrong icons --- osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs | 2 +- osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs index f5f2ec453b..b67081846c 100644 --- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs +++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs @@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding { public class GlobalKeyBindingsSection : SettingsSection { - public override FontAwesome Icon => FontAwesome.fa_osu_hot; + public override FontAwesome Icon => FontAwesome.fa_globe; public override string Header => "Global"; public GlobalKeyBindingsSection(GlobalActionContainer manager) diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs index cfd3aaf6f7..5edeabfd2a 100644 --- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs +++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs @@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding { public class RulesetBindingsSection : SettingsSection { - public override FontAwesome Icon => FontAwesome.fa_osu_hot; + public override FontAwesome Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon).Icon; public override string Header => ruleset.Name; private readonly RulesetInfo ruleset; From eeecbfcbe0419c7ee71360e93dd91ee44361b013 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Sun, 3 Feb 2019 17:09:04 +0300 Subject: [PATCH 09/86] Fix warnings --- .../Overlays/KeyBinding/RulesetBindingsSection.cs | 2 +- osu.Game/Overlays/KeyBindingOverlay.cs | 2 +- osu.Game/Overlays/MainSettings.cs | 12 ++---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs index 5edeabfd2a..ea6faf98c1 100644 --- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs +++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs @@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding { public class RulesetBindingsSection : SettingsSection { - public override FontAwesome Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon).Icon; + public override FontAwesome Icon => (ruleset?.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? FontAwesome.fa_osu_hot; public override string Header => ruleset.Name; private readonly RulesetInfo ruleset; diff --git a/osu.Game/Overlays/KeyBindingOverlay.cs b/osu.Game/Overlays/KeyBindingOverlay.cs index bd3bb3b9de..d0382a4264 100644 --- a/osu.Game/Overlays/KeyBindingOverlay.cs +++ b/osu.Game/Overlays/KeyBindingOverlay.cs @@ -33,7 +33,7 @@ namespace osu.Game.Overlays { Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, - Action = () => Hide() + Action = Hide }); } diff --git a/osu.Game/Overlays/MainSettings.cs b/osu.Game/Overlays/MainSettings.cs index 62a2ee6fe3..61dd51d16f 100644 --- a/osu.Game/Overlays/MainSettings.cs +++ b/osu.Game/Overlays/MainSettings.cs @@ -1,21 +1,13 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Collections.Generic; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Framework.Input.Bindings; -using osu.Framework.Input.Events; -using osu.Game.Graphics; -using osu.Game.Graphics.Containers; -using osu.Game.Graphics.Sprites; -using osu.Game.Input.Bindings; using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings.Sections; -using osu.Game.Screens.Ranking; -using osuTK; using osuTK.Graphics; +using System.Collections.Generic; namespace osu.Game.Overlays { @@ -79,6 +71,6 @@ namespace osu.Game.Overlays private void load() { ContentContainer.Add(keyBindingOverlay); - } + } } } From d6d5bb5ecfaaa88647aba1bac618e017476675e5 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Sun, 3 Feb 2019 17:20:35 +0300 Subject: [PATCH 10/86] remove useless nullcheck --- osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs index ea6faf98c1..7b3bef90c0 100644 --- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs +++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs @@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding { public class RulesetBindingsSection : SettingsSection { - public override FontAwesome Icon => (ruleset?.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? FontAwesome.fa_osu_hot; + public override FontAwesome Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? FontAwesome.fa_osu_hot; public override string Header => ruleset.Name; private readonly RulesetInfo ruleset; From cd92dddd467b209fbdc0bbaedcd4c3e80c90b943 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 4 Feb 2019 12:31:05 +0900 Subject: [PATCH 11/86] Add per-ruleset mappings --- osu.Game/Scoring/Legacy/LegacyScoreParser.cs | 38 +++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs index 069dadf891..6bb454da76 100644 --- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs +++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs @@ -59,18 +59,32 @@ namespace osu.Game.Scoring.Legacy var windows = currentRuleset.CreateRulesetContainerWith(workingBeatmap).CreateScoreProcessor().CreateHitWindows(); - if (windows.IsHitResultAllowed(HitResult.Great)) - score.ScoreInfo.Statistics[HitResult.Great] = count300; - if (windows.IsHitResultAllowed(HitResult.Good)) - score.ScoreInfo.Statistics[HitResult.Good] = count100; - if (windows.IsHitResultAllowed(HitResult.Meh)) - score.ScoreInfo.Statistics[HitResult.Meh] = count50; - if (windows.IsHitResultAllowed(HitResult.Perfect)) - score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki; - if (windows.IsHitResultAllowed(HitResult.Ok)) - score.ScoreInfo.Statistics[HitResult.Ok] = countKatu; - if (windows.IsHitResultAllowed(HitResult.Miss)) - score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + switch (currentRuleset.LegacyID) + { + case 0: + score.ScoreInfo.Statistics[HitResult.Great] = count300; + score.ScoreInfo.Statistics[HitResult.Good] = count100; + score.ScoreInfo.Statistics[HitResult.Meh] = count50; + score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + break; + case 1: + score.ScoreInfo.Statistics[HitResult.Great] = count300; + score.ScoreInfo.Statistics[HitResult.Good] = count100; + score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + break; + case 2: + score.ScoreInfo.Statistics[HitResult.Perfect] = count300; + score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + break; + case 3: + score.ScoreInfo.Statistics[HitResult.Perfect] = countGeki; + score.ScoreInfo.Statistics[HitResult.Great] = count300; + score.ScoreInfo.Statistics[HitResult.Good] = countKatu; + score.ScoreInfo.Statistics[HitResult.Ok] = count100; + score.ScoreInfo.Statistics[HitResult.Meh] = count50; + score.ScoreInfo.Statistics[HitResult.Miss] = countMiss; + break; + } score.ScoreInfo.TotalScore = sr.ReadInt32(); score.ScoreInfo.MaxCombo = sr.ReadUInt16(); From 91d875db0d9224bb836df8476c66310ef1141130 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 4 Feb 2019 12:56:55 +0900 Subject: [PATCH 12/86] Remove unused local --- osu.Game/Scoring/Legacy/LegacyScoreParser.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs index 6bb454da76..f89f8e80bf 100644 --- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs +++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs @@ -57,8 +57,6 @@ namespace osu.Game.Scoring.Legacy var countKatu = (int)sr.ReadUInt16(); var countMiss = (int)sr.ReadUInt16(); - var windows = currentRuleset.CreateRulesetContainerWith(workingBeatmap).CreateScoreProcessor().CreateHitWindows(); - switch (currentRuleset.LegacyID) { case 0: From cf91b882c860ecd3a33352596bbf90e5209c7499 Mon Sep 17 00:00:00 2001 From: Kyle Chang Date: Fri, 1 Feb 2019 13:28:56 -0500 Subject: [PATCH 13/86] Fix slider tail evaluation in osu difficulty calculator The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position. --- .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs index 4e9ac26dc5..1ec12adb3b 100644 --- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs +++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs @@ -143,7 +143,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing var scoringTimes = slider.NestedHitObjects.Skip(1).Select(t => t.StartTime); foreach (var time in scoringTimes) computeVertex(time); - computeVertex(slider.EndTime); } private Vector2 getEndCursorPosition(OsuHitObject hitObject) From 065b0c9076fa526ec7d7413d2ee33ae47732fee7 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 4 Feb 2019 17:04:52 +0900 Subject: [PATCH 14/86] Fix background not being faded correctly --- osu.Game/Screens/Select/SongSelect.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index d800cea736..f3091f7d4e 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -31,6 +31,7 @@ using osu.Game.Screens.Menu; using osu.Game.Screens.Play; using osu.Game.Screens.Select.Options; using osu.Game.Skinning; +using osuTK.Graphics; namespace osu.Game.Screens.Select { @@ -564,7 +565,7 @@ namespace osu.Game.Screens.Select { backgroundModeBeatmap.Beatmap = beatmap; backgroundModeBeatmap.BlurTo(background_blur, 750, Easing.OutQuint); - backgroundModeBeatmap.FadeTo(1, 250); + backgroundModeBeatmap.FadeColour(Color4.White, 250); } beatmapInfoWedge.Beatmap = beatmap; From 37c1f5a8242fdb2ffe904a77ec5cd1db07326ec1 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 5 Feb 2019 15:38:19 +0900 Subject: [PATCH 15/86] Split polling logic from RoomManager, now a container --- osu.Game/Screens/Multi/IRoomManager.cs | 7 -- .../Multi/Lounge/Components/FilterControl.cs | 33 ++++++++-- .../Screens/Multi/Lounge/LoungeSubScreen.cs | 10 +-- osu.Game/Screens/Multi/Multiplayer.cs | 18 +++-- osu.Game/Screens/Multi/RoomManager.cs | 64 +++++------------- .../Screens/Multi/RoomPollingComponent.cs | 66 +++++++++++++++++++ 6 files changed, 125 insertions(+), 73 deletions(-) create mode 100644 osu.Game/Screens/Multi/RoomPollingComponent.cs diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs index 944bcf7ce7..980879d79a 100644 --- a/osu.Game/Screens/Multi/IRoomManager.cs +++ b/osu.Game/Screens/Multi/IRoomManager.cs @@ -4,7 +4,6 @@ using System; using osu.Framework.Configuration; using osu.Game.Online.Multiplayer; -using osu.Game.Screens.Multi.Lounge.Components; namespace osu.Game.Screens.Multi { @@ -40,11 +39,5 @@ namespace osu.Game.Screens.Multi /// Parts the currently-joined . /// void PartRoom(); - - /// - /// Queries for s matching a new . - /// - /// The to match. - void Filter(FilterCriteria criteria); } } diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs index a027125bb5..950d475a30 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs @@ -2,6 +2,8 @@ // See the LICENCE file in the repository root for full licence text. using System.ComponentModel; +using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Game.Graphics; using osu.Game.Overlays.SearchableList; using osuTK.Graphics; @@ -15,17 +17,38 @@ namespace osu.Game.Screens.Multi.Lounge.Components protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING; + [Resolved(CanBeNull = true)] + private Bindable filter { get; set; } + public FilterControl() { DisplayStyleControl.Hide(); } - public FilterCriteria CreateCriteria() => new FilterCriteria + [BackgroundDependencyLoader] + private void load() { - SearchString = Search.Current.Value ?? string.Empty, - PrimaryFilter = Tabs.Current, - SecondaryFilter = DisplayStyleControl.Dropdown.Current - }; + if (filter == null) + filter = new Bindable(); + } + + protected override void LoadComplete() + { + base.LoadComplete(); + + Search.Current.BindValueChanged(_ => updateFilter()); + Tabs.Current.BindValueChanged(_ => updateFilter(), true); + } + + private void updateFilter() + { + filter.Value = new FilterCriteria + { + SearchString = Search.Current.Value ?? string.Empty, + PrimaryFilter = Tabs.Current, + SecondaryFilter = DisplayStyleControl.Dropdown.Current + }; + } } public enum PrimaryFilter diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index a56d2892a4..5bc36090d5 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -21,7 +21,6 @@ namespace osu.Game.Screens.Multi.Lounge protected readonly FilterControl Filter; private readonly Container content; - private readonly RoomsContainer rooms; private readonly Action pushGameplayScreen; private readonly ProcessingOverlay processingOverlay; @@ -30,6 +29,7 @@ namespace osu.Game.Screens.Multi.Lounge this.pushGameplayScreen = pushGameplayScreen; RoomInspector inspector; + RoomsContainer rooms; InternalChildren = new Drawable[] { @@ -73,8 +73,6 @@ namespace osu.Game.Screens.Multi.Lounge inspector.Room.BindTo(rooms.SelectedRoom); - Filter.Search.Current.ValueChanged += s => filterRooms(); - Filter.Tabs.Current.ValueChanged += t => filterRooms(); Filter.Search.Exit += this.Exit; } @@ -113,12 +111,6 @@ namespace osu.Game.Screens.Multi.Lounge Filter.Search.HoldFocus = false; } - private void filterRooms() - { - rooms.Filter(Filter.CreateCriteria()); - Manager?.Filter(Filter.CreateCriteria()); - } - private void joinRequested(Room room) { processingOverlay.Show(); diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 1741ac0b7b..be9650019d 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -20,6 +20,7 @@ using osu.Game.Overlays; using osu.Game.Overlays.BeatmapSet.Buttons; using osu.Game.Screens.Menu; using osu.Game.Screens.Multi.Lounge; +using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Screens.Multi.Match; using osuTK; @@ -47,6 +48,10 @@ namespace osu.Game.Screens.Multi private readonly OsuButton createButton; private readonly LoungeSubScreen loungeSubScreen; private readonly ScreenStack screenStack; + private readonly RoomPollingComponent pollingComponent; + + [Cached] + private readonly Bindable filter = new Bindable(); [Cached(Type = typeof(IRoomManager))] private RoomManager roomManager; @@ -99,7 +104,7 @@ namespace osu.Game.Screens.Multi }, }, }, - new Container + roomManager = new RoomManager { RelativeSizeAxes = Axes.Both, Padding = new MarginPadding { Top = Header.HEIGHT }, @@ -123,9 +128,12 @@ namespace osu.Game.Screens.Multi Name = { Value = $"{api.LocalUser}'s awesome room" } }), }, - roomManager = new RoomManager() + pollingComponent = new RoomPollingComponent() }); + pollingComponent.Filter.BindTo(filter); + pollingComponent.RoomsRetrieved += roomManager.UpdateRooms; + screenStack.ScreenPushed += screenPushed; screenStack.ScreenExited += screenExited; } @@ -149,8 +157,8 @@ namespace osu.Game.Screens.Multi private void updatePollingRate(bool idle) { - roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000); - Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}"); + pollingComponent.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000); + Logger.Log($"Polling adjusted to {pollingComponent.TimeBetweenPolls}"); } public void APIStateChanged(APIAccess api, APIState state) @@ -213,7 +221,7 @@ namespace osu.Game.Screens.Multi this.FadeOut(250); cancelLooping(); - roomManager.TimeBetweenPolls = 0; + pollingComponent.TimeBetweenPolls = 0; } private void cancelLooping() diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index bb943b80c6..1457261770 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -2,22 +2,21 @@ // See the LICENCE file in the repository root for full licence text. using System; +using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Configuration; +using osu.Framework.Graphics.Containers; using osu.Framework.Logging; using osu.Game.Beatmaps; -using osu.Game.Online; using osu.Game.Online.API; using osu.Game.Online.API.Requests; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; -using osu.Game.Screens.Multi.Lounge.Components; namespace osu.Game.Screens.Multi { - public class RoomManager : PollingComponent, IRoomManager + public class RoomManager : Container, IRoomManager { public event Action RoomsUpdated; @@ -26,8 +25,6 @@ namespace osu.Game.Screens.Multi private Room currentRoom; - private FilterCriteria currentFilter = new FilterCriteria(); - [Resolved] private APIAccess api { get; set; } @@ -102,52 +99,25 @@ namespace osu.Game.Screens.Multi currentRoom = null; } - public void Filter(FilterCriteria criteria) + public void UpdateRooms(List newRooms) { - currentFilter = criteria; - PollImmediately(); - } - - private GetRoomsRequest pollReq; - - protected override Task Poll() - { - if (!api.IsLoggedIn) - return base.Poll(); - - var tcs = new TaskCompletionSource(); - - pollReq?.Cancel(); - pollReq = new GetRoomsRequest(currentFilter.PrimaryFilter); - - pollReq.Success += result => + // Remove past matches + foreach (var r in rooms.ToList()) { - // Remove past matches - foreach (var r in rooms.ToList()) - { - if (result.All(e => e.RoomID.Value != r.RoomID.Value)) - rooms.Remove(r); - } + if (newRooms.All(e => e.RoomID.Value != r.RoomID.Value)) + rooms.Remove(r); + } - for (int i = 0; i < result.Count; i++) - { - var r = result[i]; - r.Position = i; + for (int i = 0; i < newRooms.Count; i++) + { + var r = newRooms[i]; + r.Position = i; - update(r, r); - addRoom(r); - } + update(r, r); + addRoom(r); + } - RoomsUpdated?.Invoke(); - - tcs.SetResult(true); - }; - - pollReq.Failure += _ => tcs.SetResult(false); - - api.Queue(pollReq); - - return tcs.Task; + RoomsUpdated?.Invoke(); } /// diff --git a/osu.Game/Screens/Multi/RoomPollingComponent.cs b/osu.Game/Screens/Multi/RoomPollingComponent.cs new file mode 100644 index 0000000000..53c90d4d61 --- /dev/null +++ b/osu.Game/Screens/Multi/RoomPollingComponent.cs @@ -0,0 +1,66 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Game.Online; +using osu.Game.Online.API; +using osu.Game.Online.API.Requests; +using osu.Game.Online.Multiplayer; +using osu.Game.Screens.Multi.Lounge.Components; + +namespace osu.Game.Screens.Multi +{ + public class RoomPollingComponent : PollingComponent + { + /// + /// Invoked when s have been retrieved from the API. + /// + public Action> RoomsRetrieved; + + /// + /// The to use when polling for s. + /// + public readonly Bindable Filter = new Bindable(); + + [Resolved] + private APIAccess api { get; set; } + + public RoomPollingComponent() + { + Filter.BindValueChanged(_ => + { + if (IsLoaded) + PollImmediately(); + }); + } + + private GetRoomsRequest pollReq; + + protected override Task Poll() + { + if (!api.IsLoggedIn) + return base.Poll(); + + var tcs = new TaskCompletionSource(); + + pollReq?.Cancel(); + pollReq = new GetRoomsRequest(Filter.Value.PrimaryFilter); + + pollReq.Success += result => + { + RoomsRetrieved?.Invoke(result); + tcs.SetResult(true); + }; + + pollReq.Failure += _ => tcs.SetResult(false); + + api.Queue(pollReq); + + return tcs.Task; + } + } +} From d9537017c8e353c76fbf072eb81c6fe97de993f6 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 5 Feb 2019 15:56:18 +0900 Subject: [PATCH 16/86] Use CMC in the Multiplayer screen --- osu.Game/Online/Multiplayer/Room.cs | 2 +- osu.Game/Screens/Multi/Multiplayer.cs | 9 +++++++++ osu.Game/Screens/Multi/RoomManager.cs | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs index c20780aecc..46c22ef0cd 100644 --- a/osu.Game/Online/Multiplayer/Room.cs +++ b/osu.Game/Online/Multiplayer/Room.cs @@ -83,7 +83,7 @@ namespace osu.Game.Online.Multiplayer /// The position of this in the list. This is not read from or written to the API. /// [JsonIgnore] - public int Position = -1; + public Bindable Position { get; private set; } = new Bindable(-1); public void CopyFrom(Room other) { diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index be9650019d..f0297cdfa9 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -149,6 +149,15 @@ namespace osu.Game.Screens.Multi isIdle.BindTo(idleTracker.IsIdle); } + private CachedModelDependencyContainer dependencies; + + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); + dependencies.Model.BindTo(roomManager.CurrentRoom); + return dependencies; + } + protected override void LoadComplete() { base.LoadComplete(); diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index 1457261770..d9ddd6f867 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi private readonly BindableList rooms = new BindableList(); public IBindableList Rooms => rooms; - private Room currentRoom; + public readonly Bindable CurrentRoom = new Bindable(); [Resolved] private APIAccess api { get; set; } @@ -77,7 +77,7 @@ namespace osu.Game.Screens.Multi currentJoinRoomRequest = new JoinRoomRequest(room, api.LocalUser.Value); currentJoinRoomRequest.Success += () => { - currentRoom = room; + CurrentRoom.Value = room; onSuccess?.Invoke(room); }; @@ -92,11 +92,11 @@ namespace osu.Game.Screens.Multi public void PartRoom() { - if (currentRoom == null) + if (CurrentRoom.Value == null) return; - api.Queue(new PartRoomRequest(currentRoom, api.LocalUser.Value)); - currentRoom = null; + api.Queue(new PartRoomRequest(CurrentRoom.Value, api.LocalUser.Value)); + CurrentRoom.Value = null; } public void UpdateRooms(List newRooms) @@ -111,7 +111,7 @@ namespace osu.Game.Screens.Multi for (int i = 0; i < newRooms.Count; i++) { var r = newRooms[i]; - r.Position = i; + r.Position.Value = i; update(r, r); addRoom(r); From be51ee4ed5b266da78be77df3c44e19d1f3d3122 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 5 Feb 2019 16:14:37 +0900 Subject: [PATCH 17/86] Implement MultiplayerComposite, replaces RoomBindings --- .../Screens/Multi/MultiplayerComposite.cs | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 osu.Game/Screens/Multi/MultiplayerComposite.cs diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs new file mode 100644 index 0000000000..f09750b112 --- /dev/null +++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs @@ -0,0 +1,89 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using System; +using System.Collections.Generic; +using System.Linq; +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Graphics.Containers; +using osu.Game.Beatmaps; +using osu.Game.Online.Multiplayer; +using osu.Game.Rulesets; +using osu.Game.Rulesets.Mods; +using osu.Game.Users; + +namespace osu.Game.Screens.Multi +{ + public class MultiplayerComposite : CompositeDrawable + { + [Resolved] + public Room Room { get; private set; } + + [Resolved(typeof(Room))] + public Bindable RoomID { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Name { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Host { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Status { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Type { get; private set; } + + [Resolved(typeof(Room))] + public BindableList Playlist { get; private set; } + + [Resolved(typeof(Room))] + public Bindable> Participants { get; private set; } + + [Resolved(typeof(Room))] + public Bindable ParticipantCount { get; private set; } + + [Resolved(typeof(Room))] + public Bindable MaxParticipants { get; private set; } + + [Resolved(typeof(Room))] + public Bindable EndDate { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Availability { get; private set; } + + [Resolved(typeof(Room))] + public Bindable Duration { get; private set; } + + private readonly Bindable currentBeatmap = new Bindable(); + public IBindable CurrentBeatmap => currentBeatmap; + + private readonly Bindable> currentMods = new Bindable>(); + public IBindable> CurrentMods => currentMods; + + private readonly Bindable currentRuleset = new Bindable(); + public IBindable CurrentRuleset => currentRuleset; + + protected override void LoadComplete() + { + base.LoadComplete(); + + Playlist.ItemsAdded += _ => updatePlaylist(); + Playlist.ItemsRemoved += _ => updatePlaylist(); + + updatePlaylist(); + } + + private void updatePlaylist() + { + // Todo: We only ever have one playlist item for now. In the future, this will be user-settable + + var playlistItem = Playlist.FirstOrDefault(); + + currentBeatmap.Value = playlistItem?.Beatmap; + currentMods.Value = playlistItem?.RequiredMods ?? Enumerable.Empty(); + currentRuleset.Value = playlistItem?.Ruleset; + } + } +} From 2f8f4fac64cfeeaee0ddd4c977fd084e730452db Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 5 Feb 2019 17:50:32 +0900 Subject: [PATCH 18/86] Fix combo colour fallbacks when skin is not providing any --- .../Objects/Drawables/DrawableOsuHitObject.cs | 2 +- osu.Game.Tests/Resources/skin-empty.ini | 20 +++++++++ osu.Game.Tests/Resources/skin.ini | 26 +++++++++++ osu.Game.Tests/Skins/LegacySkinDecoderTest.cs | 44 +++++++++++++++++++ osu.Game/Skinning/DefaultSkin.cs | 12 +---- .../Skinning/LocalSkinOverrideContainer.cs | 19 ++++---- osu.Game/Skinning/SkinConfiguration.cs | 8 +++- 7 files changed, 110 insertions(+), 21 deletions(-) create mode 100644 osu.Game.Tests/Resources/skin-empty.ini create mode 100644 osu.Game.Tests/Resources/skin.ini create mode 100644 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs index 2608706264..10b37af957 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs @@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables base.SkinChanged(skin, allowFallback); if (HitObject is IHasComboInformation combo) - AccentColour = skin.GetValue(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White); + AccentColour = skin.GetValue(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White; } protected virtual void UpdatePreemptState() => this.FadeIn(HitObject.TimeFadeIn); diff --git a/osu.Game.Tests/Resources/skin-empty.ini b/osu.Game.Tests/Resources/skin-empty.ini new file mode 100644 index 0000000000..bdc2c4dfcf --- /dev/null +++ b/osu.Game.Tests/Resources/skin-empty.ini @@ -0,0 +1,20 @@ +[General] +Name: test skin +Author: +Version: +AnimationFramerate: +AllowSliderBallTint: +ComboBurstRandom: +CursorCentre: +CursorExpand: +CursorRotate: +CursorTrailRotate: +CustomComboBurstSounds: +HitCircleOverlayAboveNumber: +LayeredHitSounds: +SliderBallFlip: +SliderBallFrames: +SliderStyle: +SpinnerFadePlayfield: +SpinnerFrequencyModulate: +SpinnerNoBlink: \ No newline at end of file diff --git a/osu.Game.Tests/Resources/skin.ini b/osu.Game.Tests/Resources/skin.ini new file mode 100644 index 0000000000..2ae8fcbfc2 --- /dev/null +++ b/osu.Game.Tests/Resources/skin.ini @@ -0,0 +1,26 @@ +[General] +Name: test skin +Author: +Version: +AnimationFramerate: +AllowSliderBallTint: +ComboBurstRandom: +CursorCentre: +CursorExpand: +CursorRotate: +CursorTrailRotate: +CustomComboBurstSounds: +HitCircleOverlayAboveNumber: +LayeredHitSounds: +SliderBallFlip: +SliderBallFrames: +SliderStyle: +SpinnerFadePlayfield: +SpinnerFrequencyModulate: +SpinnerNoBlink: + +[Colours] +Combo1 : 142,199,255 +Combo2 : 255,128,128 +Combo3 : 128,255,255 +Combo7 : 100,100,100,100 \ No newline at end of file diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs new file mode 100644 index 0000000000..2849b49fe5 --- /dev/null +++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs @@ -0,0 +1,44 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using System.Collections.Generic; +using System.IO; +using NUnit.Framework; +using osu.Game.Skinning; +using osu.Game.Tests.Resources; +using osuTK.Graphics; + +namespace osu.Game.Tests.Skins +{ + [TestFixture] + public class SkinFallbackTest + { + [TestCase(true)] + [TestCase(false)] + public void TestDecodeSkinColours(bool hasColours) + { + var decoder = new LegacySkinDecoder(); + using (var resStream = TestResources.OpenResource(hasColours ? "skin.ini" : "skin-empty.ini")) + using (var stream = new StreamReader(resStream)) + { + var comboColors = decoder.Decode(stream).ComboColours; + + List expectedColors; + if (hasColours) + expectedColors = new List + { + new Color4(142, 199, 255, 255), + new Color4(255, 128, 128, 255), + new Color4(128, 255, 255, 255), + new Color4(100, 100, 100, 100), + }; + else + expectedColors = new DefaultSkin().Configuration.ComboColours; + + Assert.AreEqual(expectedColors.Count, comboColors.Count); + for (int i = 0; i < expectedColors.Count; i++) + Assert.AreEqual(expectedColors[i], comboColors[i]); + } + } + } +} diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs index 61343b4e62..c7556dddd5 100644 --- a/osu.Game/Skinning/DefaultSkin.cs +++ b/osu.Game/Skinning/DefaultSkin.cs @@ -4,7 +4,6 @@ using osu.Framework.Audio.Sample; using osu.Framework.Graphics; using osu.Framework.Graphics.Textures; -using osuTK.Graphics; namespace osu.Game.Skinning { @@ -13,16 +12,7 @@ namespace osu.Game.Skinning public DefaultSkin() : base(SkinInfo.Default) { - Configuration = new SkinConfiguration - { - ComboColours = - { - new Color4(17, 136, 170, 255), - new Color4(102, 136, 0, 255), - new Color4(204, 102, 0, 255), - new Color4(121, 9, 13, 255) - } - }; + Configuration = new SkinConfiguration(); } public override Drawable GetDrawableComponent(string componentName) => null; diff --git a/osu.Game/Skinning/LocalSkinOverrideContainer.cs b/osu.Game/Skinning/LocalSkinOverrideContainer.cs index 8c172ffbcc..d51c11c5f4 100644 --- a/osu.Game/Skinning/LocalSkinOverrideContainer.cs +++ b/osu.Game/Skinning/LocalSkinOverrideContainer.cs @@ -12,6 +12,9 @@ using osu.Game.Configuration; namespace osu.Game.Skinning { + /// + /// A container which overrides existing skin options with beatmap-local values. + /// public class LocalSkinOverrideContainer : Container, ISkinSource { public event Action SourceChanged; @@ -19,6 +22,14 @@ namespace osu.Game.Skinning private readonly Bindable beatmapSkins = new Bindable(); private readonly Bindable beatmapHitsounds = new Bindable(); + private readonly ISkinSource source; + private ISkinSource fallbackSource; + + public LocalSkinOverrideContainer(ISkinSource source) + { + this.source = source; + } + public Drawable GetDrawableComponent(string componentName) { Drawable sourceDrawable; @@ -53,14 +64,6 @@ namespace osu.Game.Skinning return fallbackSource == null ? default : fallbackSource.GetValue(query); } - private readonly ISkinSource source; - private ISkinSource fallbackSource; - - public LocalSkinOverrideContainer(ISkinSource source) - { - this.source = source; - } - private void onSourceChanged() => SourceChanged?.Invoke(); protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs index 4d939bd87c..a8091d1f36 100644 --- a/osu.Game/Skinning/SkinConfiguration.cs +++ b/osu.Game/Skinning/SkinConfiguration.cs @@ -11,7 +11,13 @@ namespace osu.Game.Skinning { public readonly SkinInfo SkinInfo = new SkinInfo(); - public List ComboColours { get; set; } = new List(); + public List ComboColours { get; set; } = new List + { + new Color4(17, 136, 170, 255), + new Color4(102, 136, 0, 255), + new Color4(204, 102, 0, 255), + new Color4(121, 9, 13, 255) + }; public Dictionary CustomColours { get; set; } = new Dictionary(); From a6b2e9eb0b591ee2b379c26cf21405827d243899 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 5 Feb 2019 18:08:27 +0900 Subject: [PATCH 19/86] Remove unused pieces of ini --- osu.Game.Tests/Resources/skin-empty.ini | 20 +------------------- osu.Game.Tests/Resources/skin.ini | 18 ------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/osu.Game.Tests/Resources/skin-empty.ini b/osu.Game.Tests/Resources/skin-empty.ini index bdc2c4dfcf..b6c319fe3c 100644 --- a/osu.Game.Tests/Resources/skin-empty.ini +++ b/osu.Game.Tests/Resources/skin-empty.ini @@ -1,20 +1,2 @@ [General] -Name: test skin -Author: -Version: -AnimationFramerate: -AllowSliderBallTint: -ComboBurstRandom: -CursorCentre: -CursorExpand: -CursorRotate: -CursorTrailRotate: -CustomComboBurstSounds: -HitCircleOverlayAboveNumber: -LayeredHitSounds: -SliderBallFlip: -SliderBallFrames: -SliderStyle: -SpinnerFadePlayfield: -SpinnerFrequencyModulate: -SpinnerNoBlink: \ No newline at end of file +Name: test skin \ No newline at end of file diff --git a/osu.Game.Tests/Resources/skin.ini b/osu.Game.Tests/Resources/skin.ini index 2ae8fcbfc2..0e5737b4ea 100644 --- a/osu.Game.Tests/Resources/skin.ini +++ b/osu.Game.Tests/Resources/skin.ini @@ -1,23 +1,5 @@ [General] Name: test skin -Author: -Version: -AnimationFramerate: -AllowSliderBallTint: -ComboBurstRandom: -CursorCentre: -CursorExpand: -CursorRotate: -CursorTrailRotate: -CustomComboBurstSounds: -HitCircleOverlayAboveNumber: -LayeredHitSounds: -SliderBallFlip: -SliderBallFrames: -SliderStyle: -SpinnerFadePlayfield: -SpinnerFrequencyModulate: -SpinnerNoBlink: [Colours] Combo1 : 142,199,255 From 8ae2861ed6b85147d269c5f72aa8721afbf4afda Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 5 Feb 2019 18:09:15 +0900 Subject: [PATCH 20/86] Fix class name --- osu.Game.Tests/Skins/LegacySkinDecoderTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs index 2849b49fe5..2a97519e21 100644 --- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs +++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs @@ -11,7 +11,7 @@ using osuTK.Graphics; namespace osu.Game.Tests.Skins { [TestFixture] - public class SkinFallbackTest + public class LegacySkinDecoderTest { [TestCase(true)] [TestCase(false)] From 5b1f111922786783d6121ce426fb16ae39155b7f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 5 Feb 2019 18:14:43 +0900 Subject: [PATCH 21/86] Rollback other fallthrough regressions --- .../Objects/Drawable/DrawableCatchHitObject.cs | 2 +- osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs index 922d6bf3e9..294fd97d59 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs @@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable base.SkinChanged(skin, allowFallback); if (HitObject is IHasComboInformation combo) - AccentColour = skin.GetValue(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White); + AccentColour = skin.GetValue(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White; } private const float preempt = 1000; diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs index 1a1b0530d8..ca9a27976e 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs @@ -156,9 +156,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables { base.SkinChanged(skin, allowFallback); - Body.AccentColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : Body.AccentColour); - Body.BorderColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : Body.BorderColour); - Ball.AccentColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : Ball.AccentColour); + Body.AccentColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : (Color4?)null) ?? Body.AccentColour; + Body.BorderColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : (Color4?)null) ?? Body.BorderColour; + Ball.AccentColour = skin.GetValue(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : (Color4?)null) ?? Ball.AccentColour; } protected override void CheckForResult(bool userTriggered, double timeOffset) From aac371ba6e9b226cfde6b808ac68c7985aa60cb2 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 5 Feb 2019 19:00:01 +0900 Subject: [PATCH 22/86] Use CMC for all of multiplayer --- .../Visual/TestCaseLoungeRoomsContainer.cs | 4 +- osu.Game.Tests/Visual/TestCaseMatchHeader.cs | 12 +- osu.Game.Tests/Visual/TestCaseMatchInfo.cs | 29 +- .../Visual/TestCaseMatchLeaderboard.cs | 6 +- .../Visual/TestCaseMatchParticipants.cs | 24 +- osu.Game.Tests/Visual/TestCaseMatchResults.cs | 41 +- .../Visual/TestCaseMatchSettingsOverlay.cs | 33 +- osu.Game/Online/Multiplayer/Room.cs | 17 +- .../Screens/Multi/Components/BeatmapTitle.cs | 21 +- .../Multi/Components/BeatmapTypeInfo.cs | 29 +- .../Screens/Multi/Components/ModeTypeInfo.cs | 27 +- .../Components/MultiplayerBackgroundSprite.cs | 24 ++ .../Multi/Components/ParticipantCount.cs | 16 +- .../Multi/Components/RoomStatusInfo.cs | 20 +- osu.Game/Screens/Multi/IRoomManager.cs | 5 + .../Multi/Lounge/Components/DrawableRoom.cs | 44 +-- .../Lounge/Components/ParticipantInfo.cs | 31 +- .../Multi/Lounge/Components/RoomInspector.cs | 66 +--- .../Multi/Lounge/Components/RoomsContainer.cs | 6 +- .../Screens/Multi/Lounge/LoungeSubScreen.cs | 27 +- .../Screens/Multi/Match/Components/Header.cs | 68 ++-- .../Screens/Multi/Match/Components/Info.cs | 28 +- .../Match/Components/MatchChatDisplay.cs | 16 +- .../Match/Components/MatchLeaderboard.cs | 16 +- .../Match/Components/MatchSettingsOverlay.cs | 181 +++++---- .../Multi/Match/Components/MatchTabControl.cs | 9 +- .../Multi/Match/Components/Participants.cs | 21 +- .../Multi/Match/Components/ReadyButton.cs | 8 +- .../Screens/Multi/Match/MatchSubScreen.cs | 361 ++++++++++-------- osu.Game/Screens/Multi/Multiplayer.cs | 2 +- .../Screens/Multi/MultiplayerComposite.cs | 32 +- .../Screens/Multi/Play/TimeshiftPlayer.cs | 14 +- .../Screens/Multi/Ranking/MatchResults.cs | 8 +- .../Ranking/Pages/RoomLeaderboardPage.cs | 21 +- .../Ranking/Types/RoomLeaderboardPageInfo.cs | 7 +- osu.Game/Screens/Multi/RoomBindings.cs | 106 ----- osu.Game/Screens/Multi/RoomManager.cs | 4 +- osu.Game/Tests/Visual/MultiplayerTestCase.cs | 36 ++ 38 files changed, 652 insertions(+), 768 deletions(-) create mode 100644 osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs delete mode 100644 osu.Game/Screens/Multi/RoomBindings.cs create mode 100644 osu.Game/Tests/Visual/MultiplayerTestCase.cs diff --git a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs index 1dfc3cdc60..2b362743e8 100644 --- a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs +++ b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs @@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0)); AddStep("select first room", () => container.Rooms.First().Action?.Invoke()); - AddAssert("first room selected", () => container.SelectedRoom.Value == roomManager.Rooms.First()); + AddAssert("first room selected", () => roomManager.CurrentRoom.Value == roomManager.Rooms.First()); AddStep("join first room", () => container.Rooms.First().Action?.Invoke()); AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus); @@ -76,6 +76,8 @@ namespace osu.Game.Tests.Visual public readonly BindableList Rooms = new BindableList(); IBindableList IRoomManager.Rooms => Rooms; + public Bindable CurrentRoom { get; } = new Bindable(); + public void CreateRoom(Room room, Action onSuccess = null, Action onError = null) => Rooms.Add(room); public void JoinRoom(Room room, Action onSuccess = null, Action onError = null) diff --git a/osu.Game.Tests/Visual/TestCaseMatchHeader.cs b/osu.Game.Tests/Visual/TestCaseMatchHeader.cs index c1664c99a3..296e5f24ac 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchHeader.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchHeader.cs @@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.Match.Components; namespace osu.Game.Tests.Visual { - public class TestCaseMatchHeader : OsuTestCase + public class TestCaseMatchHeader : MultiplayerTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -21,11 +21,7 @@ namespace osu.Game.Tests.Visual public TestCaseMatchHeader() { - var room = new Room(); - - var header = new Header(room); - - room.Playlist.Add(new PlaylistItem + Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { @@ -46,9 +42,9 @@ namespace osu.Game.Tests.Visual } }); - room.Type.Value = new GameTypeTimeshift(); + Room.Type.Value = new GameTypeTimeshift(); - Child = header; + Child = new Header(); } } } diff --git a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs index 57b21f2d79..901c4f1644 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs @@ -14,7 +14,7 @@ using osu.Game.Screens.Multi.Match.Components; namespace osu.Game.Tests.Visual { [TestFixture] - public class TestCaseMatchInfo : OsuTestCase + public class TestCaseMatchInfo : MultiplayerTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -27,18 +27,15 @@ namespace osu.Game.Tests.Visual [BackgroundDependencyLoader] private void load(RulesetStore rulesets) { - var room = new Room(); + Add(new Info()); - Info info = new Info(room); - Add(info); - - AddStep(@"set name", () => room.Name.Value = @"Room Name?"); - AddStep(@"set availability", () => room.Availability.Value = RoomAvailability.FriendsOnly); - AddStep(@"set status", () => room.Status.Value = new RoomStatusPlaying()); + AddStep(@"set name", () => Room.Name.Value = @"Room Name?"); + AddStep(@"set availability", () => Room.Availability.Value = RoomAvailability.FriendsOnly); + AddStep(@"set status", () => Room.Status.Value = new RoomStatusPlaying()); AddStep(@"set beatmap", () => { - room.Playlist.Clear(); - room.Playlist.Add(new PlaylistItem + Room.Playlist.Clear(); + Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { @@ -54,14 +51,14 @@ namespace osu.Game.Tests.Visual }); }); - AddStep(@"change name", () => room.Name.Value = @"Room Name!"); - AddStep(@"change availability", () => room.Availability.Value = RoomAvailability.InviteOnly); - AddStep(@"change status", () => room.Status.Value = new RoomStatusOpen()); - AddStep(@"null beatmap", () => room.Playlist.Clear()); + AddStep(@"change name", () => Room.Name.Value = @"Room Name!"); + AddStep(@"change availability", () => Room.Availability.Value = RoomAvailability.InviteOnly); + AddStep(@"change status", () => Room.Status.Value = new RoomStatusOpen()); + AddStep(@"null beatmap", () => Room.Playlist.Clear()); AddStep(@"change beatmap", () => { - room.Playlist.Clear(); - room.Playlist.Add(new PlaylistItem + Room.Playlist.Clear(); + Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { diff --git a/osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs b/osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs index 110c7699cb..42a886a5a3 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs @@ -6,24 +6,24 @@ using Newtonsoft.Json; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Game.Online.API; -using osu.Game.Online.Multiplayer; using osu.Game.Screens.Multi.Match.Components; using osu.Game.Users; using osuTK; namespace osu.Game.Tests.Visual { - public class TestCaseMatchLeaderboard : OsuTestCase + public class TestCaseMatchLeaderboard : MultiplayerTestCase { public TestCaseMatchLeaderboard() { + Room.RoomID.Value = 3; + Add(new MatchLeaderboard { Origin = Anchor.Centre, Anchor = Anchor.Centre, Size = new Vector2(550f, 450f), Scope = MatchLeaderboardScope.Overall, - Room = new Room { RoomID = { Value = 3 } } }); } diff --git a/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs b/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs index 174f39a702..716523c23c 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs @@ -1,9 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Collections.Generic; using NUnit.Framework; -using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Game.Screens.Multi.Match.Components; using osu.Game.Users; @@ -11,22 +9,14 @@ using osu.Game.Users; namespace osu.Game.Tests.Visual { [TestFixture] - public class TestCaseMatchParticipants : OsuTestCase + public class TestCaseMatchParticipants : MultiplayerTestCase { - private readonly Bindable maxParticipants = new Bindable(); - private readonly Bindable> users = new Bindable>(); - public TestCaseMatchParticipants() { - Participants participants; + Add(new Participants { RelativeSizeAxes = Axes.Both }); - Add(participants = new Participants { RelativeSizeAxes = Axes.Both }); - - participants.MaxParticipants.BindTo(maxParticipants); - participants.Users.BindTo(users); - - AddStep(@"set max to null", () => maxParticipants.Value = null); - AddStep(@"set users", () => users.Value = new[] + AddStep(@"set max to null", () => Room.MaxParticipants.Value = null); + AddStep(@"set users", () => Room.Participants.Value = new[] { new User { @@ -54,9 +44,9 @@ namespace osu.Game.Tests.Visual }, }); - AddStep(@"set max", () => maxParticipants.Value = 10); - AddStep(@"clear users", () => users.Value = new User[] { }); - AddStep(@"set max to null", () => maxParticipants.Value = null); + AddStep(@"set max", () => Room.MaxParticipants.Value = 10); + AddStep(@"clear users", () => Room.Participants.Value = new User[] { }); + AddStep(@"set max to null", () => Room.MaxParticipants.Value = null); } } } diff --git a/osu.Game.Tests/Visual/TestCaseMatchResults.cs b/osu.Game.Tests/Visual/TestCaseMatchResults.cs index 3ce03cf723..9ef520af4b 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchResults.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchResults.cs @@ -8,7 +8,6 @@ using osu.Framework.Allocation; using osu.Game.Beatmaps; using osu.Game.Online.API; using osu.Game.Online.API.Requests.Responses; -using osu.Game.Online.Multiplayer; using osu.Game.Scoring; using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Ranking; @@ -19,7 +18,7 @@ using osu.Game.Users; namespace osu.Game.Tests.Visual { - public class TestCaseMatchResults : OsuTestCase + public class TestCaseMatchResults : MultiplayerTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -38,6 +37,9 @@ namespace osu.Game.Tests.Visual if (beatmapInfo != null) Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo); + Room.RoomID.Value = 1; + Room.Name.Value = "an awesome room"; + Child = new TestMatchResults(new ScoreInfo { User = new User { Id = 10 }, @@ -46,60 +48,41 @@ namespace osu.Game.Tests.Visual private class TestMatchResults : MatchResults { - private readonly Room room; - public TestMatchResults(ScoreInfo score) - : this(score, new Room - { - RoomID = { Value = 1 }, - Name = { Value = "an awesome room" } - }) + : base(score) { } - public TestMatchResults(ScoreInfo score, Room room) - : base(score, room) - { - this.room = room; - } - - protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap, room) }; + protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap) }; } private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo { private readonly ScoreInfo score; private readonly WorkingBeatmap beatmap; - private readonly Room room; - public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap, Room room) - : base(score, beatmap, room) + public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap) + : base(score, beatmap) { this.score = score; this.beatmap = beatmap; - this.room = room; } - public override ResultsPage CreatePage() => new TestRoomLeaderboardPage(score, beatmap, room); + public override ResultsPage CreatePage() => new TestRoomLeaderboardPage(score, beatmap); } private class TestRoomLeaderboardPage : RoomLeaderboardPage { - public TestRoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap, Room room) - : base(score, beatmap, room) + public TestRoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap) + : base(score, beatmap) { } - protected override MatchLeaderboard CreateLeaderboard(Room room) => new TestMatchLeaderboard(room); + protected override MatchLeaderboard CreateLeaderboard() => new TestMatchLeaderboard(); } private class TestMatchLeaderboard : RoomLeaderboardPage.ResultsMatchLeaderboard { - public TestMatchLeaderboard(Room room) - : base(room) - { - } - protected override APIRequest FetchScores(Action> scoresCallback) { var scores = Enumerable.Range(0, 50).Select(createRoomScore).ToArray(); diff --git a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs index 16240f0c45..54b2e8a8fc 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs @@ -18,7 +18,7 @@ using osu.Game.Screens.Multi.Match.Components; namespace osu.Game.Tests.Visual { - public class TestCaseMatchSettingsOverlay : OsuTestCase + public class TestCaseMatchSettingsOverlay : MultiplayerTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -28,14 +28,14 @@ namespace osu.Game.Tests.Visual [Cached(Type = typeof(IRoomManager))] private TestRoomManager roomManager = new TestRoomManager(); - private Room room; private TestRoomSettings settings; [SetUp] public void Setup() => Schedule(() => { - room = new Room(); - settings = new TestRoomSettings(room) + Room = new Room(); + + settings = new TestRoomSettings { RelativeSizeAxes = Axes.Both, State = Visibility.Visible @@ -49,19 +49,19 @@ namespace osu.Game.Tests.Visual { AddStep("clear name and beatmap", () => { - room.Name.Value = ""; - room.Playlist.Clear(); + Room.Name.Value = ""; + Room.Playlist.Clear(); }); AddAssert("button disabled", () => !settings.ApplyButton.Enabled); - AddStep("set name", () => room.Name.Value = "Room name"); + AddStep("set name", () => Room.Name.Value = "Room name"); AddAssert("button disabled", () => !settings.ApplyButton.Enabled); - AddStep("set beatmap", () => room.Playlist.Add(new PlaylistItem { Beatmap = new DummyWorkingBeatmap().BeatmapInfo })); + AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = new DummyWorkingBeatmap().BeatmapInfo })); AddAssert("button enabled", () => settings.ApplyButton.Enabled); - AddStep("clear name", () => room.Name.Value = ""); + AddStep("clear name", () => Room.Name.Value = ""); AddAssert("button disabled", () => !settings.ApplyButton.Enabled); } @@ -117,17 +117,12 @@ namespace osu.Game.Tests.Visual private class TestRoomSettings : MatchSettingsOverlay { - public new TriangleButton ApplyButton => base.ApplyButton; + public TriangleButton ApplyButton => Settings.ApplyButton; - public new OsuTextBox NameField => base.NameField; - public new OsuDropdown DurationField => base.DurationField; + public OsuTextBox NameField => Settings.NameField; + public OsuDropdown DurationField => Settings.DurationField; - public new OsuSpriteText ErrorText => base.ErrorText; - - public TestRoomSettings(Room room) - : base(room) - { - } + public OsuSpriteText ErrorText => Settings.ErrorText; } private class TestRoomManager : IRoomManager @@ -140,6 +135,8 @@ namespace osu.Game.Tests.Visual public IBindableList Rooms { get; } = null; + public Bindable CurrentRoom { get; } = new Bindable(); + public void CreateRoom(Room room, Action onSuccess = null, Action onError = null) { if (CreateRequested == null) diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs index 46c22ef0cd..0d5b168dcb 100644 --- a/osu.Game/Online/Multiplayer/Room.cs +++ b/osu.Game/Online/Multiplayer/Room.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; +using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Game.Online.Multiplayer.GameTypes; using osu.Game.Online.Multiplayer.RoomStatuses; @@ -14,42 +15,55 @@ namespace osu.Game.Online.Multiplayer { public class Room { + [Cached] [JsonProperty("id")] public Bindable RoomID { get; private set; } = new Bindable(); + [Cached] [JsonProperty("name")] public Bindable Name { get; private set; } = new Bindable(); + [Cached] [JsonProperty("host")] public Bindable Host { get; private set; } = new Bindable(); + [Cached] [JsonProperty("playlist")] - public BindableList Playlist { get; set; } = new BindableList(); + public BindableList Playlist { get; private set; } = new BindableList(); + [Cached] [JsonProperty("channel_id")] public Bindable ChannelId { get; private set; } = new Bindable(); + [Cached] [JsonIgnore] public Bindable Duration { get; private set; } = new Bindable(TimeSpan.FromMinutes(30)); + [Cached] [JsonIgnore] public Bindable MaxAttempts { get; private set; } = new Bindable(); + [Cached] [JsonIgnore] public Bindable Status { get; private set; } = new Bindable(new RoomStatusOpen()); + [Cached] [JsonIgnore] public Bindable Availability { get; private set; } = new Bindable(); + [Cached] [JsonIgnore] public Bindable Type { get; private set; } = new Bindable(new GameTypeTimeshift()); + [Cached] [JsonIgnore] public Bindable MaxParticipants { get; private set; } = new Bindable(); + [Cached] [JsonIgnore] public Bindable> Participants { get; private set; } = new Bindable>(Enumerable.Empty()); + [Cached] public Bindable ParticipantCount { get; private set; } = new Bindable(); // todo: TEMPORARY @@ -68,6 +82,7 @@ namespace osu.Game.Online.Multiplayer } // Only supports retrieval for now + [Cached] [JsonProperty("ends_at")] public Bindable EndDate { get; private set; } = new Bindable(); diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs index 145375422a..dca0545035 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs @@ -2,11 +2,8 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; using osu.Framework.Localisation; -using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; @@ -14,10 +11,8 @@ using osu.Game.Online.Chat; namespace osu.Game.Screens.Multi.Components { - public class BeatmapTitle : CompositeDrawable + public class BeatmapTitle : MultiplayerComposite { - public readonly IBindable Beatmap = new Bindable(); - private readonly LinkFlowContainer textFlow; public BeatmapTitle() @@ -27,10 +22,10 @@ namespace osu.Game.Screens.Multi.Components InternalChild = textFlow = new LinkFlowContainer { AutoSizeAxes = Axes.Both }; } - protected override void LoadComplete() + [BackgroundDependencyLoader] + private void load() { - base.LoadComplete(); - Beatmap.BindValueChanged(v => updateText(), true); + CurrentBeatmap.BindValueChanged(v => updateText(), true); } private float textSize = OsuSpriteText.FONT_SIZE; @@ -58,7 +53,7 @@ namespace osu.Game.Screens.Multi.Components textFlow.Clear(); - if (Beatmap.Value == null) + if (CurrentBeatmap.Value == null) textFlow.AddText("No beatmap selected", s => { s.TextSize = TextSize; @@ -70,7 +65,7 @@ namespace osu.Game.Screens.Multi.Components { new OsuSpriteText { - Text = new LocalisedString((Beatmap.Value.Metadata.ArtistUnicode, Beatmap.Value.Metadata.Artist)), + Text = new LocalisedString((CurrentBeatmap.Value.Metadata.ArtistUnicode, CurrentBeatmap.Value.Metadata.Artist)), TextSize = TextSize, }, new OsuSpriteText @@ -80,10 +75,10 @@ namespace osu.Game.Screens.Multi.Components }, new OsuSpriteText { - Text = new LocalisedString((Beatmap.Value.Metadata.TitleUnicode, Beatmap.Value.Metadata.Title)), + Text = new LocalisedString((CurrentBeatmap.Value.Metadata.TitleUnicode, CurrentBeatmap.Value.Metadata.Title)), TextSize = TextSize, } - }, null, LinkAction.OpenBeatmap, Beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap"); + }, null, LinkAction.OpenBeatmap, CurrentBeatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap"); } } } diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs index 24c8e3c148..35d1ffad1c 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs @@ -1,31 +1,26 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Framework.Configuration; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Online.Chat; -using osu.Game.Online.Multiplayer; -using osu.Game.Rulesets; using osuTK; namespace osu.Game.Screens.Multi.Components { - public class BeatmapTypeInfo : CompositeDrawable + public class BeatmapTypeInfo : MultiplayerComposite { - public readonly IBindable Beatmap = new Bindable(); - public readonly IBindable Ruleset = new Bindable(); - public readonly IBindable Type = new Bindable(); - public BeatmapTypeInfo() { AutoSizeAxes = Axes.Both; + } - BeatmapTitle beatmapTitle; - ModeTypeInfo modeTypeInfo; + [BackgroundDependencyLoader] + private void load() + { LinkFlowContainer beatmapAuthor; InternalChild = new FillFlowContainer @@ -36,7 +31,7 @@ namespace osu.Game.Screens.Multi.Components Spacing = new Vector2(5, 0), Children = new Drawable[] { - modeTypeInfo = new ModeTypeInfo(), + new ModeTypeInfo(), new Container { AutoSizeAxes = Axes.X, @@ -44,7 +39,7 @@ namespace osu.Game.Screens.Multi.Components Margin = new MarginPadding { Left = 5 }, Children = new Drawable[] { - beatmapTitle = new BeatmapTitle(), + new BeatmapTitle(), beatmapAuthor = new LinkFlowContainer(s => s.TextSize = 14) { Anchor = Anchor.BottomLeft, @@ -56,13 +51,7 @@ namespace osu.Game.Screens.Multi.Components } }; - modeTypeInfo.Beatmap.BindTo(Beatmap); - modeTypeInfo.Ruleset.BindTo(Ruleset); - modeTypeInfo.Type.BindTo(Type); - - beatmapTitle.Beatmap.BindTo(Beatmap); - - Beatmap.BindValueChanged(v => + CurrentBeatmap.BindValueChanged(v => { beatmapAuthor.Clear(); diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs index cdb5974f8f..6ae3b7be7c 100644 --- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs @@ -1,32 +1,29 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Framework.Configuration; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps; using osu.Game.Beatmaps.Drawables; -using osu.Game.Online.Multiplayer; -using osu.Game.Rulesets; using osuTK; namespace osu.Game.Screens.Multi.Components { - public class ModeTypeInfo : CompositeDrawable + public class ModeTypeInfo : MultiplayerComposite { private const float height = 30; private const float transition_duration = 100; - private readonly Container rulesetContainer; - - public readonly IBindable Beatmap = new Bindable(); - public readonly IBindable Ruleset = new Bindable(); - public readonly IBindable Type = new Bindable(); + private Container rulesetContainer; public ModeTypeInfo() { AutoSizeAxes = Axes.Both; + } + [BackgroundDependencyLoader] + private void load() + { Container gameTypeContainer; InternalChild = new FillFlowContainer @@ -48,17 +45,17 @@ namespace osu.Game.Screens.Multi.Components }, }; - Beatmap.BindValueChanged(updateBeatmap); - Ruleset.BindValueChanged(_ => updateBeatmap(Beatmap.Value)); + CurrentBeatmap.BindValueChanged(_ => updateBeatmap()); + CurrentRuleset.BindValueChanged(_ => updateBeatmap()); Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }); } - private void updateBeatmap(BeatmapInfo beatmap) + private void updateBeatmap() { - if (beatmap != null) + if (CurrentBeatmap.Value != null) { rulesetContainer.FadeIn(transition_duration); - rulesetContainer.Child = new DifficultyIcon(beatmap, Ruleset.Value) { Size = new Vector2(height) }; + rulesetContainer.Child = new DifficultyIcon(CurrentBeatmap.Value, CurrentRuleset.Value) { Size = new Vector2(height) }; } else rulesetContainer.FadeOut(transition_duration); diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs new file mode 100644 index 0000000000..8eff7b14af --- /dev/null +++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs @@ -0,0 +1,24 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Game.Beatmaps.Drawables; + +namespace osu.Game.Screens.Multi.Components +{ + public class MultiplayerBackgroundSprite : MultiplayerComposite + { + [BackgroundDependencyLoader] + private void load() + { + UpdateableBeatmapBackgroundSprite sprite; + + InternalChild = sprite = CreateBackgroundSprite(); + + sprite.Beatmap.BindTo(CurrentBeatmap); + } + + protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both }; + } +} diff --git a/osu.Game/Screens/Multi/Components/ParticipantCount.cs b/osu.Game/Screens/Multi/Components/ParticipantCount.cs index 95cd6a7a47..9711767924 100644 --- a/osu.Game/Screens/Multi/Components/ParticipantCount.cs +++ b/osu.Game/Screens/Multi/Components/ParticipantCount.cs @@ -1,31 +1,29 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Collections.Generic; using System.Linq; -using osu.Framework.Configuration; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Graphics.Sprites; -using osu.Game.Users; namespace osu.Game.Screens.Multi.Components { - public class ParticipantCountDisplay : CompositeDrawable + public class ParticipantCountDisplay : MultiplayerComposite { private const float text_size = 30; private const float transition_duration = 100; - private readonly OsuSpriteText slash, maxText; - - public readonly IBindable> Participants = new Bindable>(); - public readonly IBindable ParticipantCount = new Bindable(); - public readonly IBindable MaxParticipants = new Bindable(); + private OsuSpriteText slash, maxText; public ParticipantCountDisplay() { AutoSizeAxes = Axes.Both; + } + [BackgroundDependencyLoader] + private void load() + { OsuSpriteText count; InternalChild = new FillFlowContainer diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs index 743cfe0114..24a2d70b60 100644 --- a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs +++ b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs @@ -13,16 +13,16 @@ using osu.Game.Online.Multiplayer.RoomStatuses; namespace osu.Game.Screens.Multi.Components { - public class RoomStatusInfo : CompositeDrawable + public class RoomStatusInfo : MultiplayerComposite { - private readonly RoomBindings bindings = new RoomBindings(); - - public RoomStatusInfo(Room room) + public RoomStatusInfo() { - bindings.Room = room; - AutoSizeAxes = Axes.Both; + } + [BackgroundDependencyLoader] + private void load() + { StatusPart statusPart; EndDatePart endDatePart; @@ -41,10 +41,10 @@ namespace osu.Game.Screens.Multi.Components } }; - statusPart.EndDate.BindTo(bindings.EndDate); - statusPart.Status.BindTo(bindings.Status); - statusPart.Availability.BindTo(bindings.Availability); - endDatePart.EndDate.BindTo(bindings.EndDate); + statusPart.EndDate.BindTo(EndDate); + statusPart.Status.BindTo(Status); + statusPart.Availability.BindTo(Availability); + endDatePart.EndDate.BindTo(EndDate); } private class EndDatePart : DrawableDate diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs index 980879d79a..a00e08a80a 100644 --- a/osu.Game/Screens/Multi/IRoomManager.cs +++ b/osu.Game/Screens/Multi/IRoomManager.cs @@ -19,6 +19,11 @@ namespace osu.Game.Screens.Multi /// IBindableList Rooms { get; } + /// + /// The currently-active . + /// + Bindable CurrentRoom { get; } + /// /// Creates a new . /// diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs index 896a5eafdc..3918148b07 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs @@ -10,7 +10,6 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Beatmaps; -using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; @@ -34,12 +33,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components public event Action StateChanged; - private readonly RoomBindings bindings = new RoomBindings(); - private readonly Box selectionBox; - private UpdateableBeatmapBackgroundSprite background; - private BeatmapTitle beatmapTitle; - private ModeTypeInfo modeTypeInfo; + private CachedModelDependencyContainer dependencies; [Resolved] private BeatmapManager beatmaps { get; set; } @@ -80,7 +75,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components public DrawableRoom(Room room) { Room = room; - bindings.Room = room; RelativeSizeAxes = Axes.X; Height = height + SELECTION_BORDER_WIDTH * 2; @@ -99,7 +93,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components private void load(OsuColour colours) { Box sideStrip; - ParticipantInfo participantInfo; OsuSpriteText name; Children = new Drawable[] @@ -138,7 +131,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components Width = cover_width, Masking = true, Margin = new MarginPadding { Left = side_strip_width }, - Child = background = new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both } + Child = new MultiplayerBackgroundSprite { RelativeSizeAxes = Axes.Both } }, new Container { @@ -159,8 +152,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components Spacing = new Vector2(5f), Children = new Drawable[] { - name = new OsuSpriteText { TextSize = 18 }, - participantInfo = new ParticipantInfo(), + name = new OsuSpriteText + { + TextSize = 18 + }, + new ParticipantInfo(), }, }, new FillFlowContainer @@ -173,11 +169,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components Spacing = new Vector2(0, 5), Children = new Drawable[] { - new RoomStatusInfo(Room), - beatmapTitle = new BeatmapTitle { TextSize = 14 }, + new RoomStatusInfo(), + new BeatmapTitle { TextSize = 14 }, }, }, - modeTypeInfo = new ModeTypeInfo + new ModeTypeInfo { Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight, @@ -189,23 +185,21 @@ namespace osu.Game.Screens.Multi.Lounge.Components }, }; - background.Beatmap.BindTo(bindings.CurrentBeatmap); - modeTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); - modeTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset); - modeTypeInfo.Type.BindTo(bindings.Type); - beatmapTitle.Beatmap.BindTo(bindings.CurrentBeatmap); - participantInfo.Host.BindTo(bindings.Host); - participantInfo.Participants.BindTo(bindings.Participants); - participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount); - - bindings.Name.BindValueChanged(n => name.Text = n, true); - bindings.Status.BindValueChanged(s => + dependencies.ShadowModel.Name.BindValueChanged(n => name.Text = n, true); + dependencies.ShadowModel.Status.BindValueChanged(s => { foreach (Drawable d in new Drawable[] { selectionBox, sideStrip }) d.FadeColour(s.GetAppropriateColour(colours), transition_duration); }, true); } + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); + dependencies.Model.Value = Room; + return dependencies; + } + protected override void LoadComplete() { base.LoadComplete(); diff --git a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs index a053032404..806bc92882 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs @@ -1,10 +1,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Collections.Generic; using Humanizer; using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Graphics; @@ -16,26 +14,24 @@ using osuTK; namespace osu.Game.Screens.Multi.Lounge.Components { - public class ParticipantInfo : Container + public class ParticipantInfo : MultiplayerComposite { - private readonly FillFlowContainer summaryContainer; - - public readonly IBindable Host = new Bindable(); - public readonly IBindable> Participants = new Bindable>(); - public readonly IBindable ParticipantCount = new Bindable(); - public ParticipantInfo() { - OsuSpriteText summary; RelativeSizeAxes = Axes.X; Height = 15f; + } + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + OsuSpriteText summary; OsuSpriteText levelRangeHigher; OsuSpriteText levelRangeLower; Container flagContainer; LinkFlowContainer hostText; - Children = new Drawable[] + InternalChildren = new Drawable[] { new FillFlowContainer { @@ -73,12 +69,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components } }, }, - summaryContainer = new FillFlowContainer + new FillFlowContainer { Anchor = Anchor.CentreRight, Origin = Anchor.CentreRight, AutoSizeAxes = Axes.Both, Direction = FillDirection.Horizontal, + Colour = colours.Gray9, Children = new[] { summary = new OsuSpriteText @@ -101,9 +98,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components hostText.AddLink(v.Username, null, LinkAction.OpenUserProfile, v.Id.ToString(), "Open profile", s => s.Font = "Exo2.0-BoldItalic"); flagContainer.Child = new DrawableFlag(v.Country) { RelativeSizeAxes = Axes.Both }; } - }); + }, true); - ParticipantCount.BindValueChanged(v => summary.Text = $"{v:#,0}{" participant".Pluralize(v == 1)}"); + ParticipantCount.BindValueChanged(v => summary.Text = $"{v:#,0}{" participant".Pluralize(v == 1)}", true); /*Participants.BindValueChanged(v => { @@ -112,11 +109,5 @@ namespace osu.Game.Screens.Multi.Lounge.Components levelRangeHigher.Text = ranks.Max().ToString(); });*/ } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - summaryContainer.Colour = colours.Gray9; - } } } diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs index 16af06fdd7..45855c2812 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs @@ -3,7 +3,6 @@ using System; using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Colour; @@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Shapes; using osu.Game.Beatmaps; -using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Online.API; @@ -24,24 +22,18 @@ using osuTK.Graphics; namespace osu.Game.Screens.Multi.Lounge.Components { - public class RoomInspector : Container + public class RoomInspector : MultiplayerComposite { private const float transition_duration = 100; - public readonly IBindable Room = new Bindable(); - private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 }; - private readonly RoomBindings bindings = new RoomBindings(); - private OsuColour colours; private Box statusStrip; - private UpdateableBeatmapBackgroundSprite background; private ParticipantCountDisplay participantCount; private OsuSpriteText name, status; private BeatmapTypeInfo beatmapTypeInfo; private ParticipantInfo participantInfo; - private MatchParticipants participants; [Resolved] private BeatmapManager beatmaps { get; set; } @@ -51,7 +43,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components { this.colours = colours; - Children = new Drawable[] + InternalChildren = new Drawable[] { new Box { @@ -84,7 +76,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components Masking = true, Children = new Drawable[] { - background = new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both }, + new MultiplayerBackgroundSprite { RelativeSizeAxes = Axes.Both }, new Box { RelativeSizeAxes = Axes.Both, @@ -162,7 +154,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components }, new Drawable[] { - participants = new MatchParticipants + new MatchParticipants { RelativeSizeAxes = Axes.Both, } @@ -171,27 +163,15 @@ namespace osu.Game.Screens.Multi.Lounge.Components } }; - participantInfo.Host.BindTo(bindings.Host); - participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount); - participantInfo.Participants.BindTo(bindings.Participants); - participantCount.Participants.BindTo(bindings.Participants); - participantCount.ParticipantCount.BindTo(bindings.ParticipantCount); - participantCount.MaxParticipants.BindTo(bindings.MaxParticipants); - beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); - beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset); - beatmapTypeInfo.Type.BindTo(bindings.Type); - background.Beatmap.BindTo(bindings.CurrentBeatmap); - bindings.Status.BindValueChanged(displayStatus); - bindings.Name.BindValueChanged(n => name.Text = n); - Room.BindValueChanged(updateRoom, true); + Status.BindValueChanged(displayStatus); + Name.BindValueChanged(n => name.Text = n); + + RoomID.BindValueChanged(updateRoom); } - private void updateRoom(Room room) + private void updateRoom(int? roomId) { - bindings.Room = room; - participants.Room = room; - - if (room != null) + if (roomId != null) { participantCount.FadeIn(transition_duration); beatmapTypeInfo.FadeIn(transition_duration); @@ -224,24 +204,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8; } - private class MatchParticipants : CompositeDrawable + private class MatchParticipants : MultiplayerComposite { - private Room room; private readonly FillFlowContainer fill; - public Room Room - { - get { return room; } - set - { - if (room == value) - return; - - room = value; - updateParticipants(); - } - } - public MatchParticipants() { Padding = new MarginPadding { Horizontal = 10 }; @@ -259,6 +225,12 @@ namespace osu.Game.Screens.Multi.Lounge.Components }; } + [BackgroundDependencyLoader] + private void load() + { + RoomID.BindValueChanged(_ => updateParticipants(), true); + } + [Resolved] private APIAccess api { get; set; } @@ -266,7 +238,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components private void updateParticipants() { - var roomId = room?.RoomID.Value ?? 0; + var roomId = RoomID.Value ?? 0; request?.Cancel(); @@ -284,7 +256,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components request = new GetRoomScoresRequest(roomId); request.Success += scores => { - if (roomId != room.RoomID.Value) + if (roomId != RoomID.Value) return; fill.Clear(); diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs index ac13a16388..12d9b2957c 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs @@ -19,8 +19,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components { public Action JoinRequested; - private readonly Bindable selectedRoom = new Bindable(); - public IBindable SelectedRoom => selectedRoom; + private readonly Bindable currentRoom = new Bindable(); private readonly IBindableList rooms = new BindableList(); @@ -47,6 +46,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components [BackgroundDependencyLoader] private void load() { + currentRoom.BindTo(roomManager.CurrentRoom); rooms.BindTo(roomManager.Rooms); rooms.ItemsAdded += addRooms; @@ -121,7 +121,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components else roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected); - selectedRoom.Value = room; + currentRoom.Value = room; } protected override void Dispose(bool isDisposing) diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 5bc36090d5..50788a2fc2 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -2,6 +2,8 @@ // See the LICENCE file in the repository root for full licence text. using System; +using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input.Events; @@ -24,13 +26,12 @@ namespace osu.Game.Screens.Multi.Lounge private readonly Action pushGameplayScreen; private readonly ProcessingOverlay processingOverlay; + private readonly Bindable currentRoom = new Bindable(); + public LoungeSubScreen(Action pushGameplayScreen) { this.pushGameplayScreen = pushGameplayScreen; - RoomInspector inspector; - RoomsContainer rooms; - InternalChildren = new Drawable[] { Filter = new FilterControl { Depth = -1 }, @@ -54,13 +55,13 @@ namespace osu.Game.Screens.Multi.Lounge { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Child = rooms = new RoomsContainer { JoinRequested = joinRequested } + Child = new RoomsContainer { JoinRequested = joinRequested } }, }, processingOverlay = new ProcessingOverlay { Alpha = 0 } } }, - inspector = new RoomInspector + new RoomInspector { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, @@ -71,11 +72,15 @@ namespace osu.Game.Screens.Multi.Lounge }, }; - inspector.Room.BindTo(rooms.SelectedRoom); - Filter.Search.Exit += this.Exit; } + [BackgroundDependencyLoader] + private void load(IRoomManager roomManager) + { + currentRoom.BindTo(roomManager.CurrentRoom); + } + protected override void UpdateAfterChildren() { base.UpdateAfterChildren(); @@ -116,7 +121,7 @@ namespace osu.Game.Screens.Multi.Lounge processingOverlay.Show(); Manager?.JoinRoom(room, r => { - Push(room); + Open(room); processingOverlay.Hide(); }, _ => processingOverlay.Hide()); } @@ -124,13 +129,15 @@ namespace osu.Game.Screens.Multi.Lounge /// /// Push a room as a new subscreen. /// - public void Push(Room room) + public void Open(Room room) { // Handles the case where a room is clicked 3 times in quick succession if (!this.IsCurrentScreen()) return; - this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); + currentRoom.Value = room; + + this.Push(new MatchSubScreen(s => pushGameplayScreen?.Invoke(s))); } } } diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs index 29546f9b06..55c7c02be4 100644 --- a/osu.Game/Screens/Multi/Match/Components/Header.cs +++ b/osu.Game/Screens/Multi/Match/Components/Header.cs @@ -20,31 +20,27 @@ using osuTK.Graphics; namespace osu.Game.Screens.Multi.Match.Components { - public class Header : Container + public class Header : MultiplayerComposite { public const float HEIGHT = 200; - private readonly RoomBindings bindings = new RoomBindings(); + public MatchTabControl Tabs; - private readonly Box tabStrip; + public Action RequestBeatmapSelection; - public readonly MatchTabControl Tabs; - - public Action OnRequestSelectBeatmap; - - public Header(Room room) + public Header() { RelativeSizeAxes = Axes.X; Height = HEIGHT; + } - bindings.Room = room; - - BeatmapTypeInfo beatmapTypeInfo; + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { BeatmapSelectButton beatmapButton; - UpdateableBeatmapBackgroundSprite background; ModDisplay modDisplay; - Children = new Drawable[] + InternalChildren = new Drawable[] { new Container { @@ -52,7 +48,7 @@ namespace osu.Game.Screens.Multi.Match.Components Masking = true, Children = new Drawable[] { - background = new HeaderBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both }, + new HeaderBackgroundSprite { RelativeSizeAxes = Axes.Both }, new Box { RelativeSizeAxes = Axes.Both, @@ -60,12 +56,13 @@ namespace osu.Game.Screens.Multi.Match.Components }, } }, - tabStrip = new Box + new Box { Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, RelativeSizeAxes = Axes.X, Height = 1, + Colour = colours.Yellow }, new Container { @@ -80,7 +77,7 @@ namespace osu.Game.Screens.Multi.Match.Components Direction = FillDirection.Vertical, Children = new Drawable[] { - beatmapTypeInfo = new BeatmapTypeInfo(), + new BeatmapTypeInfo(), modDisplay = new ModDisplay { Scale = new Vector2(0.75f), @@ -95,13 +92,13 @@ namespace osu.Game.Screens.Multi.Match.Components RelativeSizeAxes = Axes.Y, Width = 200, Padding = new MarginPadding { Vertical = 10 }, - Child = beatmapButton = new BeatmapSelectButton(room) + Child = beatmapButton = new BeatmapSelectButton { RelativeSizeAxes = Axes.Both, Height = 1, }, }, - Tabs = new MatchTabControl(room) + Tabs = new MatchTabControl { Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, @@ -111,37 +108,36 @@ namespace osu.Game.Screens.Multi.Match.Components }, }; - beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); - beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset); - beatmapTypeInfo.Type.BindTo(bindings.Type); - background.Beatmap.BindTo(bindings.CurrentBeatmap); - bindings.CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true); + CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true); - beatmapButton.Action = () => OnRequestSelectBeatmap?.Invoke(); - } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - tabStrip.Colour = colours.Yellow; + beatmapButton.Action = () => RequestBeatmapSelection?.Invoke(); } private class BeatmapSelectButton : HeaderButton { - private readonly IBindable roomIDBind = new Bindable(); + [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.RoomID))] + private Bindable roomId { get; set; } - public BeatmapSelectButton(Room room) + public BeatmapSelectButton() { Text = "Select beatmap"; + } - roomIDBind.BindTo(room.RoomID); - roomIDBind.BindValueChanged(v => this.FadeTo(v.HasValue ? 0 : 1), true); + [BackgroundDependencyLoader] + private void load() + { + roomId.BindValueChanged(v => this.FadeTo(v.HasValue ? 0 : 1), true); } } - private class HeaderBeatmapBackgroundSprite : UpdateableBeatmapBackgroundSprite + private class HeaderBackgroundSprite : MultiplayerBackgroundSprite { - protected override double FadeDuration => 200; + protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both }; + + private class BackgroundSprite : UpdateableBeatmapBackgroundSprite + { + protected override double FadeDuration => 200; + } } } } diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs index 7894385afb..ec6dbb6d12 100644 --- a/osu.Game/Screens/Multi/Match/Components/Info.cs +++ b/osu.Game/Screens/Multi/Match/Components/Info.cs @@ -2,35 +2,37 @@ // See the LICENCE file in the repository root for full licence text. using System; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; -using osu.Game.Online.Multiplayer; using osu.Game.Overlays.SearchableList; using osu.Game.Screens.Multi.Components; using osuTK; namespace osu.Game.Screens.Multi.Match.Components { - public class Info : Container + public class Info : MultiplayerComposite { public Action OnStart; - private readonly RoomBindings bindings = new RoomBindings(); - - public Info(Room room) + public Info() { RelativeSizeAxes = Axes.X; AutoSizeAxes = Axes.Y; + } + [BackgroundDependencyLoader] + private void load() + { ReadyButton readyButton; ViewBeatmapButton viewBeatmapButton; HostInfo hostInfo; RoomStatusInfo statusInfo; - Children = new Drawable[] + InternalChildren = new Drawable[] { new Box { @@ -61,9 +63,9 @@ namespace osu.Game.Screens.Multi.Match.Components new OsuSpriteText { TextSize = 30, - Current = bindings.Name + Current = Name }, - new RoomStatusInfo(room), + new RoomStatusInfo(), } }, hostInfo = new HostInfo(), @@ -80,7 +82,7 @@ namespace osu.Game.Screens.Multi.Match.Components Children = new Drawable[] { viewBeatmapButton = new ViewBeatmapButton(), - readyButton = new ReadyButton(room) + readyButton = new ReadyButton { Action = () => OnStart?.Invoke() } @@ -90,11 +92,9 @@ namespace osu.Game.Screens.Multi.Match.Components }, }; - viewBeatmapButton.Beatmap.BindTo(bindings.CurrentBeatmap); - readyButton.Beatmap.BindTo(bindings.CurrentBeatmap); - hostInfo.Host.BindTo(bindings.Host); - - bindings.Room = room; + viewBeatmapButton.Beatmap.BindTo(CurrentBeatmap); + readyButton.Beatmap.BindTo(CurrentBeatmap); + hostInfo.Host.BindTo(Host); } } } diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs index e0438e6729..0b61637cd5 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Game.Online.Chat; using osu.Game.Online.Multiplayer; @@ -9,28 +10,31 @@ namespace osu.Game.Screens.Multi.Match.Components { public class MatchChatDisplay : StandAloneChatDisplay { - private readonly Room room; + [Resolved(typeof(Room), nameof(Room.RoomID))] + private Bindable roomId { get; set; } + + [Resolved(typeof(Room), nameof(Room.ChannelId))] + private Bindable channelId { get; set; } [Resolved(CanBeNull = true)] private ChannelManager channelManager { get; set; } - public MatchChatDisplay(Room room) + public MatchChatDisplay() : base(true) { - this.room = room; } protected override void LoadComplete() { base.LoadComplete(); - room.RoomID.BindValueChanged(v => updateChannel(), true); + roomId.BindValueChanged(v => updateChannel(), true); } private void updateChannel() { - if (room.RoomID.Value != null) - Channel.Value = channelManager?.JoinChannel(new Channel { Id = room.ChannelId, Type = ChannelType.Multiplayer, Name = $"#mp_{room.RoomID}" }); + if (roomId.Value != null) + Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId, Type = ChannelType.Multiplayer, Name = $"#mp_{roomId.Value}" }); } } } diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs index 33953bd5a6..60604eeb5c 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Game.Online.API; using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests.Responses; @@ -16,18 +17,13 @@ namespace osu.Game.Screens.Multi.Match.Components { public Action> ScoresLoaded; - public Room Room - { - get => bindings.Room; - set => bindings.Room = value; - } - - private readonly RoomBindings bindings = new RoomBindings(); + [Resolved(typeof(Room), nameof(Room.RoomID))] + private Bindable roomId { get; set; } [BackgroundDependencyLoader] private void load() { - bindings.RoomID.BindValueChanged(id => + roomId.BindValueChanged(id => { if (id == null) return; @@ -39,10 +35,10 @@ namespace osu.Game.Screens.Multi.Match.Components protected override APIRequest FetchScores(Action> scoresCallback) { - if (bindings.RoomID.Value == null) + if (roomId.Value == null) return null; - var req = new GetRoomScoresRequest(bindings.RoomID.Value ?? 0); + var req = new GetRoomScoresRequest(roomId.Value ?? 0); req.Success += r => { diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs index 5b9402683e..dcbeb07904 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs @@ -22,43 +22,53 @@ namespace osu.Game.Screens.Multi.Match.Components { private const float transition_duration = 350; private const float field_padding = 45; - private const float disabled_alpha = 0.2f; - private readonly RoomBindings bindings = new RoomBindings(); + protected MatchSettings Settings { get; private set; } - private readonly Container content; - - private readonly OsuSpriteText typeLabel; - - protected readonly OsuTextBox NameField, MaxParticipantsField; - protected readonly OsuDropdown DurationField; - protected readonly RoomAvailabilityPicker AvailabilityPicker; - protected readonly GameTypePicker TypePicker; - protected readonly TriangleButton ApplyButton; - protected readonly OsuPasswordTextBox PasswordField; - - protected readonly OsuSpriteText ErrorText; - - private readonly ProcessingOverlay processingOverlay; - - private readonly Room room; - - [Resolved(CanBeNull = true)] - private IRoomManager manager { get; set; } - - public MatchSettingsOverlay(Room room) + [BackgroundDependencyLoader] + private void load() { - this.room = room; - - bindings.Room = room; - Masking = true; - Child = content = new Container + Child = Settings = new MatchSettings { RelativeSizeAxes = Axes.Both, - RelativePositionAxes = Axes.Y, - Children = new Drawable[] + RelativePositionAxes = Axes.Y + }; + } + + protected override void PopIn() + { + Settings.MoveToY(0, transition_duration, Easing.OutQuint); + } + + protected override void PopOut() + { + Settings.MoveToY(-1, transition_duration, Easing.InSine); + } + + protected class MatchSettings : MultiplayerComposite + { + private const float disabled_alpha = 0.2f; + + public OsuTextBox NameField, MaxParticipantsField; + public OsuDropdown DurationField; + public RoomAvailabilityPicker AvailabilityPicker; + public GameTypePicker TypePicker; + public TriangleButton ApplyButton; + + public OsuSpriteText ErrorText; + + private OsuSpriteText typeLabel; + private ProcessingOverlay processingOverlay; + + [Resolved(CanBeNull = true)] + private IRoomManager manager { get; set; } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + InternalChildren = new Drawable[] { new Box { @@ -111,7 +121,10 @@ namespace osu.Game.Screens.Multi.Match.Components new Section("Room visibility") { Alpha = disabled_alpha, - Child = AvailabilityPicker = new RoomAvailabilityPicker(), + Child = AvailabilityPicker = new RoomAvailabilityPicker + { + Enabled = { Value = false } + }, }, new Section("Game type") { @@ -127,10 +140,12 @@ namespace osu.Game.Screens.Multi.Match.Components TypePicker = new GameTypePicker { RelativeSizeAxes = Axes.X, + Enabled = { Value = false } }, typeLabel = new OsuSpriteText { TextSize = 14, + Colour = colours.Yellow }, }, }, @@ -151,7 +166,8 @@ namespace osu.Game.Screens.Multi.Match.Components { RelativeSizeAxes = Axes.X, TabbableContentContainer = this, - OnCommit = (sender, text) => apply(), + ReadOnly = true, + OnCommit = (sender, text) => apply() }, }, new Section("Duration") @@ -177,10 +193,11 @@ namespace osu.Game.Screens.Multi.Match.Components new Section("Password (optional)") { Alpha = disabled_alpha, - Child = PasswordField = new SettingsPasswordTextBox + Child = new SettingsPasswordTextBox { RelativeSizeAxes = Axes.X, TabbableContentContainer = this, + ReadOnly = true, OnCommit = (sender, text) => apply() }, }, @@ -222,6 +239,7 @@ namespace osu.Game.Screens.Multi.Match.Components Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, Size = new Vector2(230, 55), + Enabled = { Value = false }, Action = apply, }, ErrorText = new OsuSpriteText @@ -229,7 +247,8 @@ namespace osu.Game.Screens.Multi.Match.Components Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, Alpha = 0, - Depth = 1 + Depth = 1, + Colour = colours.RedDark } } } @@ -239,80 +258,58 @@ namespace osu.Game.Screens.Multi.Match.Components } }, processingOverlay = new ProcessingOverlay { Alpha = 0 } - }, - }; + }; - TypePicker.Current.ValueChanged += t => typeLabel.Text = t.Name; + TypePicker.Current.ValueChanged += t => typeLabel.Text = t.Name; - bindings.Name.BindValueChanged(n => NameField.Text = n, true); - bindings.Availability.BindValueChanged(a => AvailabilityPicker.Current.Value = a, true); - bindings.Type.BindValueChanged(t => TypePicker.Current.Value = t, true); - bindings.MaxParticipants.BindValueChanged(m => MaxParticipantsField.Text = m?.ToString(), true); - bindings.Duration.BindValueChanged(d => DurationField.Current.Value = d, true); - } + Name.BindValueChanged(n => NameField.Text = n, true); + Availability.BindValueChanged(a => AvailabilityPicker.Current.Value = a, true); + Type.BindValueChanged(t => TypePicker.Current.Value = t, true); + MaxParticipants.BindValueChanged(m => MaxParticipantsField.Text = m?.ToString(), true); + Duration.BindValueChanged(d => DurationField.Current.Value = d, true); + } - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - typeLabel.Colour = colours.Yellow; - ErrorText.Colour = colours.RedDark; + protected override void Update() + { + base.Update(); - MaxParticipantsField.ReadOnly = true; - PasswordField.ReadOnly = true; - AvailabilityPicker.Enabled.Value = false; - TypePicker.Enabled.Value = false; - ApplyButton.Enabled.Value = false; - } + ApplyButton.Enabled.Value = hasValidSettings; + } - protected override void Update() - { - base.Update(); + private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0; - ApplyButton.Enabled.Value = hasValidSettings; - } - private bool hasValidSettings => bindings.Room.RoomID.Value == null && NameField.Text.Length > 0 && bindings.Playlist.Count > 0; + private void apply() + { + hideError(); - protected override void PopIn() - { - content.MoveToY(0, transition_duration, Easing.OutQuint); - } + Name.Value = NameField.Text; + Availability.Value = AvailabilityPicker.Current.Value; + Type.Value = TypePicker.Current.Value; - protected override void PopOut() - { - content.MoveToY(-1, transition_duration, Easing.InSine); - } + if (int.TryParse(MaxParticipantsField.Text, out int max)) + MaxParticipants.Value = max; + else + MaxParticipants.Value = null; - private void apply() - { - hideError(); + Duration.Value = DurationField.Current.Value; - bindings.Name.Value = NameField.Text; - bindings.Availability.Value = AvailabilityPicker.Current.Value; - bindings.Type.Value = TypePicker.Current.Value; + manager?.CreateRoom(Room, onSuccess, onError); - if (int.TryParse(MaxParticipantsField.Text, out int max)) - bindings.MaxParticipants.Value = max; - else - bindings.MaxParticipants.Value = null; + processingOverlay.Show(); + } - bindings.Duration.Value = DurationField.Current.Value; + private void hideError() => ErrorText.FadeOut(50); - manager?.CreateRoom(room, onSuccess, onError); + private void onSuccess(Room room) => processingOverlay.Hide(); - processingOverlay.Show(); - } + private void onError(string text) + { + ErrorText.Text = text; + ErrorText.FadeIn(50); - private void hideError() => ErrorText.FadeOut(50); - - private void onSuccess(Room room) => processingOverlay.Hide(); - - private void onError(string text) - { - ErrorText.Text = text; - ErrorText.FadeIn(50); - - processingOverlay.Hide(); + processingOverlay.Hide(); + } } private class SettingsTextBox : OsuTextBox diff --git a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs index 84998417e9..7ac1016e72 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs @@ -14,12 +14,11 @@ namespace osu.Game.Screens.Multi.Match.Components { public class MatchTabControl : PageTabControl { - private readonly IBindable roomIdBind = new Bindable(); + [Resolved(typeof(Room), nameof(Room.RoomID))] + private Bindable roomId { get; set; } - public MatchTabControl(Room room) + public MatchTabControl() { - roomIdBind.BindTo(room.RoomID); - AddItem(new RoomMatchPage()); AddItem(new SettingsMatchPage()); } @@ -27,7 +26,7 @@ namespace osu.Game.Screens.Multi.Match.Components [BackgroundDependencyLoader] private void load() { - roomIdBind.BindValueChanged(v => + roomId.BindValueChanged(v => { if (v.HasValue) { diff --git a/osu.Game/Screens/Multi/Match/Components/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs index 5b9498ce7c..82a79475ff 100644 --- a/osu.Game/Screens/Multi/Match/Components/Participants.cs +++ b/osu.Game/Screens/Multi/Match/Components/Participants.cs @@ -1,9 +1,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Collections.Generic; using System.Linq; -using osu.Framework.Configuration; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Overlays.SearchableList; @@ -13,16 +12,12 @@ using osuTK; namespace osu.Game.Screens.Multi.Match.Components { - public class Participants : CompositeDrawable + public class Participants : MultiplayerComposite { - public readonly IBindable> Users = new Bindable>(); - public readonly IBindable ParticipantCount = new Bindable(); - public readonly IBindable MaxParticipants = new Bindable(); - - public Participants() + [BackgroundDependencyLoader] + private void load() { FillFlowContainer usersFlow; - ParticipantCountDisplay count; InternalChild = new Container { @@ -36,7 +31,7 @@ namespace osu.Game.Screens.Multi.Match.Components Padding = new MarginPadding { Top = 10 }, Children = new Drawable[] { - count = new ParticipantCountDisplay + new ParticipantCountDisplay { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, @@ -55,11 +50,7 @@ namespace osu.Game.Screens.Multi.Match.Components }, }; - count.Participants.BindTo(Users); - count.ParticipantCount.BindTo(ParticipantCount); - count.MaxParticipants.BindTo(MaxParticipants); - - Users.BindValueChanged(v => + Participants.BindValueChanged(v => { usersFlow.Children = v.Select(u => new UserPanel(u) { diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs index 1bde6270f6..276e8f3530 100644 --- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs +++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs @@ -16,7 +16,8 @@ namespace osu.Game.Screens.Multi.Match.Components { public readonly IBindable Beatmap = new Bindable(); - private readonly Room room; + [Resolved(typeof(Room), nameof(Room.EndDate))] + private Bindable endDate { get; set; } [Resolved] private IBindableBeatmap gameBeatmap { get; set; } @@ -26,9 +27,8 @@ namespace osu.Game.Screens.Multi.Match.Components private bool hasBeatmap; - public ReadyButton(Room room) + public ReadyButton() { - this.room = room; RelativeSizeAxes = Axes.Y; Size = new Vector2(200, 1); @@ -74,7 +74,7 @@ namespace osu.Game.Screens.Multi.Match.Components return; } - bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < room.EndDate; + bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate; Enabled.Value = hasBeatmap && hasEnoughTime; } diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 980f321c92..12930d814b 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -4,6 +4,7 @@ using System; using System.Linq; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Screens; @@ -22,130 +23,38 @@ namespace osu.Game.Screens.Multi.Match { public override bool AllowBeatmapRulesetChange => false; - public override string Title => room.RoomID.Value == null ? "New room" : room.Name.Value; + public override string Title => roomId?.Value == null ? "New room" : name.Value; + public override string ShortTitle => "room"; - private readonly RoomBindings bindings = new RoomBindings(); + [Resolved(typeof(Room), nameof(Room.RoomID))] + private Bindable roomId { get; set; } - private readonly MatchLeaderboard leaderboard; + [Resolved(typeof(Room), nameof(Room.Name))] + private Bindable name { get; set; } - private readonly Action pushGameplayScreen; + [Resolved(typeof(Room), nameof(Room.Playlist))] + private BindableList playlist { get; set; } - [Cached] - private readonly Room room; - - [Resolved] - private BeatmapManager beatmapManager { get; set; } - - public MatchSubScreen(Room room, Action pushGameplayScreen) + public MatchSubScreen(Action pushGameplayScreen) { - this.room = room; - this.pushGameplayScreen = pushGameplayScreen; - - bindings.Room = room; - - MatchChatDisplay chat; - Components.Header header; - Info info; - GridContainer bottomRow; - MatchSettingsOverlay settings; - - InternalChildren = new Drawable[] + InternalChild = new Match(pushGameplayScreen) { - new GridContainer + RelativeSizeAxes = Axes.Both, + RequestBeatmapSelection = () => this.Push(new MatchSongSelect { - RelativeSizeAxes = Axes.Both, - Content = new[] + Selected = item => { - new Drawable[] { header = new Components.Header(room) { Depth = -1 } }, - new Drawable[] { info = new Info(room) { OnStart = onStart } }, - new Drawable[] - { - bottomRow = new GridContainer - { - RelativeSizeAxes = Axes.Both, - Content = new[] - { - new Drawable[] - { - leaderboard = new MatchLeaderboard - { - Padding = new MarginPadding - { - Left = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, - Right = 10, - Vertical = 10, - }, - RelativeSizeAxes = Axes.Both, - Room = room - }, - new Container - { - Padding = new MarginPadding - { - Left = 10, - Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, - Vertical = 10, - }, - RelativeSizeAxes = Axes.Both, - Child = chat = new MatchChatDisplay(room) - { - RelativeSizeAxes = Axes.Both - } - }, - }, - }, - } - }, + playlist.Clear(); + playlist.Add(item); }, - RowDimensions = new[] - { - new Dimension(GridSizeMode.AutoSize), - new Dimension(GridSizeMode.AutoSize), - new Dimension(GridSizeMode.Distributed), - } - }, - new Container + }), + RequestExit = () => { - RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = Components.Header.HEIGHT }, - Child = settings = new MatchSettingsOverlay(room) { RelativeSizeAxes = Axes.Both }, - }, - }; - - header.OnRequestSelectBeatmap = () => this.Push(new MatchSongSelect - { - Selected = addPlaylistItem, - }); - - header.Tabs.Current.ValueChanged += t => - { - const float fade_duration = 500; - if (t is SettingsMatchPage) - { - settings.Show(); - info.FadeOut(fade_duration, Easing.OutQuint); - bottomRow.FadeOut(fade_duration, Easing.OutQuint); - } - else - { - settings.Hide(); - info.FadeIn(fade_duration, Easing.OutQuint); - bottomRow.FadeIn(fade_duration, Easing.OutQuint); + if (this.IsCurrentScreen()) + this.Exit(); } }; - - chat.Exit += () => - { - if (this.IsCurrentScreen()) - this.Exit(); - }; - } - - [BackgroundDependencyLoader] - private void load() - { - beatmapManager.ItemAdded += beatmapAdded; } public override bool OnExiting(IScreen next) @@ -154,73 +63,191 @@ namespace osu.Game.Screens.Multi.Match return base.OnExiting(next); } - protected override void LoadComplete() + private class Match : MultiplayerComposite { - base.LoadComplete(); + public Action RequestBeatmapSelection; + public Action RequestExit; - bindings.CurrentBeatmap.BindValueChanged(setBeatmap, true); - bindings.CurrentRuleset.BindValueChanged(setRuleset, true); - } + private readonly Action pushGameplayScreen; - private void setBeatmap(BeatmapInfo beatmap) - { - // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info - var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID); + private MatchLeaderboard leaderboard; - Game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); - } + [Resolved] + private IBindableBeatmap gameBeatmap { get; set; } - private void setRuleset(RulesetInfo ruleset) - { - if (ruleset == null) - return; + [Resolved] + private BeatmapManager beatmapManager { get; set; } - Game?.ForcefullySetRuleset(ruleset); - } + [Resolved(CanBeNull = true)] + private OsuGame game { get; set; } - private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => - { - if (Beatmap.Value != beatmapManager.DefaultBeatmap) - return; - - if (bindings.CurrentBeatmap.Value == null) - return; - - // Try to retrieve the corresponding local beatmap - var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == bindings.CurrentBeatmap.Value.OnlineBeatmapID); - - if (localBeatmap != null) - Game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); - }); - - private void addPlaylistItem(PlaylistItem item) - { - bindings.Playlist.Clear(); - bindings.Playlist.Add(item); - } - - private void onStart() - { - Beatmap.Value.Mods.Value = bindings.CurrentMods.Value.ToArray(); - - switch (bindings.Type.Value) + public Match(Action pushGameplayScreen) { - default: - case GameTypeTimeshift _: - pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(room, room.Playlist.First().ID) - { - Exited = () => leaderboard.RefreshScores() - })); - break; + this.pushGameplayScreen = pushGameplayScreen; } - } - protected override void Dispose(bool isDisposing) - { - base.Dispose(isDisposing); + [BackgroundDependencyLoader] + private void load() + { + MatchChatDisplay chat; + Components.Header header; + Info info; + GridContainer bottomRow; + MatchSettingsOverlay settings; - if (beatmapManager != null) - beatmapManager.ItemAdded -= beatmapAdded; + InternalChildren = new Drawable[] + { + new GridContainer + { + RelativeSizeAxes = Axes.Both, + Content = new[] + { + new Drawable[] + { + header = new Components.Header + { + Depth = -1, + RequestBeatmapSelection = () => RequestBeatmapSelection?.Invoke() + } + }, + new Drawable[] { info = new Info { OnStart = onStart } }, + new Drawable[] + { + bottomRow = new GridContainer + { + RelativeSizeAxes = Axes.Both, + Content = new[] + { + new Drawable[] + { + leaderboard = new MatchLeaderboard + { + Padding = new MarginPadding + { + Left = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, + Right = 10, + Vertical = 10, + }, + RelativeSizeAxes = Axes.Both + }, + new Container + { + Padding = new MarginPadding + { + Left = 10, + Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, + Vertical = 10, + }, + RelativeSizeAxes = Axes.Both, + Child = chat = new MatchChatDisplay + { + RelativeSizeAxes = Axes.Both + } + }, + }, + }, + } + }, + }, + RowDimensions = new[] + { + new Dimension(GridSizeMode.AutoSize), + new Dimension(GridSizeMode.AutoSize), + new Dimension(GridSizeMode.Distributed), + } + }, + new Container + { + RelativeSizeAxes = Axes.Both, + Padding = new MarginPadding { Top = Components.Header.HEIGHT }, + Child = settings = new MatchSettingsOverlay { RelativeSizeAxes = Axes.Both }, + }, + }; + + header.Tabs.Current.ValueChanged += t => + { + const float fade_duration = 500; + if (t is SettingsMatchPage) + { + settings.Show(); + info.FadeOut(fade_duration, Easing.OutQuint); + bottomRow.FadeOut(fade_duration, Easing.OutQuint); + } + else + { + settings.Hide(); + info.FadeIn(fade_duration, Easing.OutQuint); + bottomRow.FadeIn(fade_duration, Easing.OutQuint); + } + }; + + chat.Exit += () => RequestExit?.Invoke(); + + beatmapManager.ItemAdded += beatmapAdded; + } + + protected override void LoadComplete() + { + base.LoadComplete(); + + CurrentBeatmap.BindValueChanged(setBeatmap, true); + CurrentRuleset.BindValueChanged(setRuleset, true); + } + + private void setBeatmap(BeatmapInfo beatmap) + { + // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info + var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID); + + game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); + } + + private void setRuleset(RulesetInfo ruleset) + { + if (ruleset == null) + return; + + game?.ForcefullySetRuleset(ruleset); + } + + private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => + { + if (gameBeatmap.Value != beatmapManager.DefaultBeatmap) + return; + + if (CurrentBeatmap.Value == null) + return; + + // Try to retrieve the corresponding local beatmap + var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentBeatmap.Value.OnlineBeatmapID); + + if (localBeatmap != null) + game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); + }); + + private void onStart() + { + gameBeatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); + + switch (Type.Value) + { + default: + case GameTypeTimeshift _: + pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(Playlist.First().ID) + { + Exited = () => leaderboard.RefreshScores() + })); + break; + } + } + + protected override void Dispose(bool isDisposing) + { + base.Dispose(isDisposing); + + if (beatmapManager != null) + beatmapManager.ItemAdded -= beatmapAdded; + } } } } diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index f0297cdfa9..6851bc2a2a 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -123,7 +123,7 @@ namespace osu.Game.Screens.Multi Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, }, Text = "Create room", - Action = () => loungeSubScreen.Push(new Room + Action = () => loungeSubScreen.Open(new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } }), diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs index f09750b112..1e68727438 100644 --- a/osu.Game/Screens/Multi/MultiplayerComposite.cs +++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs @@ -18,52 +18,52 @@ namespace osu.Game.Screens.Multi public class MultiplayerComposite : CompositeDrawable { [Resolved] - public Room Room { get; private set; } + protected Room Room { get; private set; } [Resolved(typeof(Room))] - public Bindable RoomID { get; private set; } + protected Bindable RoomID { get; private set; } [Resolved(typeof(Room))] - public Bindable Name { get; private set; } + protected Bindable Name { get; private set; } [Resolved(typeof(Room))] - public Bindable Host { get; private set; } + protected Bindable Host { get; private set; } [Resolved(typeof(Room))] - public Bindable Status { get; private set; } + protected Bindable Status { get; private set; } [Resolved(typeof(Room))] - public Bindable Type { get; private set; } + protected Bindable Type { get; private set; } [Resolved(typeof(Room))] - public BindableList Playlist { get; private set; } + protected BindableList Playlist { get; private set; } [Resolved(typeof(Room))] - public Bindable> Participants { get; private set; } + protected Bindable> Participants { get; private set; } [Resolved(typeof(Room))] - public Bindable ParticipantCount { get; private set; } + protected Bindable ParticipantCount { get; private set; } [Resolved(typeof(Room))] - public Bindable MaxParticipants { get; private set; } + protected Bindable MaxParticipants { get; private set; } [Resolved(typeof(Room))] - public Bindable EndDate { get; private set; } + protected Bindable EndDate { get; private set; } [Resolved(typeof(Room))] - public Bindable Availability { get; private set; } + protected Bindable Availability { get; private set; } [Resolved(typeof(Room))] - public Bindable Duration { get; private set; } + protected Bindable Duration { get; private set; } private readonly Bindable currentBeatmap = new Bindable(); - public IBindable CurrentBeatmap => currentBeatmap; + protected IBindable CurrentBeatmap => currentBeatmap; private readonly Bindable> currentMods = new Bindable>(); - public IBindable> CurrentMods => currentMods; + protected IBindable> CurrentMods => currentMods; private readonly Bindable currentRuleset = new Bindable(); - public IBindable CurrentRuleset => currentRuleset; + protected IBindable CurrentRuleset => currentRuleset; protected override void LoadComplete() { diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs index 36cf0f0282..6cddd235e1 100644 --- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs +++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.Threading; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Logging; using osu.Framework.Screens; using osu.Game.Online.API; @@ -21,15 +22,16 @@ namespace osu.Game.Screens.Multi.Play { public Action Exited; - private readonly Room room; + [Resolved(typeof(Room), nameof(Room.RoomID))] + private Bindable roomId { get; set; } + private readonly int playlistItemId; [Resolved] private APIAccess api { get; set; } - public TimeshiftPlayer(Room room, int playlistItemId) + public TimeshiftPlayer(int playlistItemId) { - this.room = room; this.playlistItemId = playlistItemId; } @@ -42,7 +44,7 @@ namespace osu.Game.Screens.Multi.Play bool failed = false; - var req = new CreateRoomScoreRequest(room.RoomID.Value ?? 0, playlistItemId); + var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItemId); req.Success += r => token = r.ID; req.Failure += e => { @@ -87,7 +89,7 @@ namespace osu.Game.Screens.Multi.Play Debug.Assert(token != null); - var request = new SubmitRoomScoreRequest(token.Value, room.RoomID.Value ?? 0, playlistItemId, score); + var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItemId, score); request.Failure += e => Logger.Error(e, "Failed to submit score"); api.Queue(request); } @@ -99,6 +101,6 @@ namespace osu.Game.Screens.Multi.Play Exited = null; } - protected override Results CreateResults(ScoreInfo score) => new MatchResults(score, room); + protected override Results CreateResults(ScoreInfo score) => new MatchResults(score); } } diff --git a/osu.Game/Screens/Multi/Ranking/MatchResults.cs b/osu.Game/Screens/Multi/Ranking/MatchResults.cs index d14d94928d..db52a79ccb 100644 --- a/osu.Game/Screens/Multi/Ranking/MatchResults.cs +++ b/osu.Game/Screens/Multi/Ranking/MatchResults.cs @@ -2,7 +2,6 @@ // See the LICENCE file in the repository root for full licence text. using System.Collections.Generic; -using osu.Game.Online.Multiplayer; using osu.Game.Scoring; using osu.Game.Screens.Multi.Ranking.Types; using osu.Game.Screens.Ranking; @@ -12,19 +11,16 @@ namespace osu.Game.Screens.Multi.Ranking { public class MatchResults : Results { - private readonly Room room; - - public MatchResults(ScoreInfo score, Room room) + public MatchResults(ScoreInfo score) : base(score) { - this.room = room; } protected override IEnumerable CreateResultPages() => new IResultPageInfo[] { new ScoreOverviewPageInfo(Score, Beatmap), new LocalLeaderboardPageInfo(Score, Beatmap), - new RoomLeaderboardPageInfo(Score, Beatmap, room), + new RoomLeaderboardPageInfo(Score, Beatmap), }; } } diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs index a1d0a1ea44..1b4c99d972 100644 --- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs +++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Internal; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; @@ -23,16 +24,15 @@ namespace osu.Game.Screens.Multi.Ranking.Pages { public class RoomLeaderboardPage : ResultsPage { - private readonly Room room; - private OsuColour colours; - private TextFlowContainer rankText; - public RoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap, Room room) + [Resolved(typeof(Room), nameof(Room.Name))] + private Bindable name { get; set; } + + public RoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap) : base(score, beatmap) { - this.room = room; } [BackgroundDependencyLoader] @@ -53,7 +53,7 @@ namespace osu.Game.Screens.Multi.Ranking.Pages { RelativeSizeAxes = Axes.Both, BackgroundColour = colours.Gray6, - Child = leaderboard = CreateLeaderboard(room) + Child = leaderboard = CreateLeaderboard() }, rankText = new TextFlowContainer { @@ -84,7 +84,7 @@ namespace osu.Game.Screens.Multi.Ranking.Pages s.Colour = colours.GrayF; }; - rankText.AddText(room.Name + "\n", white); + rankText.AddText(name + "\n", white); rankText.AddText("You are placed ", gray); int index = scores.IndexOf(new APIRoomScoreInfo { User = Score.User }, new FuncEqualityComparer((s1, s2) => s1.User.Id.Equals(s2.User.Id))); @@ -98,15 +98,10 @@ namespace osu.Game.Screens.Multi.Ranking.Pages rankText.AddText("in the room!", gray); } - protected virtual MatchLeaderboard CreateLeaderboard(Room room) => new ResultsMatchLeaderboard(room); + protected virtual MatchLeaderboard CreateLeaderboard() => new ResultsMatchLeaderboard(); public class ResultsMatchLeaderboard : MatchLeaderboard { - public ResultsMatchLeaderboard(Room room) - { - Room = room; - } - protected override bool FadeTop => true; protected override LeaderboardScore CreateDrawableScore(APIRoomScoreInfo model, int index) diff --git a/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs b/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs index 09ebef4ee2..6cc13f88a5 100644 --- a/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs +++ b/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs @@ -3,7 +3,6 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; -using osu.Game.Online.Multiplayer; using osu.Game.Scoring; using osu.Game.Screens.Multi.Ranking.Pages; using osu.Game.Screens.Ranking; @@ -14,19 +13,17 @@ namespace osu.Game.Screens.Multi.Ranking.Types { private readonly ScoreInfo score; private readonly WorkingBeatmap beatmap; - private readonly Room room; - public RoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap, Room room) + public RoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap) { this.score = score; this.beatmap = beatmap; - this.room = room; } public FontAwesome Icon => FontAwesome.fa_users; public string Name => "Room Leaderboard"; - public virtual ResultsPage CreatePage() => new RoomLeaderboardPage(score, beatmap, room); + public virtual ResultsPage CreatePage() => new RoomLeaderboardPage(score, beatmap); } } diff --git a/osu.Game/Screens/Multi/RoomBindings.cs b/osu.Game/Screens/Multi/RoomBindings.cs deleted file mode 100644 index e3114c768b..0000000000 --- a/osu.Game/Screens/Multi/RoomBindings.cs +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using System; -using System.Collections.Generic; -using System.Linq; -using osu.Framework.Configuration; -using osu.Game.Beatmaps; -using osu.Game.Online.Multiplayer; -using osu.Game.Rulesets; -using osu.Game.Rulesets.Mods; -using osu.Game.Users; - -namespace osu.Game.Screens.Multi -{ - /// - /// Helper class which binds to values from a . - /// - public class RoomBindings - { - public RoomBindings() - { - Playlist.ItemsAdded += _ => updatePlaylist(); - Playlist.ItemsRemoved += _ => updatePlaylist(); - } - - private Room room; - - /// - /// The to bind to. - /// - public Room Room - { - get => room; - set - { - if (room == value) - return; - - if (room != null) - { - RoomID.UnbindFrom(room.RoomID); - Name.UnbindFrom(room.Name); - Host.UnbindFrom(room.Host); - Status.UnbindFrom(room.Status); - Type.UnbindFrom(room.Type); - Playlist.UnbindFrom(room.Playlist); - Participants.UnbindFrom(room.Participants); - ParticipantCount.UnbindFrom(room.ParticipantCount); - MaxParticipants.UnbindFrom(room.MaxParticipants); - EndDate.UnbindFrom(room.EndDate); - Availability.UnbindFrom(room.Availability); - Duration.UnbindFrom(room.Duration); - } - - room = value ?? new Room(); - - RoomID.BindTo(room.RoomID); - Name.BindTo(room.Name); - Host.BindTo(room.Host); - Status.BindTo(room.Status); - Type.BindTo(room.Type); - Playlist.BindTo(room.Playlist); - Participants.BindTo(room.Participants); - ParticipantCount.BindTo(room.ParticipantCount); - MaxParticipants.BindTo(room.MaxParticipants); - EndDate.BindTo(room.EndDate); - Availability.BindTo(room.Availability); - Duration.BindTo(room.Duration); - } - } - - private void updatePlaylist() - { - // Todo: We only ever have one playlist item for now. In the future, this will be user-settable - - var playlistItem = Playlist.FirstOrDefault(); - - currentBeatmap.Value = playlistItem?.Beatmap; - currentMods.Value = playlistItem?.RequiredMods ?? Enumerable.Empty(); - currentRuleset.Value = playlistItem?.Ruleset; - } - - public readonly Bindable RoomID = new Bindable(); - public readonly Bindable Name = new Bindable(); - public readonly Bindable Host = new Bindable(); - public readonly Bindable Status = new Bindable(); - public readonly Bindable Type = new Bindable(); - public readonly BindableList Playlist = new BindableList(); - public readonly Bindable> Participants = new Bindable>(); - public readonly Bindable ParticipantCount = new Bindable(); - public readonly Bindable MaxParticipants = new Bindable(); - public readonly Bindable EndDate = new Bindable(); - public readonly Bindable Availability = new Bindable(); - public readonly Bindable Duration = new Bindable(); - - private readonly Bindable currentBeatmap = new Bindable(); - public IBindable CurrentBeatmap => currentBeatmap; - - private readonly Bindable> currentMods = new Bindable>(); - public IBindable> CurrentMods => currentMods; - - private readonly Bindable currentRuleset = new Bindable(); - public IBindable CurrentRuleset => currentRuleset; - } -} diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index d9ddd6f867..8cf50245e0 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi private readonly BindableList rooms = new BindableList(); public IBindableList Rooms => rooms; - public readonly Bindable CurrentRoom = new Bindable(); + public Bindable CurrentRoom { get; } = new Bindable(); [Resolved] private APIAccess api { get; set; } @@ -51,6 +51,8 @@ namespace osu.Game.Screens.Multi update(room, result); addRoom(room); + CurrentRoom.Value = room; + RoomsUpdated?.Invoke(); onSuccess?.Invoke(room); diff --git a/osu.Game/Tests/Visual/MultiplayerTestCase.cs b/osu.Game/Tests/Visual/MultiplayerTestCase.cs new file mode 100644 index 0000000000..5ed4f012c6 --- /dev/null +++ b/osu.Game/Tests/Visual/MultiplayerTestCase.cs @@ -0,0 +1,36 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using osu.Framework.Allocation; +using osu.Game.Online.Multiplayer; + +namespace osu.Game.Tests.Visual +{ + public class MultiplayerTestCase : OsuTestCase + { + private Room room; + + protected Room Room + { + get => room; + set + { + if (room == value) + return; + room = value; + + if (dependencies != null) + dependencies.Model.Value = value; + } + } + + private CachedModelDependencyContainer dependencies; + + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) + { + dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); + dependencies.Model.Value = room; + return dependencies; + } + } +} From 594dffba417514c2bb382dd58630a5e7e59e16ab Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 5 Feb 2019 19:11:20 +0900 Subject: [PATCH 23/86] Fix a few cases of missed instant invocation --- osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs | 2 +- osu.Game/Screens/Multi/Components/ModeTypeInfo.cs | 4 ++-- osu.Game/Screens/Multi/Components/ParticipantCount.cs | 3 +-- osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs | 7 +++---- .../Screens/Multi/Match/Components/MatchSettingsOverlay.cs | 3 +-- osu.Game/Screens/Multi/Match/Components/Participants.cs | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs index 35d1ffad1c..3904df2069 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs @@ -60,7 +60,7 @@ namespace osu.Game.Screens.Multi.Components beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f)); beatmapAuthor.AddLink(v.Metadata.Author.Username, null, LinkAction.OpenUserProfile, v.Metadata.Author.Id.ToString(), "View Profile"); } - }); + }, true); } } } diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs index 6ae3b7be7c..97ea1b5f36 100644 --- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs @@ -46,8 +46,8 @@ namespace osu.Game.Screens.Multi.Components }; CurrentBeatmap.BindValueChanged(_ => updateBeatmap()); - CurrentRuleset.BindValueChanged(_ => updateBeatmap()); - Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }); + CurrentRuleset.BindValueChanged(_ => updateBeatmap(), true); + Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }, true); } private void updateBeatmap() diff --git a/osu.Game/Screens/Multi/Components/ParticipantCount.cs b/osu.Game/Screens/Multi/Components/ParticipantCount.cs index 9711767924..3b002ee034 100644 --- a/osu.Game/Screens/Multi/Components/ParticipantCount.cs +++ b/osu.Game/Screens/Multi/Components/ParticipantCount.cs @@ -52,9 +52,8 @@ namespace osu.Game.Screens.Multi.Components } }; - Participants.BindValueChanged(v => count.Text = v.Count().ToString()); MaxParticipants.BindValueChanged(_ => updateMax(), true); - ParticipantCount.BindValueChanged(v => count.Text = v.ToString("#,0")); + ParticipantCount.BindValueChanged(v => count.Text = v.ToString("#,0"), true); } private void updateMax() diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs index 45855c2812..754d8b8d24 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs @@ -163,10 +163,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components } }; - Status.BindValueChanged(displayStatus); - Name.BindValueChanged(n => name.Text = n); - - RoomID.BindValueChanged(updateRoom); + Status.BindValueChanged(displayStatus, true); + Name.BindValueChanged(n => name.Text = n, true); + RoomID.BindValueChanged(updateRoom, true); } private void updateRoom(int? roomId) diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs index dcbeb07904..75cabe8b35 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs @@ -260,8 +260,7 @@ namespace osu.Game.Screens.Multi.Match.Components processingOverlay = new ProcessingOverlay { Alpha = 0 } }; - TypePicker.Current.ValueChanged += t => typeLabel.Text = t.Name; - + TypePicker.Current.BindValueChanged(t => typeLabel.Text = t?.Name ?? string.Empty, true); Name.BindValueChanged(n => NameField.Text = n, true); Availability.BindValueChanged(a => AvailabilityPicker.Current.Value = a, true); Type.BindValueChanged(t => TypePicker.Current.Value = t, true); diff --git a/osu.Game/Screens/Multi/Match/Components/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs index 82a79475ff..1565d75c21 100644 --- a/osu.Game/Screens/Multi/Match/Components/Participants.cs +++ b/osu.Game/Screens/Multi/Match/Components/Participants.cs @@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi.Match.Components Width = 300, OnLoadComplete = d => d.FadeInFromZero(60), }).ToList(); - }); + }, true); } } } From 0e3a087ed3044990f97182bafe30fc0e07883ddf Mon Sep 17 00:00:00 2001 From: ekrctb Date: Wed, 6 Feb 2019 12:02:04 +0900 Subject: [PATCH 24/86] Fix VSCode Restore task --- .vscode/tasks.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2e9bec22c2..de799a7c03 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -70,7 +70,8 @@ "type": "shell", "command": "dotnet", "args": [ - "restore" + "restore", + "osu.sln" ], "problemMatcher": [] } From a9aa22c97bd3247723b2bbab93eff1e0302a9f57 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 6 Feb 2019 13:52:48 +0900 Subject: [PATCH 25/86] Remove ShadowModel requirement --- .../Multi/Components/ParticipantCount.cs | 1 - .../Multi/Lounge/Components/DrawableRoom.cs | 49 +++++++++++++------ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/osu.Game/Screens/Multi/Components/ParticipantCount.cs b/osu.Game/Screens/Multi/Components/ParticipantCount.cs index 3b002ee034..27bfc9a3f7 100644 --- a/osu.Game/Screens/Multi/Components/ParticipantCount.cs +++ b/osu.Game/Screens/Multi/Components/ParticipantCount.cs @@ -1,7 +1,6 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System.Linq; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs index 3918148b07..bfbf81f298 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using osu.Framework; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -92,12 +93,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components [BackgroundDependencyLoader] private void load(OsuColour colours) { - Box sideStrip; - OsuSpriteText name; - Children = new Drawable[] { - selectionBox, + new StatusColouredContainer + { + RelativeSizeAxes = Axes.Both, + Child = selectionBox + }, new Container { RelativeSizeAxes = Axes.Both, @@ -120,10 +122,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components RelativeSizeAxes = Axes.Both, Colour = OsuColour.FromHex(@"212121"), }, - sideStrip = new Box + new StatusColouredContainer { RelativeSizeAxes = Axes.Y, Width = side_strip_width, + Child = new Box { RelativeSizeAxes = Axes.Both } }, new Container { @@ -152,9 +155,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components Spacing = new Vector2(5f), Children = new Drawable[] { - name = new OsuSpriteText + new StatusColouredContainer { - TextSize = 18 + AutoSizeAxes = Axes.Both, + Child = new RoomName { TextSize = 18 } }, new ParticipantInfo(), }, @@ -184,13 +188,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components }, }, }; - - dependencies.ShadowModel.Name.BindValueChanged(n => name.Text = n, true); - dependencies.ShadowModel.Status.BindValueChanged(s => - { - foreach (Drawable d in new Drawable[] { selectionBox, sideStrip }) - d.FadeColour(s.GetAppropriateColour(colours), transition_duration); - }, true); } protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) @@ -205,5 +202,29 @@ namespace osu.Game.Screens.Multi.Lounge.Components base.LoadComplete(); this.FadeInFromZero(transition_duration); } + + private class RoomName : OsuSpriteText + { + [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))] + private Bindable name { get; set; } + + [BackgroundDependencyLoader] + private void load() + { + Current = name; + } + } + + private class StatusColouredContainer : Container + { + [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Status))] + private Bindable status { get; set; } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + status.BindValueChanged(s => this.FadeColour(s.GetAppropriateColour(colours), transition_duration), true); + } + } } } From 3207983a1c2b17fd3d9658cbdc705c5ebccb9b95 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 6 Feb 2019 13:59:11 +0900 Subject: [PATCH 26/86] Fix current room being set to null when parted --- osu.Game/Screens/Multi/RoomManager.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index 8cf50245e0..ceee918586 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -25,6 +25,8 @@ namespace osu.Game.Screens.Multi public Bindable CurrentRoom { get; } = new Bindable(); + private Room joinedRoom; + [Resolved] private APIAccess api { get; set; } @@ -50,8 +52,7 @@ namespace osu.Game.Screens.Multi { update(room, result); addRoom(room); - - CurrentRoom.Value = room; + joinRoom(room); RoomsUpdated?.Invoke(); @@ -79,7 +80,7 @@ namespace osu.Game.Screens.Multi currentJoinRoomRequest = new JoinRoomRequest(room, api.LocalUser.Value); currentJoinRoomRequest.Success += () => { - CurrentRoom.Value = room; + joinRoom(room); onSuccess?.Invoke(room); }; @@ -92,13 +93,19 @@ namespace osu.Game.Screens.Multi api.Queue(currentJoinRoomRequest); } + private void joinRoom(Room room) + { + CurrentRoom.Value = room; + joinedRoom = room; + } + public void PartRoom() { - if (CurrentRoom.Value == null) + if (joinedRoom == null) return; - api.Queue(new PartRoomRequest(CurrentRoom.Value, api.LocalUser.Value)); - CurrentRoom.Value = null; + api.Queue(new PartRoomRequest(joinedRoom, api.LocalUser.Value)); + joinedRoom = null; } public void UpdateRooms(List newRooms) From 9f8e724a7659e20bb9c8787c5daa65862ae21e0a Mon Sep 17 00:00:00 2001 From: ProgrammaticNajel Date: Wed, 6 Feb 2019 17:14:33 +0800 Subject: [PATCH 27/86] Fix background being cut off at the top of the screen (#4207) Fix background being cut off at the top of the screen --- osu.Game/Screens/BackgroundScreenStack.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs index 7bf167295c..b010a70e66 100644 --- a/osu.Game/Screens/BackgroundScreenStack.cs +++ b/osu.Game/Screens/BackgroundScreenStack.cs @@ -14,6 +14,8 @@ namespace osu.Game.Screens { Scale = new Vector2(1.06f); RelativeSizeAxes = Axes.Both; + Anchor = Anchor.Centre; + Origin = Anchor.Centre; } //public float ParallaxAmount { set => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * value; } From 4f86fe92eab271cf2edecae2f22a50e0965e39ab Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 6 Feb 2019 18:50:43 +0900 Subject: [PATCH 28/86] Fix match settings not showing --- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 12930d814b..adfd77c182 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -164,7 +164,7 @@ namespace osu.Game.Screens.Multi.Match }, }; - header.Tabs.Current.ValueChanged += t => + header.Tabs.Current.BindValueChanged(t => { const float fade_duration = 500; if (t is SettingsMatchPage) @@ -179,7 +179,7 @@ namespace osu.Game.Screens.Multi.Match info.FadeIn(fade_duration, Easing.OutQuint); bottomRow.FadeIn(fade_duration, Easing.OutQuint); } - }; + }, true); chat.Exit += () => RequestExit?.Invoke(); From ae9d5f999c3c391e043bcaf7d31d71e8e8ec24c8 Mon Sep 17 00:00:00 2001 From: HoLLy Date: Wed, 6 Feb 2019 21:28:42 +0100 Subject: [PATCH 29/86] Use correct DifficultyAttributes where possible --- osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs | 2 +- osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs index 5b6fd4ecf3..b8588dbce2 100644 --- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs +++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs @@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty difficultyHitObjects.AddRange(beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime)); if (!calculateStrainValues(difficultyHitObjects, timeRate)) - return new DifficultyAttributes(mods, 0); + return new ManiaDifficultyAttributes(mods, 0); double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor; diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs index 16cebb0d96..2322446666 100644 --- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs +++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs @@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime)); if (!calculateStrainValues(difficultyHitObjects, timeRate)) - return new DifficultyAttributes(mods, 0); + return new TaikoDifficultyAttributes(mods, 0); double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor; From 6e2ecd5fccbc3efb9fef3831e51ed4be1d68bc4d Mon Sep 17 00:00:00 2001 From: Moritz Bender <35152647+Morilli@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:59:47 +0100 Subject: [PATCH 30/86] Fix typo in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94ab385bfd..8cfc2ffebf 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Sometimes it may be necessary to cross-test changes in [osu-resources](https://g ## Code analysis -Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternative, you can install resharper or use rider to get inline support in your IDE of choice. +Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternatively, you can install resharper or use rider to get inline support in your IDE of choice. # Contributing From 2d615482514c1cea76bc6bfe126beb2e1ceb0c3b Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 7 Feb 2019 16:45:02 +0900 Subject: [PATCH 31/86] Fix room name being coloured --- osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs index bfbf81f298..8a2b033ac8 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs @@ -155,11 +155,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components Spacing = new Vector2(5f), Children = new Drawable[] { - new StatusColouredContainer - { - AutoSizeAxes = Axes.Both, - Child = new RoomName { TextSize = 18 } - }, + new RoomName { TextSize = 18 }, new ParticipantInfo(), }, }, From 1e0135af6f10b46012ff49dc8509db6b52aa57dd Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 7 Feb 2019 17:52:40 +0900 Subject: [PATCH 32/86] Move StatusColouredContainer into a more public location --- .../Components/StatusColouredContainer.cs | 31 +++++++++++++++++++ .../Multi/Lounge/Components/DrawableRoom.cs | 16 ++-------- 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 osu.Game/Screens/Multi/Components/StatusColouredContainer.cs diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs new file mode 100644 index 0000000000..6d573d0866 --- /dev/null +++ b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs @@ -0,0 +1,31 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Game.Graphics; +using osu.Game.Online.Multiplayer; + +namespace osu.Game.Screens.Multi.Components +{ + public class StatusColouredContainer : Container + { + private readonly double transitionDuration; + + [Resolved(typeof(Room), nameof(Room.Status))] + private Bindable status { get; set; } + + public StatusColouredContainer(double transitionDuration = 100) + { + this.transitionDuration = transitionDuration; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + status.BindValueChanged(s => this.FadeColour(s.GetAppropriateColour(colours), transitionDuration), true); + } + } +} diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs index 8a2b033ac8..afe2b70524 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs @@ -95,7 +95,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components { Children = new Drawable[] { - new StatusColouredContainer + new StatusColouredContainer(transition_duration) { RelativeSizeAxes = Axes.Both, Child = selectionBox @@ -122,7 +122,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components RelativeSizeAxes = Axes.Both, Colour = OsuColour.FromHex(@"212121"), }, - new StatusColouredContainer + new StatusColouredContainer(transition_duration) { RelativeSizeAxes = Axes.Y, Width = side_strip_width, @@ -210,17 +210,5 @@ namespace osu.Game.Screens.Multi.Lounge.Components Current = name; } } - - private class StatusColouredContainer : Container - { - [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Status))] - private Bindable status { get; set; } - - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - status.BindValueChanged(s => this.FadeColour(s.GetAppropriateColour(colours), transition_duration), true); - } - } } } From 1c2450a95a0a201d088eb14cdac3b7593e7a4cbc Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 7 Feb 2019 17:59:14 +0900 Subject: [PATCH 33/86] Fix up room inspector status --- .../Multi/Lounge/Components/RoomInspector.cs | 80 +++++++++++-------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs index 754d8b8d24..a25d49a514 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs @@ -3,6 +3,7 @@ using System; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Colour; @@ -28,21 +29,19 @@ namespace osu.Game.Screens.Multi.Lounge.Components private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 }; - private OsuColour colours; - private Box statusStrip; private ParticipantCountDisplay participantCount; - private OsuSpriteText name, status; + private OsuSpriteText name; private BeatmapTypeInfo beatmapTypeInfo; private ParticipantInfo participantInfo; [Resolved] private BeatmapManager beatmaps { get; set; } + private readonly Bindable status = new Bindable(new RoomStatusNoneSelected()); + [BackgroundDependencyLoader] private void load(OsuColour colours) { - this.colours = colours; - InternalChildren = new Drawable[] { new Box @@ -98,15 +97,17 @@ namespace osu.Game.Screens.Multi.Lounge.Components Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, TextSize = 30, + Current = Name }, }, }, }, }, - statusStrip = new Box + new StatusColouredContainer(transition_duration) { RelativeSizeAxes = Axes.X, Height = 5, + Child = new Box { RelativeSizeAxes = Axes.Both } }, new Container { @@ -129,10 +130,14 @@ namespace osu.Game.Screens.Multi.Lounge.Components Spacing = new Vector2(0f, 5f), Children = new Drawable[] { - status = new OsuSpriteText + new StatusColouredContainer(transition_duration) { - TextSize = 14, - Font = @"Exo2.0-Bold", + AutoSizeAxes = Axes.Both, + Child = new StatusText + { + TextSize = 14, + Font = @"Exo2.0-Bold", + } }, beatmapTypeInfo = new BeatmapTypeInfo(), }, @@ -163,38 +168,37 @@ namespace osu.Game.Screens.Multi.Lounge.Components } }; - Status.BindValueChanged(displayStatus, true); - Name.BindValueChanged(n => name.Text = n, true); - RoomID.BindValueChanged(updateRoom, true); + Status.BindValueChanged(_ => updateStatus(), true); + RoomID.BindValueChanged(_ => updateStatus(), true); } - private void updateRoom(int? roomId) + protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { - if (roomId != null) + var dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); + dependencies.CacheAs(status, new CacheInfo(nameof(Online.Multiplayer.Room.Status), typeof(Room))); + return dependencies; + } + + private void updateStatus() + { + if (RoomID.Value == null) { + status.Value = new RoomStatusNoneSelected(); + + participantCount.FadeOut(transition_duration); + beatmapTypeInfo.FadeOut(transition_duration); + name.FadeOut(transition_duration); + participantInfo.FadeOut(transition_duration); + } + else + { + status.Value = Status; + participantCount.FadeIn(transition_duration); beatmapTypeInfo.FadeIn(transition_duration); name.FadeIn(transition_duration); participantInfo.FadeIn(transition_duration); } - else - { - participantCount.FadeOut(transition_duration); - beatmapTypeInfo.FadeOut(transition_duration); - name.FadeOut(transition_duration); - participantInfo.FadeOut(transition_duration); - - displayStatus(new RoomStatusNoneSelected()); - } - } - - private void displayStatus(RoomStatus s) - { - status.Text = s.Message; - - Color4 c = s.GetAppropriateColour(colours); - statusStrip.FadeColour(c, transition_duration); - status.FadeColour(c, transition_duration); } private class RoomStatusNoneSelected : RoomStatus @@ -203,6 +207,18 @@ namespace osu.Game.Screens.Multi.Lounge.Components public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8; } + private class StatusText : OsuSpriteText + { + [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Status))] + private Bindable status { get; set; } + + [BackgroundDependencyLoader] + private void load() + { + status.BindValueChanged(s => Text = s.Message, true); + } + } + private class MatchParticipants : MultiplayerComposite { private readonly FillFlowContainer fill; From 17fdfc15d92b43a83b19845240fa83d1f6b36a1f Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 7 Feb 2019 19:52:33 +0900 Subject: [PATCH 34/86] Fix room title in the breadcrumbs --- osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs | 2 +- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 50788a2fc2..7ba9382f65 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -137,7 +137,7 @@ namespace osu.Game.Screens.Multi.Lounge currentRoom.Value = room; - this.Push(new MatchSubScreen(s => pushGameplayScreen?.Invoke(s))); + this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); } } } diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index adfd77c182..7b94de7d76 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Match { public override bool AllowBeatmapRulesetChange => false; - public override string Title => roomId?.Value == null ? "New room" : name.Value; + public override string Title { get; } public override string ShortTitle => "room"; @@ -36,8 +36,10 @@ namespace osu.Game.Screens.Multi.Match [Resolved(typeof(Room), nameof(Room.Playlist))] private BindableList playlist { get; set; } - public MatchSubScreen(Action pushGameplayScreen) + public MatchSubScreen(Room room, Action pushGameplayScreen) { + Title = room.RoomID.Value == null ? "New room" : room.Name; + InternalChild = new Match(pushGameplayScreen) { RelativeSizeAxes = Axes.Both, From 990bd44ca27868a76f690cd47b49ba3fe4e512bb Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 13:01:10 +0900 Subject: [PATCH 35/86] Combine roommanager and roompollingcomponent --- osu.Game/Screens/Multi/Multiplayer.cs | 14 ++- osu.Game/Screens/Multi/RoomManager.cs | 85 ++++++++++++++----- .../Screens/Multi/RoomPollingComponent.cs | 66 -------------- 3 files changed, 68 insertions(+), 97 deletions(-) delete mode 100644 osu.Game/Screens/Multi/RoomPollingComponent.cs diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 6851bc2a2a..2a2927734b 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -48,7 +48,6 @@ namespace osu.Game.Screens.Multi private readonly OsuButton createButton; private readonly LoungeSubScreen loungeSubScreen; private readonly ScreenStack screenStack; - private readonly RoomPollingComponent pollingComponent; [Cached] private readonly Bindable filter = new Bindable(); @@ -104,7 +103,7 @@ namespace osu.Game.Screens.Multi }, }, }, - roomManager = new RoomManager + new Container { RelativeSizeAxes = Axes.Both, Padding = new MarginPadding { Top = Header.HEIGHT }, @@ -128,11 +127,10 @@ namespace osu.Game.Screens.Multi Name = { Value = $"{api.LocalUser}'s awesome room" } }), }, - pollingComponent = new RoomPollingComponent() + roomManager = new RoomManager() }); - pollingComponent.Filter.BindTo(filter); - pollingComponent.RoomsRetrieved += roomManager.UpdateRooms; + roomManager.Filter.BindTo(filter); screenStack.ScreenPushed += screenPushed; screenStack.ScreenExited += screenExited; @@ -166,8 +164,8 @@ namespace osu.Game.Screens.Multi private void updatePollingRate(bool idle) { - pollingComponent.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000); - Logger.Log($"Polling adjusted to {pollingComponent.TimeBetweenPolls}"); + roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000); + Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}"); } public void APIStateChanged(APIAccess api, APIState state) @@ -230,7 +228,7 @@ namespace osu.Game.Screens.Multi this.FadeOut(250); cancelLooping(); - pollingComponent.TimeBetweenPolls = 0; + roomManager.TimeBetweenPolls = 0; } private void cancelLooping() diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index ceee918586..554be0dfe2 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -2,27 +2,33 @@ // See the LICENCE file in the repository root for full licence text. using System; -using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Configuration; -using osu.Framework.Graphics.Containers; using osu.Framework.Logging; using osu.Game.Beatmaps; +using osu.Game.Online; using osu.Game.Online.API; using osu.Game.Online.API.Requests; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; +using osu.Game.Screens.Multi.Lounge.Components; namespace osu.Game.Screens.Multi { - public class RoomManager : Container, IRoomManager + public class RoomManager : PollingComponent, IRoomManager { public event Action RoomsUpdated; private readonly BindableList rooms = new BindableList(); public IBindableList Rooms => rooms; + /// + /// The to use when polling for s. + /// + public readonly Bindable Filter = new Bindable(); + public Bindable CurrentRoom { get; } = new Bindable(); private Room joinedRoom; @@ -36,6 +42,16 @@ namespace osu.Game.Screens.Multi [Resolved] private BeatmapManager beatmaps { get; set; } + public RoomManager() + { + Filter.BindValueChanged(_ => + { + if (IsLoaded) + PollImmediately(); + }); + } + + protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); @@ -46,17 +62,20 @@ namespace osu.Game.Screens.Multi { room.Host.Value = api.LocalUser; + addRoom(room); + joinRoom(room); + + RoomsUpdated?.Invoke(); + + onSuccess?.Invoke(room); + + return; + var req = new CreateRoomRequest(room); req.Success += result => { - update(room, result); - addRoom(room); - joinRoom(room); - RoomsUpdated?.Invoke(); - - onSuccess?.Invoke(room); }; req.Failure += exception => @@ -108,25 +127,45 @@ namespace osu.Game.Screens.Multi joinedRoom = null; } - public void UpdateRooms(List newRooms) + private GetRoomsRequest pollReq; + + protected override Task Poll() { - // Remove past matches - foreach (var r in rooms.ToList()) + if (!api.IsLoggedIn) + return base.Poll(); + + var tcs = new TaskCompletionSource(); + + pollReq?.Cancel(); + pollReq = new GetRoomsRequest(Filter.Value.PrimaryFilter); + + pollReq.Success += result => { - if (newRooms.All(e => e.RoomID.Value != r.RoomID.Value)) - rooms.Remove(r); - } + // Remove past matches + foreach (var r in rooms.ToList()) + { + if (result.All(e => e.RoomID.Value != r.RoomID.Value)) + rooms.Remove(r); + } - for (int i = 0; i < newRooms.Count; i++) - { - var r = newRooms[i]; - r.Position.Value = i; + for (int i = 0; i < result.Count; i++) + { + var r = result[i]; + r.Position.Value = i; - update(r, r); - addRoom(r); - } + update(r, r); + addRoom(r); + } - RoomsUpdated?.Invoke(); + RoomsUpdated?.Invoke(); + tcs.SetResult(true); + }; + + pollReq.Failure += _ => tcs.SetResult(false); + + api.Queue(pollReq); + + return tcs.Task; } /// diff --git a/osu.Game/Screens/Multi/RoomPollingComponent.cs b/osu.Game/Screens/Multi/RoomPollingComponent.cs deleted file mode 100644 index 53c90d4d61..0000000000 --- a/osu.Game/Screens/Multi/RoomPollingComponent.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using osu.Framework.Allocation; -using osu.Framework.Configuration; -using osu.Game.Online; -using osu.Game.Online.API; -using osu.Game.Online.API.Requests; -using osu.Game.Online.Multiplayer; -using osu.Game.Screens.Multi.Lounge.Components; - -namespace osu.Game.Screens.Multi -{ - public class RoomPollingComponent : PollingComponent - { - /// - /// Invoked when s have been retrieved from the API. - /// - public Action> RoomsRetrieved; - - /// - /// The to use when polling for s. - /// - public readonly Bindable Filter = new Bindable(); - - [Resolved] - private APIAccess api { get; set; } - - public RoomPollingComponent() - { - Filter.BindValueChanged(_ => - { - if (IsLoaded) - PollImmediately(); - }); - } - - private GetRoomsRequest pollReq; - - protected override Task Poll() - { - if (!api.IsLoggedIn) - return base.Poll(); - - var tcs = new TaskCompletionSource(); - - pollReq?.Cancel(); - pollReq = new GetRoomsRequest(Filter.Value.PrimaryFilter); - - pollReq.Success += result => - { - RoomsRetrieved?.Invoke(result); - tcs.SetResult(true); - }; - - pollReq.Failure += _ => tcs.SetResult(false); - - api.Queue(pollReq); - - return tcs.Task; - } - } -} From 7f13e3c5f788226c61c7aa98fbd0967f041ef2d5 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 13:02:17 +0900 Subject: [PATCH 36/86] Directly resolve the filter bindable --- osu.Game/Screens/Multi/Multiplayer.cs | 2 -- osu.Game/Screens/Multi/RoomManager.cs | 13 +++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 2a2927734b..032f40aa18 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -130,8 +130,6 @@ namespace osu.Game.Screens.Multi roomManager = new RoomManager() }); - roomManager.Filter.BindTo(filter); - screenStack.ScreenPushed += screenPushed; screenStack.ScreenExited += screenExited; } diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index 554be0dfe2..26bb3a8321 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -24,15 +24,13 @@ namespace osu.Game.Screens.Multi private readonly BindableList rooms = new BindableList(); public IBindableList Rooms => rooms; - /// - /// The to use when polling for s. - /// - public readonly Bindable Filter = new Bindable(); - public Bindable CurrentRoom { get; } = new Bindable(); private Room joinedRoom; + [Resolved] + private Bindable filter { get; set; } + [Resolved] private APIAccess api { get; set; } @@ -44,14 +42,13 @@ namespace osu.Game.Screens.Multi public RoomManager() { - Filter.BindValueChanged(_ => + filter.BindValueChanged(_ => { if (IsLoaded) PollImmediately(); }); } - protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); @@ -137,7 +134,7 @@ namespace osu.Game.Screens.Multi var tcs = new TaskCompletionSource(); pollReq?.Cancel(); - pollReq = new GetRoomsRequest(Filter.Value.PrimaryFilter); + pollReq = new GetRoomsRequest(filter.Value.PrimaryFilter); pollReq.Success += result => { From 42cd55e0d7cdd2167384ab2ae975d386addf96dd Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 14:57:51 +0900 Subject: [PATCH 37/86] Move current room to multiplayer --- osu.Game/Screens/Multi/IRoomManager.cs | 5 ----- .../Multi/Lounge/Components/RoomsContainer.cs | 6 +++--- osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs | 12 ------------ osu.Game/Screens/Multi/Multiplayer.cs | 7 +++++-- osu.Game/Screens/Multi/RoomManager.cs | 16 +++++++++------- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs index a00e08a80a..980879d79a 100644 --- a/osu.Game/Screens/Multi/IRoomManager.cs +++ b/osu.Game/Screens/Multi/IRoomManager.cs @@ -19,11 +19,6 @@ namespace osu.Game.Screens.Multi /// IBindableList Rooms { get; } - /// - /// The currently-active . - /// - Bindable CurrentRoom { get; } - /// /// Creates a new . /// diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs index 12d9b2957c..baeac900ee 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs @@ -19,13 +19,14 @@ namespace osu.Game.Screens.Multi.Lounge.Components { public Action JoinRequested; - private readonly Bindable currentRoom = new Bindable(); - private readonly IBindableList rooms = new BindableList(); private readonly FillFlowContainer roomFlow; public IReadOnlyList Rooms => roomFlow; + [Resolved] + private Bindable currentRoom { get; set; } + [Resolved] private IRoomManager roomManager { get; set; } @@ -46,7 +47,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components [BackgroundDependencyLoader] private void load() { - currentRoom.BindTo(roomManager.CurrentRoom); rooms.BindTo(roomManager.Rooms); rooms.ItemsAdded += addRooms; diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 7ba9382f65..1fb0675f9e 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -2,8 +2,6 @@ // See the LICENCE file in the repository root for full licence text. using System; -using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input.Events; @@ -26,8 +24,6 @@ namespace osu.Game.Screens.Multi.Lounge private readonly Action pushGameplayScreen; private readonly ProcessingOverlay processingOverlay; - private readonly Bindable currentRoom = new Bindable(); - public LoungeSubScreen(Action pushGameplayScreen) { this.pushGameplayScreen = pushGameplayScreen; @@ -75,12 +71,6 @@ namespace osu.Game.Screens.Multi.Lounge Filter.Search.Exit += this.Exit; } - [BackgroundDependencyLoader] - private void load(IRoomManager roomManager) - { - currentRoom.BindTo(roomManager.CurrentRoom); - } - protected override void UpdateAfterChildren() { base.UpdateAfterChildren(); @@ -135,8 +125,6 @@ namespace osu.Game.Screens.Multi.Lounge if (!this.IsCurrentScreen()) return; - currentRoom.Value = room; - this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); } } diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 032f40aa18..ca4623a334 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -50,7 +50,10 @@ namespace osu.Game.Screens.Multi private readonly ScreenStack screenStack; [Cached] - private readonly Bindable filter = new Bindable(); + private readonly Bindable currentRoom = new Bindable(); + + [Cached] + private readonly Bindable currentFilter = new Bindable(); [Cached(Type = typeof(IRoomManager))] private RoomManager roomManager; @@ -150,7 +153,7 @@ namespace osu.Game.Screens.Multi protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); - dependencies.Model.BindTo(roomManager.CurrentRoom); + dependencies.Model.BindTo(currentRoom); return dependencies; } diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index 26bb3a8321..f517ded6dc 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -24,12 +24,13 @@ namespace osu.Game.Screens.Multi private readonly BindableList rooms = new BindableList(); public IBindableList Rooms => rooms; - public Bindable CurrentRoom { get; } = new Bindable(); - private Room joinedRoom; [Resolved] - private Bindable filter { get; set; } + private Bindable currentRoom { get; set; } + + [Resolved] + private Bindable currentFilter { get; set; } [Resolved] private APIAccess api { get; set; } @@ -40,9 +41,10 @@ namespace osu.Game.Screens.Multi [Resolved] private BeatmapManager beatmaps { get; set; } - public RoomManager() + [BackgroundDependencyLoader] + private void load() { - filter.BindValueChanged(_ => + currentFilter.BindValueChanged(_ => { if (IsLoaded) PollImmediately(); @@ -111,7 +113,7 @@ namespace osu.Game.Screens.Multi private void joinRoom(Room room) { - CurrentRoom.Value = room; + currentRoom.Value = room; joinedRoom = room; } @@ -134,7 +136,7 @@ namespace osu.Game.Screens.Multi var tcs = new TaskCompletionSource(); pollReq?.Cancel(); - pollReq = new GetRoomsRequest(filter.Value.PrimaryFilter); + pollReq = new GetRoomsRequest(currentFilter.Value.PrimaryFilter); pollReq.Success += result => { From 43240ea85ed6923444c5135967619f28d4ce03c1 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:20:11 +0900 Subject: [PATCH 38/86] Fix playlist issues with room creation --- .../Screens/Multi/Lounge/LoungeSubScreen.cs | 7 ++++++ .../Match/Components/MatchSettingsOverlay.cs | 6 ++++- .../Screens/Multi/MultiplayerComposite.cs | 3 --- osu.Game/Screens/Multi/RoomManager.cs | 23 ++++++------------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 1fb0675f9e..1229d071ef 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -2,6 +2,8 @@ // See the LICENCE file in the repository root for full licence text. using System; +using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input.Events; @@ -24,6 +26,9 @@ namespace osu.Game.Screens.Multi.Lounge private readonly Action pushGameplayScreen; private readonly ProcessingOverlay processingOverlay; + [Resolved] + private Bindable currentRoom { get; set; } + public LoungeSubScreen(Action pushGameplayScreen) { this.pushGameplayScreen = pushGameplayScreen; @@ -125,6 +130,8 @@ namespace osu.Game.Screens.Multi.Lounge if (!this.IsCurrentScreen()) return; + currentRoom.Value = room; + this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); } } diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs index 75cabe8b35..e962784660 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs @@ -4,6 +4,7 @@ using System; using Humanizer; using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -65,6 +66,9 @@ namespace osu.Game.Screens.Multi.Match.Components [Resolved(CanBeNull = true)] private IRoomManager manager { get; set; } + [Resolved] + private Bindable currentRoom { get; set; } + [BackgroundDependencyLoader] private void load(OsuColour colours) { @@ -293,7 +297,7 @@ namespace osu.Game.Screens.Multi.Match.Components Duration.Value = DurationField.Current.Value; - manager?.CreateRoom(Room, onSuccess, onError); + manager?.CreateRoom(currentRoom, onSuccess, onError); processingOverlay.Show(); } diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs index 1e68727438..1a16db97a4 100644 --- a/osu.Game/Screens/Multi/MultiplayerComposite.cs +++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs @@ -17,9 +17,6 @@ namespace osu.Game.Screens.Multi { public class MultiplayerComposite : CompositeDrawable { - [Resolved] - protected Room Room { get; private set; } - [Resolved(typeof(Room))] protected Bindable RoomID { get; private set; } diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index f517ded6dc..c74787a0ed 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -61,20 +61,17 @@ namespace osu.Game.Screens.Multi { room.Host.Value = api.LocalUser; - addRoom(room); - joinRoom(room); - - RoomsUpdated?.Invoke(); - - onSuccess?.Invoke(room); - - return; - var req = new CreateRoomRequest(room); req.Success += result => { + joinedRoom = room; + update(room, result); + addRoom(room); + + RoomsUpdated?.Invoke(); + onSuccess?.Invoke(room); }; req.Failure += exception => @@ -98,7 +95,7 @@ namespace osu.Game.Screens.Multi currentJoinRoomRequest = new JoinRoomRequest(room, api.LocalUser.Value); currentJoinRoomRequest.Success += () => { - joinRoom(room); + joinedRoom = room; onSuccess?.Invoke(room); }; @@ -111,12 +108,6 @@ namespace osu.Game.Screens.Multi api.Queue(currentJoinRoomRequest); } - private void joinRoom(Room room) - { - currentRoom.Value = room; - joinedRoom = room; - } - public void PartRoom() { if (joinedRoom == null) From 99a7ccc01a37c5c13fc86ebf4937f64e37f1d212 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:38:05 +0900 Subject: [PATCH 39/86] Slight cleanup in multiplayer --- osu.Game/Screens/Multi/Multiplayer.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index ca4623a334..19cb550e7b 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -49,6 +49,8 @@ namespace osu.Game.Screens.Multi private readonly LoungeSubScreen loungeSubScreen; private readonly ScreenStack screenStack; + private readonly IBindable isIdle = new BindableBool(); + [Cached] private readonly Bindable currentRoom = new Bindable(); @@ -137,8 +139,6 @@ namespace osu.Game.Screens.Multi screenStack.ScreenExited += screenExited; } - private readonly IBindable isIdle = new BindableBool(); - [BackgroundDependencyLoader(true)] private void load(IdleTracker idleTracker) { @@ -148,6 +148,12 @@ namespace osu.Game.Screens.Multi isIdle.BindTo(idleTracker.IsIdle); } + protected override void LoadComplete() + { + base.LoadComplete(); + isIdle.BindValueChanged(updatePollingRate, true); + } + private CachedModelDependencyContainer dependencies; protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) @@ -157,12 +163,6 @@ namespace osu.Game.Screens.Multi return dependencies; } - protected override void LoadComplete() - { - base.LoadComplete(); - isIdle.BindValueChanged(updatePollingRate, true); - } - private void updatePollingRate(bool idle) { roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000); From 6fe1f572367dece51712199783e8d1ce19174e7b Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:39:11 +0900 Subject: [PATCH 40/86] Fix crash when start button is repeatedly pressed --- osu.Game/Screens/Multi/Multiplayer.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 19cb550e7b..360dd1fa07 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -83,7 +83,7 @@ namespace osu.Game.Screens.Multi RelativeSizeAxes = Axes.Both, }; - screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen(this.Push)) { RelativeSizeAxes = Axes.Both }; + screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen(pushGameplayScreen)) { RelativeSizeAxes = Axes.Both }; Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING }; waves.AddRange(new Drawable[] @@ -169,6 +169,14 @@ namespace osu.Game.Screens.Multi Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}"); } + private void pushGameplayScreen(IScreen gameplayScreen) + { + if (!this.IsCurrentScreen()) + return; + + this.Push(gameplayScreen); + } + public void APIStateChanged(APIAccess api, APIState state) { if (state != APIState.Online) From 5643dc2e99904d0c1ed46c58ae98415f316dc2f8 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:44:05 +0900 Subject: [PATCH 41/86] Remove redundant qualifiers --- osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs | 4 ++-- osu.Game/Screens/Multi/Match/Components/Header.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs index a25d49a514..3e665ab27e 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs @@ -175,7 +175,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { var dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); - dependencies.CacheAs(status, new CacheInfo(nameof(Online.Multiplayer.Room.Status), typeof(Room))); + dependencies.CacheAs(status, new CacheInfo(nameof(Room.Status), typeof(Room))); return dependencies; } @@ -209,7 +209,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components private class StatusText : OsuSpriteText { - [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Status))] + [Resolved(typeof(Room), nameof(Room.Status))] private Bindable status { get; set; } [BackgroundDependencyLoader] diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs index 55c7c02be4..137c0aa939 100644 --- a/osu.Game/Screens/Multi/Match/Components/Header.cs +++ b/osu.Game/Screens/Multi/Match/Components/Header.cs @@ -115,7 +115,7 @@ namespace osu.Game.Screens.Multi.Match.Components private class BeatmapSelectButton : HeaderButton { - [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.RoomID))] + [Resolved(typeof(Room), nameof(Room.RoomID))] private Bindable roomId { get; set; } public BeatmapSelectButton() From b5cc0ec8dba1962c2429370270958f9affe534c2 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:44:11 +0900 Subject: [PATCH 42/86] Update framework --- osu.Game/osu.Game.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 596190fcf7..4b735f3101 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + From febcd7d7c0ac18e3a6833c87245269cb83e285fa Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 15:46:16 +0900 Subject: [PATCH 43/86] Remove currentRoom from RoomManager --- osu.Game/Screens/Multi/RoomManager.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs index c74787a0ed..b1f021618f 100644 --- a/osu.Game/Screens/Multi/RoomManager.cs +++ b/osu.Game/Screens/Multi/RoomManager.cs @@ -26,9 +26,6 @@ namespace osu.Game.Screens.Multi private Room joinedRoom; - [Resolved] - private Bindable currentRoom { get; set; } - [Resolved] private Bindable currentFilter { get; set; } From ee5ff283d1fb56baf630d2ef426eb645a837a09e Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 16:02:00 +0900 Subject: [PATCH 44/86] Remove compiler warnings --- osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs | 6 +++++- osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs index 2b362743e8..6fa15a5917 100644 --- a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs +++ b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs @@ -71,7 +71,11 @@ namespace osu.Game.Tests.Visual private class TestRoomManager : IRoomManager { - public event Action RoomsUpdated; + public event Action RoomsUpdated + { + add => throw new NotImplementedException(); + remove => throw new NotImplementedException(); + } public readonly BindableList Rooms = new BindableList(); IBindableList IRoomManager.Rooms => Rooms; diff --git a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs index 54b2e8a8fc..bb29770c56 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs @@ -131,7 +131,11 @@ namespace osu.Game.Tests.Visual public Func CreateRequested; - public event Action RoomsUpdated; + public event Action RoomsUpdated + { + add => throw new NotImplementedException(); + remove => throw new NotImplementedException(); + } public IBindableList Rooms { get; } = null; From 7aca0f4a1d31cef5f119047d115545c2d7bcb8af Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 8 Feb 2019 16:02:14 +0900 Subject: [PATCH 45/86] Fix failing test cases --- .../Visual/TestCaseLoungeRoomsContainer.cs | 14 ++++---------- .../Visual/TestCaseMatchSettingsOverlay.cs | 9 ++------- osu.Game/Tests/Visual/MultiplayerTestCase.cs | 18 ++++++------------ 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs index 6fa15a5917..c87b91003b 100644 --- a/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs +++ b/osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs @@ -16,7 +16,7 @@ using osuTK.Graphics; namespace osu.Game.Tests.Visual { - public class TestCaseLoungeRoomsContainer : OsuTestCase + public class TestCaseLoungeRoomsContainer : MultiplayerTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0)); AddStep("select first room", () => container.Rooms.First().Action?.Invoke()); - AddAssert("first room selected", () => roomManager.CurrentRoom.Value == roomManager.Rooms.First()); + AddAssert("first room selected", () => Room == roomManager.Rooms.First()); AddStep("join first room", () => container.Rooms.First().Action?.Invoke()); AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus); @@ -73,15 +73,13 @@ namespace osu.Game.Tests.Visual { public event Action RoomsUpdated { - add => throw new NotImplementedException(); - remove => throw new NotImplementedException(); + add { } + remove { } } public readonly BindableList Rooms = new BindableList(); IBindableList IRoomManager.Rooms => Rooms; - public Bindable CurrentRoom { get; } = new Bindable(); - public void CreateRoom(Room room, Action onSuccess = null, Action onError = null) => Rooms.Add(room); public void JoinRoom(Room room, Action onSuccess = null, Action onError = null) @@ -91,10 +89,6 @@ namespace osu.Game.Tests.Visual public void PartRoom() { } - - public void Filter(FilterCriteria criteria) - { - } } private class JoinedRoomStatus : RoomStatus diff --git a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs index bb29770c56..317707a77e 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs @@ -13,7 +13,6 @@ using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using osu.Game.Online.Multiplayer; using osu.Game.Screens.Multi; -using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Screens.Multi.Match.Components; namespace osu.Game.Tests.Visual @@ -133,14 +132,12 @@ namespace osu.Game.Tests.Visual public event Action RoomsUpdated { - add => throw new NotImplementedException(); - remove => throw new NotImplementedException(); + add { } + remove { } } public IBindableList Rooms { get; } = null; - public Bindable CurrentRoom { get; } = new Bindable(); - public void CreateRoom(Room room, Action onSuccess = null, Action onError = null) { if (CreateRequested == null) @@ -155,8 +152,6 @@ namespace osu.Game.Tests.Visual public void JoinRoom(Room room, Action onSuccess = null, Action onError = null) => throw new NotImplementedException(); public void PartRoom() => throw new NotImplementedException(); - - public void Filter(FilterCriteria criteria) => throw new NotImplementedException(); } } } diff --git a/osu.Game/Tests/Visual/MultiplayerTestCase.cs b/osu.Game/Tests/Visual/MultiplayerTestCase.cs index 5ed4f012c6..6efdddbfee 100644 --- a/osu.Game/Tests/Visual/MultiplayerTestCase.cs +++ b/osu.Game/Tests/Visual/MultiplayerTestCase.cs @@ -2,26 +2,20 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; +using osu.Framework.Configuration; using osu.Game.Online.Multiplayer; namespace osu.Game.Tests.Visual { public class MultiplayerTestCase : OsuTestCase { - private Room room; + [Cached] + private readonly Bindable currentRoom = new Bindable(new Room()); protected Room Room { - get => room; - set - { - if (room == value) - return; - room = value; - - if (dependencies != null) - dependencies.Model.Value = value; - } + get => currentRoom; + set => currentRoom.Value = value; } private CachedModelDependencyContainer dependencies; @@ -29,7 +23,7 @@ namespace osu.Game.Tests.Visual protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); - dependencies.Model.Value = room; + dependencies.Model.BindTo(currentRoom); return dependencies; } } From 959b1ac845e8790f111004c00534c73df5c467ac Mon Sep 17 00:00:00 2001 From: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com> Date: Fri, 8 Feb 2019 17:28:00 +0900 Subject: [PATCH 46/86] Fix potential nullref when exiting multiplayer (#4227) Fixes https://github.com/ppy/osu/issues/3954 --- osu.Game/Screens/Multi/Multiplayer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 1741ac0b7b..50f190479b 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -218,7 +218,7 @@ namespace osu.Game.Screens.Multi private void cancelLooping() { - var track = beatmap.Value.Track; + var track = beatmap?.Value?.Track; if (track != null) track.Looping = false; } From e8aed6b68641b2d033267d0d0384ec2f17691229 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 8 Feb 2019 17:38:18 +0900 Subject: [PATCH 47/86] Update framework --- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 4b735f3101..e87b43ac93 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + diff --git a/osu.iOS.props b/osu.iOS.props index e00c4fcf78..0d8a7e3a34 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -105,12 +105,12 @@ - - + + - + \ No newline at end of file From 7ec0b4ba773180ad8d9c73004dbf1d766df6d38e Mon Sep 17 00:00:00 2001 From: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com> Date: Fri, 8 Feb 2019 17:53:01 +0900 Subject: [PATCH 48/86] Fix nullref during room creation (#4228) --- osu.Game/Screens/Multi/Match/Components/ReadyButton.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs index 1bde6270f6..102e75cfb7 100644 --- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs +++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs @@ -55,6 +55,9 @@ namespace osu.Game.Screens.Multi.Match.Components private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) { + if (Beatmap.Value == null) + return; + if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID)) Schedule(() => hasBeatmap = true); } From 6c4d289901685648287ca1cdd5d06880703cac21 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 8 Feb 2019 18:33:49 +0900 Subject: [PATCH 49/86] Pass item rather than ID --- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 2 +- osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 7b94de7d76..9685962f9e 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -235,7 +235,7 @@ namespace osu.Game.Screens.Multi.Match { default: case GameTypeTimeshift _: - pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(Playlist.First().ID) + pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(Playlist.First()) { Exited = () => leaderboard.RefreshScores() })); diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs index 6cddd235e1..71f6687cc6 100644 --- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs +++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs @@ -25,14 +25,14 @@ namespace osu.Game.Screens.Multi.Play [Resolved(typeof(Room), nameof(Room.RoomID))] private Bindable roomId { get; set; } - private readonly int playlistItemId; + private readonly PlaylistItem playlistItem; [Resolved] private APIAccess api { get; set; } - public TimeshiftPlayer(int playlistItemId) + public TimeshiftPlayer(PlaylistItem playlistItem) { - this.playlistItemId = playlistItemId; + this.playlistItem = playlistItem; } private int? token; @@ -44,7 +44,7 @@ namespace osu.Game.Screens.Multi.Play bool failed = false; - var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItemId); + var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID); req.Success += r => token = r.ID; req.Failure += e => { @@ -89,7 +89,7 @@ namespace osu.Game.Screens.Multi.Play Debug.Assert(token != null); - var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItemId, score); + var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score); request.Failure += e => Logger.Error(e, "Failed to submit score"); api.Queue(request); } From f52cac966b7989265b8bfd7c1c68093eab3f7200 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 8 Feb 2019 18:45:32 +0900 Subject: [PATCH 50/86] Fix multiple blank lines --- osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs index e962784660..c3169ebe94 100644 --- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs @@ -281,7 +281,6 @@ namespace osu.Game.Screens.Multi.Match.Components private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0; - private void apply() { hideError(); From 88ffc78103ed606b51015024c1a58408535d28a1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 11 Feb 2019 19:11:34 +0900 Subject: [PATCH 51/86] Restructure --- osu.Game.Tests/Visual/TestCaseMatchResults.cs | 2 +- .../UpdateableBeatmapBackgroundSprite.cs | 2 +- osu.Game/Online/Multiplayer/Room.cs | 16 + .../Screens/Multi/Components/BeatmapTitle.cs | 12 +- .../Multi/Components/BeatmapTypeInfo.cs | 8 +- .../Screens/Multi/Components/ModeTypeInfo.cs | 11 +- .../Components/MultiplayerBackgroundSprite.cs | 2 +- .../Screens/Multi/Lounge/LoungeSubScreen.cs | 14 +- .../Screens/Multi/Match/Components/Header.cs | 2 +- .../Screens/Multi/Match/Components/Info.cs | 8 +- .../Multi/Match/Components/ReadyButton.cs | 2 +- .../Match/Components/ViewBeatmapButton.cs | 2 +- .../Screens/Multi/Match/MatchSubScreen.cs | 353 +++++++++--------- osu.Game/Screens/Multi/Multiplayer.cs | 49 +-- .../Screens/Multi/MultiplayerComposite.cs | 37 +- .../Screens/Multi/MultiplayerSubScreen.cs | 46 +-- 16 files changed, 243 insertions(+), 323 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseMatchResults.cs b/osu.Game.Tests/Visual/TestCaseMatchResults.cs index c34ad0fcbc..33469e74b7 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchResults.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchResults.cs @@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual { } - protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap.Value, room) }; + protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap.Value) }; } private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs index c66052052f..d1d30a7c29 100644 --- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs +++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs @@ -13,7 +13,7 @@ namespace osu.Game.Beatmaps.Drawables /// public class UpdateableBeatmapBackgroundSprite : ModelBackedDrawable { - public readonly IBindable Beatmap = new Bindable(); + public readonly Bindable Beatmap = new Bindable(); [Resolved] private BeatmapManager beatmaps { get; set; } diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs index 0d5b168dcb..2dcc7369f9 100644 --- a/osu.Game/Online/Multiplayer/Room.cs +++ b/osu.Game/Online/Multiplayer/Room.cs @@ -31,6 +31,10 @@ namespace osu.Game.Online.Multiplayer [JsonProperty("playlist")] public BindableList Playlist { get; private set; } = new BindableList(); + [Cached] + [JsonIgnore] + public Bindable CurrentItem { get; private set; } = new Bindable(); + [Cached] [JsonProperty("channel_id")] public Bindable ChannelId { get; private set; } = new Bindable(); @@ -66,6 +70,18 @@ namespace osu.Game.Online.Multiplayer [Cached] public Bindable ParticipantCount { get; private set; } = new Bindable(); + public Room() + { + Playlist.ItemsAdded += updateCurrent; + Playlist.ItemsRemoved += updateCurrent; + updateCurrent(Playlist); + } + + private void updateCurrent(IEnumerable playlist) + { + CurrentItem.Value = playlist.FirstOrDefault(); + } + // todo: TEMPORARY [JsonProperty("participant_count")] private int? participantCount diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs index dca0545035..ff1a1fb3a4 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs @@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Components [BackgroundDependencyLoader] private void load() { - CurrentBeatmap.BindValueChanged(v => updateText(), true); + CurrentItem.BindValueChanged(v => updateText(), true); } private float textSize = OsuSpriteText.FONT_SIZE; @@ -53,7 +53,9 @@ namespace osu.Game.Screens.Multi.Components textFlow.Clear(); - if (CurrentBeatmap.Value == null) + var beatmap = CurrentItem.Value?.Beatmap; + + if (beatmap == null) textFlow.AddText("No beatmap selected", s => { s.TextSize = TextSize; @@ -65,7 +67,7 @@ namespace osu.Game.Screens.Multi.Components { new OsuSpriteText { - Text = new LocalisedString((CurrentBeatmap.Value.Metadata.ArtistUnicode, CurrentBeatmap.Value.Metadata.Artist)), + Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)), TextSize = TextSize, }, new OsuSpriteText @@ -75,10 +77,10 @@ namespace osu.Game.Screens.Multi.Components }, new OsuSpriteText { - Text = new LocalisedString((CurrentBeatmap.Value.Metadata.TitleUnicode, CurrentBeatmap.Value.Metadata.Title)), + Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title)), TextSize = TextSize, } - }, null, LinkAction.OpenBeatmap, CurrentBeatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap"); + }, null, LinkAction.OpenBeatmap, beatmap.OnlineBeatmapID.ToString(), "Open beatmap"); } } } diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs index 3904df2069..4f432a232c 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs @@ -51,14 +51,16 @@ namespace osu.Game.Screens.Multi.Components } }; - CurrentBeatmap.BindValueChanged(v => + CurrentItem.BindValueChanged(item => { beatmapAuthor.Clear(); - if (v != null) + var beatmap = item?.Beatmap; + + if (beatmap != null) { beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f)); - beatmapAuthor.AddLink(v.Metadata.Author.Username, null, LinkAction.OpenUserProfile, v.Metadata.Author.Id.ToString(), "View Profile"); + beatmapAuthor.AddLink(beatmap.Metadata.Author.Username, null, LinkAction.OpenUserProfile, beatmap.Metadata.Author.Id.ToString(), "View Profile"); } }, true); } diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs index 97ea1b5f36..0d49f75b46 100644 --- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs +++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs @@ -5,6 +5,7 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps.Drawables; +using osu.Game.Online.Multiplayer; using osuTK; namespace osu.Game.Screens.Multi.Components @@ -45,17 +46,17 @@ namespace osu.Game.Screens.Multi.Components }, }; - CurrentBeatmap.BindValueChanged(_ => updateBeatmap()); - CurrentRuleset.BindValueChanged(_ => updateBeatmap(), true); + CurrentItem.BindValueChanged(updateBeatmap, true); + Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }, true); } - private void updateBeatmap() + private void updateBeatmap(PlaylistItem item) { - if (CurrentBeatmap.Value != null) + if (item?.Beatmap != null) { rulesetContainer.FadeIn(transition_duration); - rulesetContainer.Child = new DifficultyIcon(CurrentBeatmap.Value, CurrentRuleset.Value) { Size = new Vector2(height) }; + rulesetContainer.Child = new DifficultyIcon(item.Beatmap, item.Ruleset) { Size = new Vector2(height) }; } else rulesetContainer.FadeOut(transition_duration); diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs index 8eff7b14af..06d5e585ab 100644 --- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs +++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs @@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Components InternalChild = sprite = CreateBackgroundSprite(); - sprite.Beatmap.BindTo(CurrentBeatmap); + CurrentItem.BindValueChanged(i => sprite.Beatmap.Value = i?.Beatmap, true); } protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both }; diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 1229d071ef..71205dc199 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -1,7 +1,6 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System; using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Graphics; @@ -23,16 +22,13 @@ namespace osu.Game.Screens.Multi.Lounge protected readonly FilterControl Filter; private readonly Container content; - private readonly Action pushGameplayScreen; private readonly ProcessingOverlay processingOverlay; [Resolved] private Bindable currentRoom { get; set; } - public LoungeSubScreen(Action pushGameplayScreen) + public LoungeSubScreen() { - this.pushGameplayScreen = pushGameplayScreen; - InternalChildren = new Drawable[] { Filter = new FilterControl { Depth = -1 }, @@ -83,8 +79,8 @@ namespace osu.Game.Screens.Multi.Lounge content.Padding = new MarginPadding { Top = Filter.DrawHeight, - Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, - Right = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, + Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING, + Right = SearchableListOverlay.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING, }; } @@ -114,7 +110,7 @@ namespace osu.Game.Screens.Multi.Lounge private void joinRequested(Room room) { processingOverlay.Show(); - Manager?.JoinRoom(room, r => + RoomManager?.JoinRoom(room, r => { Open(room); processingOverlay.Hide(); @@ -132,7 +128,7 @@ namespace osu.Game.Screens.Multi.Lounge currentRoom.Value = room; - this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); + this.Push(new MatchSubScreen(room)); } } } diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs index 137c0aa939..9a0fdbd4e7 100644 --- a/osu.Game/Screens/Multi/Match/Components/Header.cs +++ b/osu.Game/Screens/Multi/Match/Components/Header.cs @@ -108,7 +108,7 @@ namespace osu.Game.Screens.Multi.Match.Components }, }; - CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true); + CurrentItem.BindValueChanged(i => modDisplay.Current.Value = i?.RequiredMods, true); beatmapButton.Action = () => RequestBeatmapSelection?.Invoke(); } diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs index ec6dbb6d12..b27c5b0ab4 100644 --- a/osu.Game/Screens/Multi/Match/Components/Info.cs +++ b/osu.Game/Screens/Multi/Match/Components/Info.cs @@ -92,8 +92,12 @@ namespace osu.Game.Screens.Multi.Match.Components }, }; - viewBeatmapButton.Beatmap.BindTo(CurrentBeatmap); - readyButton.Beatmap.BindTo(CurrentBeatmap); + CurrentItem.BindValueChanged(item => + { + viewBeatmapButton.Beatmap.Value = item?.Beatmap; + readyButton.Beatmap.Value = item?.Beatmap; + }, true); + hostInfo.Host.BindTo(Host); } } diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs index 0f9c51af6a..50cf2addeb 100644 --- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs +++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs @@ -14,7 +14,7 @@ namespace osu.Game.Screens.Multi.Match.Components { public class ReadyButton : HeaderButton { - public readonly IBindable Beatmap = new Bindable(); + public readonly Bindable Beatmap = new Bindable(); [Resolved(typeof(Room), nameof(Room.EndDate))] private Bindable endDate { get; set; } diff --git a/osu.Game/Screens/Multi/Match/Components/ViewBeatmapButton.cs b/osu.Game/Screens/Multi/Match/Components/ViewBeatmapButton.cs index 9970894ffc..e26a6b7e20 100644 --- a/osu.Game/Screens/Multi/Match/Components/ViewBeatmapButton.cs +++ b/osu.Game/Screens/Multi/Match/Components/ViewBeatmapButton.cs @@ -11,7 +11,7 @@ namespace osu.Game.Screens.Multi.Match.Components { public class ViewBeatmapButton : HeaderButton { - public readonly IBindable Beatmap = new Bindable(); + public readonly Bindable Beatmap = new Bindable(); [Resolved(CanBeNull = true)] private OsuGame osuGame { get; set; } diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index d252ddf0b9..41c498538f 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using System; +using System.Collections.Generic; using System.Linq; using osu.Framework.Allocation; using osu.Framework.Configuration; @@ -11,11 +12,12 @@ using osu.Framework.Screens; using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer.GameTypes; -using osu.Game.Rulesets; +using osu.Game.Rulesets.Mods; using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Play; using osu.Game.Screens.Play; using osu.Game.Screens.Select; +using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem; namespace osu.Game.Screens.Multi.Match { @@ -33,223 +35,208 @@ namespace osu.Game.Screens.Multi.Match [Resolved(typeof(Room), nameof(Room.Name))] private Bindable name { get; set; } - [Resolved(typeof(Room), nameof(Room.Playlist))] - private BindableList playlist { get; set; } + [Resolved(typeof(Room), nameof(Room.Type))] + private Bindable type { get; set; } - public MatchSubScreen(Room room, Action pushGameplayScreen) + [Resolved(typeof(Room))] + protected BindableList Playlist { get; private set; } + + [Resolved(typeof(Room))] + protected Bindable CurrentItem { get; private set; } + + [Resolved] + protected Bindable> CurrentMods { get; private set; } + + public MatchSubScreen(Room room) { Title = room.RoomID.Value == null ? "New room" : room.Name; + } - InternalChild = new Match(pushGameplayScreen) - { - RelativeSizeAxes = Axes.Both, - RequestBeatmapSelection = () => this.Push(new MatchSongSelect - { - Selected = item => - { - playlist.Clear(); - playlist.Add(item); - }, - }), - RequestExit = () => - { - if (this.IsCurrentScreen()) - this.Exit(); - } - }; + private readonly Action pushGameplayScreen; + + private MatchLeaderboard leaderboard; + + [Resolved] + private BeatmapManager beatmapManager { get; set; } + + [Resolved(CanBeNull = true)] + private OsuGame game { get; set; } + + protected override void LoadComplete() + { + base.LoadComplete(); + + CurrentItem.BindValueChanged(currentItemChanged, true); + } + + private void currentItemChanged(PlaylistItem item) + { + // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info + var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.OnlineBeatmapID); + + Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); + CurrentMods.Value = item?.RequiredMods ?? Enumerable.Empty(); + if (item?.Ruleset != null) + Ruleset.Value = item.Ruleset; } public override bool OnExiting(IScreen next) { - Manager?.PartRoom(); + RoomManager?.PartRoom(); return base.OnExiting(next); } - private class Match : MultiplayerComposite + [BackgroundDependencyLoader] + private void load() { - public Action RequestBeatmapSelection; - public Action RequestExit; + MatchChatDisplay chat; + Components.Header header; + Info info; + GridContainer bottomRow; + MatchSettingsOverlay settings; - private readonly Action pushGameplayScreen; - - private MatchLeaderboard leaderboard; - - [Resolved] - private IBindableBeatmap gameBeatmap { get; set; } - - [Resolved] - private BeatmapManager beatmapManager { get; set; } - - [Resolved(CanBeNull = true)] - private OsuGame game { get; set; } - - public Match(Action pushGameplayScreen) + InternalChildren = new Drawable[] { - this.pushGameplayScreen = pushGameplayScreen; - } - - [BackgroundDependencyLoader] - private void load() - { - MatchChatDisplay chat; - Components.Header header; - Info info; - GridContainer bottomRow; - MatchSettingsOverlay settings; - - InternalChildren = new Drawable[] + new GridContainer { - new GridContainer + RelativeSizeAxes = Axes.Both, + Content = new[] { - RelativeSizeAxes = Axes.Both, - Content = new[] + new Drawable[] { - new Drawable[] + header = new Components.Header { - header = new Components.Header + Depth = -1, + RequestBeatmapSelection = () => { - Depth = -1, - RequestBeatmapSelection = () => RequestBeatmapSelection?.Invoke() - } - }, - new Drawable[] { info = new Info { OnStart = onStart } }, - new Drawable[] - { - bottomRow = new GridContainer - { - RelativeSizeAxes = Axes.Both, - Content = new[] + this.Push(new MatchSongSelect { - new Drawable[] + Selected = item => { - leaderboard = new MatchLeaderboard + Playlist.Clear(); + Playlist.Add(item); + } + }); + } + } + }, + new Drawable[] { info = new Info { OnStart = onStart } }, + new Drawable[] + { + bottomRow = new GridContainer + { + RelativeSizeAxes = Axes.Both, + Content = new[] + { + new Drawable[] + { + leaderboard = new MatchLeaderboard + { + Padding = new MarginPadding + { + Left = 10 + HORIZONTAL_OVERFLOW_PADDING, + Right = 10, + Vertical = 10, + }, + RelativeSizeAxes = Axes.Both + }, + new Container + { + Padding = new MarginPadding + { + Left = 10, + Right = 10 + HORIZONTAL_OVERFLOW_PADDING, + Vertical = 10, + }, + RelativeSizeAxes = Axes.Both, + Child = chat = new MatchChatDisplay { - Padding = new MarginPadding - { - Left = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, - Right = 10, - Vertical = 10, - }, RelativeSizeAxes = Axes.Both - }, - new Container - { - Padding = new MarginPadding - { - Left = 10, - Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, - Vertical = 10, - }, - RelativeSizeAxes = Axes.Both, - Child = chat = new MatchChatDisplay - { - RelativeSizeAxes = Axes.Both - } - }, + } }, }, - } - }, + }, + } }, - RowDimensions = new[] - { - new Dimension(GridSizeMode.AutoSize), - new Dimension(GridSizeMode.AutoSize), - new Dimension(GridSizeMode.Distributed), - } }, - new Container + RowDimensions = new[] { - RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = Components.Header.HEIGHT }, - Child = settings = new MatchSettingsOverlay { RelativeSizeAxes = Axes.Both }, - }, - }; - - header.Tabs.Current.BindValueChanged(t => - { - const float fade_duration = 500; - if (t is SettingsMatchPage) - { - settings.Show(); - info.FadeOut(fade_duration, Easing.OutQuint); - bottomRow.FadeOut(fade_duration, Easing.OutQuint); + new Dimension(GridSizeMode.AutoSize), + new Dimension(GridSizeMode.AutoSize), + new Dimension(GridSizeMode.Distributed), } - else - { - settings.Hide(); - info.FadeIn(fade_duration, Easing.OutQuint); - bottomRow.FadeIn(fade_duration, Easing.OutQuint); - } - }, true); - - chat.Exit += () => RequestExit?.Invoke(); - - beatmapManager.ItemAdded += beatmapAdded; - } - - protected override void LoadComplete() - { - base.LoadComplete(); - - CurrentBeatmap.BindValueChanged(setBeatmap, true); - CurrentRuleset.BindValueChanged(setRuleset, true); - } - - private void setBeatmap(BeatmapInfo beatmap) - { - // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info - var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID); - - game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); - } - - private void setRuleset(RulesetInfo ruleset) - { - if (ruleset == null) - return; - - game?.ForcefullySetRuleset(ruleset); - } - - private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => - { - if (gameBeatmap.Value != beatmapManager.DefaultBeatmap) - return; - - if (CurrentBeatmap.Value == null) - return; - - // Try to retrieve the corresponding local beatmap - var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentBeatmap.Value.OnlineBeatmapID); - - if (localBeatmap != null) - game?.ForcefullySetBeatmap(beatmapManager.GetWorkingBeatmap(localBeatmap)); - }); - - private void onStart() - { - gameBeatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); - - switch (Type.Value) + }, + new Container { - default: - case GameTypeTimeshift _: - pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(Playlist.First()) - { - Exited = () => leaderboard.RefreshScores() - })); - break; + RelativeSizeAxes = Axes.Both, + Padding = new MarginPadding { Top = Components.Header.HEIGHT }, + Child = settings = new MatchSettingsOverlay { RelativeSizeAxes = Axes.Both }, + }, + }; + + header.Tabs.Current.BindValueChanged(t => + { + const float fade_duration = 500; + if (t is SettingsMatchPage) + { + settings.Show(); + info.FadeOut(fade_duration, Easing.OutQuint); + bottomRow.FadeOut(fade_duration, Easing.OutQuint); } - } + else + { + settings.Hide(); + info.FadeIn(fade_duration, Easing.OutQuint); + bottomRow.FadeIn(fade_duration, Easing.OutQuint); + } + }, true); - protected override void Dispose(bool isDisposing) + chat.Exit += () => { - base.Dispose(isDisposing); + if (this.IsCurrentScreen()) + this.Exit(); + }; - if (beatmapManager != null) - beatmapManager.ItemAdded -= beatmapAdded; + beatmapManager.ItemAdded += beatmapAdded; + } + + private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => + { + if (Beatmap.Value != beatmapManager.DefaultBeatmap) + return; + + if (Beatmap.Value == null) + return; + + // Try to retrieve the corresponding local beatmap + var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentItem.Value.Beatmap.OnlineBeatmapID); + + if (localBeatmap != null) + Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); + }); + + private void onStart() + { + //Beatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); + + switch (type.Value) + { + default: + case GameTypeTimeshift _: + pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(CurrentItem) + { + Exited = () => leaderboard.RefreshScores() + })); + break; } } + + protected override void Dispose(bool isDisposing) + { + base.Dispose(isDisposing); + + if (beatmapManager != null) + beatmapManager.ItemAdded -= beatmapAdded; + } } } diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 42208a2165..7ea4736b04 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Framework.Logging; using osu.Framework.Screens; -using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Containers; @@ -16,9 +15,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Input; using osu.Game.Online.API; using osu.Game.Online.Multiplayer; -using osu.Game.Overlays; using osu.Game.Overlays.BeatmapSet.Buttons; -using osu.Game.Rulesets; using osu.Game.Screens.Menu; using osu.Game.Screens.Multi.Lounge; using osu.Game.Screens.Multi.Lounge.Components; @@ -28,19 +25,9 @@ using osuTK; namespace osu.Game.Screens.Multi { [Cached] - public class Multiplayer : CompositeDrawable, IOsuScreen, IOnlineComponent + public class Multiplayer : OsuScreen, IOnlineComponent { - public bool DisallowExternalBeatmapRulesetChanges => false; - - public bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true; - - public bool HideOverlaysOnEnter => false; - public OverlayActivation InitialOverlayActivationMode => OverlayActivation.All; - - public float BackgroundParallaxAmount => 1; - - public bool ValidForResume { get; set; } = true; - public bool ValidForPush { get; set; } = true; + public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true; public override bool RemoveWhenNotAlive => false; @@ -70,20 +57,6 @@ namespace osu.Game.Screens.Multi [Resolved(CanBeNull = true)] private OsuLogo logo { get; set; } - public Bindable Beatmap { get; set; } - - public Bindable Ruleset { get; set; } - - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) - { - var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); - - Beatmap = deps.Beatmap; - Ruleset = deps.Ruleset; - - return deps; - } - public Multiplayer() { Anchor = Anchor.Centre; @@ -95,8 +68,8 @@ namespace osu.Game.Screens.Multi RelativeSizeAxes = Axes.Both, }; - screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen(pushGameplayScreen)) { RelativeSizeAxes = Axes.Both }; - Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING }; + screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen()) { RelativeSizeAxes = Axes.Both }; + Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING }; waves.AddRange(new Drawable[] { @@ -136,7 +109,7 @@ namespace osu.Game.Screens.Multi Margin = new MarginPadding { Top = 10, - Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING, + Right = 10 + HORIZONTAL_OVERFLOW_PADDING, }, Text = "Create room", Action = () => loungeSubScreen.Open(new Room @@ -207,14 +180,14 @@ namespace osu.Game.Screens.Multi } } - public void OnEntering(IScreen last) + public override void OnEntering(IScreen last) { this.FadeIn(); waves.Show(); } - public bool OnExiting(IScreen next) + public override bool OnExiting(IScreen next) { waves.Hide(); @@ -233,17 +206,17 @@ namespace osu.Game.Screens.Multi return false; } - public void OnResuming(IScreen last) + public override void OnResuming(IScreen last) { this.FadeIn(250); this.ScaleTo(1, 250, Easing.OutSine); - logo?.AppendAnimatingAction(() => OsuScreen.ApplyLogoArrivingDefaults(logo), true); + logo?.AppendAnimatingAction(() => ApplyLogoArrivingDefaults(logo), true); updatePollingRate(isIdle.Value); } - public void OnSuspending(IScreen next) + public override void OnSuspending(IScreen next) { this.ScaleTo(1.1f, 250, Easing.InSine); this.FadeOut(250); @@ -254,7 +227,7 @@ namespace osu.Game.Screens.Multi private void cancelLooping() { - var track = beatmap?.Value?.Track; + var track = Beatmap?.Value?.Track; if (track != null) track.Looping = false; diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs index 1a16db97a4..245a6ac358 100644 --- a/osu.Game/Screens/Multi/MultiplayerComposite.cs +++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs @@ -3,14 +3,10 @@ using System; using System.Collections.Generic; -using System.Linq; using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; -using osu.Game.Rulesets; -using osu.Game.Rulesets.Mods; using osu.Game.Users; namespace osu.Game.Screens.Multi @@ -35,6 +31,9 @@ namespace osu.Game.Screens.Multi [Resolved(typeof(Room))] protected BindableList Playlist { get; private set; } + [Resolved(typeof(Room))] + protected Bindable CurrentItem { get; private set; } + [Resolved(typeof(Room))] protected Bindable> Participants { get; private set; } @@ -52,35 +51,5 @@ namespace osu.Game.Screens.Multi [Resolved(typeof(Room))] protected Bindable Duration { get; private set; } - - private readonly Bindable currentBeatmap = new Bindable(); - protected IBindable CurrentBeatmap => currentBeatmap; - - private readonly Bindable> currentMods = new Bindable>(); - protected IBindable> CurrentMods => currentMods; - - private readonly Bindable currentRuleset = new Bindable(); - protected IBindable CurrentRuleset => currentRuleset; - - protected override void LoadComplete() - { - base.LoadComplete(); - - Playlist.ItemsAdded += _ => updatePlaylist(); - Playlist.ItemsRemoved += _ => updatePlaylist(); - - updatePlaylist(); - } - - private void updatePlaylist() - { - // Todo: We only ever have one playlist item for now. In the future, this will be user-settable - - var playlistItem = Playlist.FirstOrDefault(); - - currentBeatmap.Value = playlistItem?.Beatmap; - currentMods.Value = playlistItem?.RequiredMods ?? Enumerable.Empty(); - currentRuleset.Value = playlistItem?.Ruleset; - } } } diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs index b0d89c9bba..ad72072981 100644 --- a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs +++ b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs @@ -2,57 +2,27 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; -using osu.Framework.Configuration; using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; using osu.Framework.Input.Bindings; using osu.Framework.Screens; -using osu.Game.Beatmaps; using osu.Game.Graphics.Containers; using osu.Game.Input.Bindings; -using osu.Game.Overlays; -using osu.Game.Rulesets; namespace osu.Game.Screens.Multi { - public abstract class MultiplayerSubScreen : CompositeDrawable, IMultiplayerSubScreen, IKeyBindingHandler + public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen, IKeyBindingHandler { - public virtual bool DisallowExternalBeatmapRulesetChanges => false; - - public bool CursorVisible => true; - - public bool HideOverlaysOnEnter => false; - public OverlayActivation InitialOverlayActivationMode => OverlayActivation.All; - - public float BackgroundParallaxAmount => 1; - - public bool ValidForResume { get; set; } = true; - public bool ValidForPush { get; set; } = true; + public override bool DisallowExternalBeatmapRulesetChanges => false; public override bool RemoveWhenNotAlive => false; - public abstract string Title { get; } public virtual string ShortTitle => Title; - public Bindable Beatmap { get; set; } - - public Bindable Ruleset { get; set; } - - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) - { - var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent)); - - Beatmap = deps.Beatmap; - Ruleset = deps.Ruleset; - - return deps; - } - [Resolved(CanBeNull = true)] protected OsuGame Game { get; private set; } [Resolved(CanBeNull = true)] - protected IRoomManager Manager { get; private set; } + protected IRoomManager RoomManager { get; private set; } protected MultiplayerSubScreen() { @@ -61,14 +31,14 @@ namespace osu.Game.Screens.Multi RelativeSizeAxes = Axes.Both; } - public virtual void OnEntering(IScreen last) + public override void OnEntering(IScreen last) { this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint); this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint); this.MoveToX(200).MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint); } - public virtual bool OnExiting(IScreen next) + public override bool OnExiting(IScreen next) { this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); this.MoveToX(200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); @@ -76,19 +46,19 @@ namespace osu.Game.Screens.Multi return false; } - public virtual void OnResuming(IScreen last) + public override void OnResuming(IScreen last) { this.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint); this.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint); } - public virtual void OnSuspending(IScreen next) + public override void OnSuspending(IScreen next) { this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); this.MoveToX(-200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint); } - public virtual bool OnPressed(GlobalAction action) + public override bool OnPressed(GlobalAction action) { if (!this.IsCurrentScreen()) return false; From e4422167b6a77af486eb03369ff98affdbaa4497 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 11 Feb 2019 19:13:57 +0900 Subject: [PATCH 52/86] Fix starting gameplay --- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 41c498538f..7a9b040e37 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -217,13 +217,14 @@ namespace osu.Game.Screens.Multi.Match private void onStart() { - //Beatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); + // todo: is this required? + Beatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); switch (type.Value) { default: case GameTypeTimeshift _: - pushGameplayScreen?.Invoke(new PlayerLoader(() => new TimeshiftPlayer(CurrentItem) + this.Push(new PlayerLoader(() => new TimeshiftPlayer(CurrentItem) { Exited = () => leaderboard.RefreshScores() })); From e57409fe41623f3f1b4fac7df221bc847223559b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 10:51:39 +0900 Subject: [PATCH 53/86] Remove unnecessary bindable properties on mod lists --- osu.Game/Online/Multiplayer/PlaylistItem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs index ff3ae240cb..e47d497d94 100644 --- a/osu.Game/Online/Multiplayer/PlaylistItem.cs +++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs @@ -1,9 +1,9 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; -using osu.Framework.Configuration; using osu.Game.Beatmaps; using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets; @@ -37,10 +37,10 @@ namespace osu.Game.Online.Multiplayer public RulesetInfo Ruleset { get; set; } [JsonIgnore] - public readonly BindableList AllowedMods = new BindableList(); + public readonly List AllowedMods = new List(); [JsonIgnore] - public readonly BindableList RequiredMods = new BindableList(); + public readonly List RequiredMods = new List(); [JsonProperty("beatmap")] private APIBeatmap apiBeatmap { get; set; } From 78b47f9fe3f75768b0d099fa9dfaa99b316c01b3 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 11:19:34 +0900 Subject: [PATCH 54/86] Fix starting matches not working --- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 15 ++++++++------- osu.Game/Screens/Multi/Multiplayer.cs | 13 ++++++++++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index 7a9b040e37..a7a2b9003f 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -1,7 +1,6 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System; using System.Collections.Generic; using System.Linq; using osu.Framework.Allocation; @@ -15,7 +14,6 @@ using osu.Game.Online.Multiplayer.GameTypes; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Play; -using osu.Game.Screens.Play; using osu.Game.Screens.Select; using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem; @@ -52,8 +50,6 @@ namespace osu.Game.Screens.Multi.Match Title = room.RoomID.Value == null ? "New room" : room.Name; } - private readonly Action pushGameplayScreen; - private MatchLeaderboard leaderboard; [Resolved] @@ -200,6 +196,9 @@ namespace osu.Game.Screens.Multi.Match beatmapManager.ItemAdded += beatmapAdded; } + /// + /// Handle the case where a beatmap is imported (and can be used by this match). + /// private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() => { if (Beatmap.Value != beatmapManager.DefaultBeatmap) @@ -215,19 +214,21 @@ namespace osu.Game.Screens.Multi.Match Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); }); + [Resolved(canBeNull: true)] + private Multiplayer multiplayer { get; set; } + private void onStart() { - // todo: is this required? Beatmap.Value.Mods.Value = CurrentMods.Value.ToArray(); switch (type.Value) { default: case GameTypeTimeshift _: - this.Push(new PlayerLoader(() => new TimeshiftPlayer(CurrentItem) + multiplayer?.Start(() => new TimeshiftPlayer(CurrentItem) { Exited = () => leaderboard.RefreshScores() - })); + }); break; } } diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 7ea4736b04..afb4955c56 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using System; using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Graphics; @@ -20,6 +21,7 @@ using osu.Game.Screens.Menu; using osu.Game.Screens.Multi.Lounge; using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Screens.Multi.Match; +using osu.Game.Screens.Play; using osuTK; namespace osu.Game.Screens.Multi @@ -29,7 +31,7 @@ namespace osu.Game.Screens.Multi { public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true; - public override bool RemoveWhenNotAlive => false; + public override bool DisallowExternalBeatmapRulesetChanges => true; private readonly MultiplayerWaveContainer waves; @@ -292,5 +294,14 @@ namespace osu.Game.Screens.Multi FourthWaveColour = OsuColour.FromHex(@"392850"); } } + + /// + /// Push a to the main screen stack to begin gameplay. + /// Generally called from a via DI resolution. + /// + public void Start(Func player) + { + this.Push(new PlayerLoader(player)); + } } } From 272584eb796d7631d0798cff2178ec30b60a4766 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 13:02:33 +0900 Subject: [PATCH 55/86] Improve file layouts --- .../Screens/Multi/Match/MatchSubScreen.cs | 56 ++++---- osu.Game/Screens/Multi/Multiplayer.cs | 122 ++++++++---------- 2 files changed, 84 insertions(+), 94 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index a7a2b9003f..cd51aea575 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -45,41 +45,17 @@ namespace osu.Game.Screens.Multi.Match [Resolved] protected Bindable> CurrentMods { get; private set; } - public MatchSubScreen(Room room) - { - Title = room.RoomID.Value == null ? "New room" : room.Name; - } - - private MatchLeaderboard leaderboard; - [Resolved] private BeatmapManager beatmapManager { get; set; } [Resolved(CanBeNull = true)] private OsuGame game { get; set; } - protected override void LoadComplete() + private MatchLeaderboard leaderboard; + + public MatchSubScreen(Room room) { - base.LoadComplete(); - - CurrentItem.BindValueChanged(currentItemChanged, true); - } - - private void currentItemChanged(PlaylistItem item) - { - // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info - var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.OnlineBeatmapID); - - Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); - CurrentMods.Value = item?.RequiredMods ?? Enumerable.Empty(); - if (item?.Ruleset != null) - Ruleset.Value = item.Ruleset; - } - - public override bool OnExiting(IScreen next) - { - RoomManager?.PartRoom(); - return base.OnExiting(next); + Title = room.RoomID.Value == null ? "New room" : room.Name; } [BackgroundDependencyLoader] @@ -196,6 +172,30 @@ namespace osu.Game.Screens.Multi.Match beatmapManager.ItemAdded += beatmapAdded; } + protected override void LoadComplete() + { + base.LoadComplete(); + + CurrentItem.BindValueChanged(currentItemChanged, true); + } + + private void currentItemChanged(PlaylistItem item) + { + // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info + var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.OnlineBeatmapID); + + Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap); + CurrentMods.Value = item?.RequiredMods ?? Enumerable.Empty(); + if (item?.Ruleset != null) + Ruleset.Value = item.Ruleset; + } + + public override bool OnExiting(IScreen next) + { + RoomManager?.PartRoom(); + return base.OnExiting(next); + } + /// /// Handle the case where a beatmap is imported (and can be used by this match). /// diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index afb4955c56..1103e781ff 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -64,64 +64,61 @@ namespace osu.Game.Screens.Multi Anchor = Anchor.Centre; Origin = Anchor.Centre; RelativeSizeAxes = Axes.Both; + Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING }; InternalChild = waves = new MultiplayerWaveContainer { RelativeSizeAxes = Axes.Both, + Children = new Drawable[] + { + new Container + { + RelativeSizeAxes = Axes.Both, + Masking = true, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = OsuColour.FromHex(@"3e3a44"), + }, + new Triangles + { + RelativeSizeAxes = Axes.Both, + ColourLight = OsuColour.FromHex(@"3c3842"), + ColourDark = OsuColour.FromHex(@"393540"), + TriangleScale = 5, + }, + }, + }, + new Container + { + RelativeSizeAxes = Axes.Both, + Padding = new MarginPadding { Top = Header.HEIGHT }, + Child = screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen()) { RelativeSizeAxes = Axes.Both } + }, + new Header(screenStack), + createButton = new HeaderButton + { + Anchor = Anchor.TopRight, + Origin = Anchor.TopRight, + RelativeSizeAxes = Axes.None, + Size = new Vector2(150, Header.HEIGHT - 20), + Margin = new MarginPadding + { + Top = 10, + Right = 10 + HORIZONTAL_OVERFLOW_PADDING, + }, + Text = "Create room", + Action = () => loungeSubScreen.Open(new Room + { + Name = { Value = $"{api.LocalUser}'s awesome room" } + }), + }, + roomManager = new RoomManager() + } }; - screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen()) { RelativeSizeAxes = Axes.Both }; - Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING }; - - waves.AddRange(new Drawable[] - { - new Container - { - RelativeSizeAxes = Axes.Both, - Masking = true, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = OsuColour.FromHex(@"3e3a44"), - }, - new Triangles - { - RelativeSizeAxes = Axes.Both, - ColourLight = OsuColour.FromHex(@"3c3842"), - ColourDark = OsuColour.FromHex(@"393540"), - TriangleScale = 5, - }, - }, - }, - new Container - { - RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = Header.HEIGHT }, - Child = screenStack - }, - new Header(screenStack), - createButton = new HeaderButton - { - Anchor = Anchor.TopRight, - Origin = Anchor.TopRight, - RelativeSizeAxes = Axes.None, - Size = new Vector2(150, Header.HEIGHT - 20), - Margin = new MarginPadding - { - Top = 10, - Right = 10 + HORIZONTAL_OVERFLOW_PADDING, - }, - Text = "Create room", - Action = () => loungeSubScreen.Open(new Room - { - Name = { Value = $"{api.LocalUser}'s awesome room" } - }), - }, - roomManager = new RoomManager() - }); - screenStack.ScreenPushed += screenPushed; screenStack.ScreenExited += screenExited; } @@ -141,11 +138,9 @@ namespace osu.Game.Screens.Multi isIdle.BindValueChanged(updatePollingRate, true); } - private CachedModelDependencyContainer dependencies; - protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { - dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); + var dependencies = new CachedModelDependencyContainer(base.CreateChildDependencies(parent)); dependencies.Model.BindTo(currentRoom); return dependencies; } @@ -156,12 +151,16 @@ namespace osu.Game.Screens.Multi Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}"); } - private void pushGameplayScreen(IScreen gameplayScreen) + /// + /// Push a to the main screen stack to begin gameplay. + /// Generally called from a via DI resolution. + /// + public void Start(Func player) { if (!this.IsCurrentScreen()) return; - this.Push(gameplayScreen); + this.Push(new PlayerLoader(player)); } public void APIStateChanged(APIAccess api, APIState state) @@ -294,14 +293,5 @@ namespace osu.Game.Screens.Multi FourthWaveColour = OsuColour.FromHex(@"392850"); } } - - /// - /// Push a to the main screen stack to begin gameplay. - /// Generally called from a via DI resolution. - /// - public void Start(Func player) - { - this.Push(new PlayerLoader(player)); - } } } From d5cce850a8bd035f376912c72ec384ec6e8bd79b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 13:29:41 +0900 Subject: [PATCH 56/86] Revert some unnecessary complications in logo logic --- osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 15 +++++++++------ osu.Game/Screens/Multi/Multiplayer.cs | 15 ++++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index cd51aea575..d97b32e54a 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -179,6 +179,15 @@ namespace osu.Game.Screens.Multi.Match CurrentItem.BindValueChanged(currentItemChanged, true); } + public override bool OnExiting(IScreen next) + { + RoomManager?.PartRoom(); + return base.OnExiting(next); + } + + /// + /// Handles propagation of the current playlist item's content to game-wide mechanisms. + /// private void currentItemChanged(PlaylistItem item) { // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info @@ -190,12 +199,6 @@ namespace osu.Game.Screens.Multi.Match Ruleset.Value = item.Ruleset; } - public override bool OnExiting(IScreen next) - { - RoomManager?.PartRoom(); - return base.OnExiting(next); - } - /// /// Handle the case where a beatmap is imported (and can be used by this match). /// diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 1103e781ff..822be0891b 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -184,7 +184,6 @@ namespace osu.Game.Screens.Multi public override void OnEntering(IScreen last) { this.FadeIn(); - waves.Show(); } @@ -201,18 +200,24 @@ namespace osu.Game.Screens.Multi updatePollingRate(isIdle.Value); - // the wave overlay transition takes longer than expected to run. - logo?.AppendAnimatingAction(() => logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut(), false); - + base.OnExiting(next); return false; } + protected override void LogoExiting(OsuLogo logo) + { + base.LogoExiting(logo); + + // the wave overlay transition takes longer than expected to run. + logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut(); + } + public override void OnResuming(IScreen last) { this.FadeIn(250); this.ScaleTo(1, 250, Easing.OutSine); - logo?.AppendAnimatingAction(() => ApplyLogoArrivingDefaults(logo), true); + base.OnResuming(last); updatePollingRate(isIdle.Value); } From a28689ff4c478946ab5d2cba015e58ef46058fb9 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 17:58:36 +0900 Subject: [PATCH 57/86] Update framework --- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index e87b43ac93..c1a77a17cd 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + diff --git a/osu.iOS.props b/osu.iOS.props index 0d8a7e3a34..c6b3494d47 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -105,8 +105,8 @@ - - + + From 2ea839c475aa970ac1c22ac904d0ec681e45c272 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 19:18:22 +0900 Subject: [PATCH 58/86] Fix crashes on beatmap not being set correctly in player --- osu.Game/Screens/Play/Player.cs | 2 +- osu.Game/Screens/Play/ReplayPlayer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 71b7b77e5d..5a2ef688ca 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -383,7 +383,7 @@ namespace osu.Game.Screens.Play return true; } - if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused != false || RulesetContainer?.HasReplayLoaded != false) && (!pauseContainer?.IsResuming ?? true)) + if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused.Value != false || RulesetContainer?.HasReplayLoaded?.Value != false) && (!pauseContainer?.IsResuming ?? true)) { // In the case of replays, we may have changed the playback rate. applyRateFromMods(); diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs index 3317deca8b..3190139378 100644 --- a/osu.Game/Screens/Play/ReplayPlayer.cs +++ b/osu.Game/Screens/Play/ReplayPlayer.cs @@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play protected override void LoadComplete() { base.LoadComplete(); - RulesetContainer.SetReplayScore(score); + RulesetContainer?.SetReplayScore(score); } protected override ScoreInfo CreateScore() => score.ScoreInfo; From b967b93b8847060064c3f8c9476200e7dc60f58a Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 12 Feb 2019 19:53:08 +0900 Subject: [PATCH 59/86] Fix regressions in tests --- osu.Game.Tests/Visual/TestCasePlayerLoader.cs | 14 ++++++++++++-- osu.Game/Tests/Visual/OsuTestCase.cs | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs index 82ce7e125a..16cb94c65e 100644 --- a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs +++ b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs @@ -3,6 +3,7 @@ using System.Threading; using osu.Framework.Allocation; +using osu.Framework.Graphics; using osu.Framework.Screens; using osu.Game.Beatmaps; using osu.Game.Screens.Play; @@ -12,28 +13,37 @@ namespace osu.Game.Tests.Visual public class TestCasePlayerLoader : ManualInputManagerTestCase { private PlayerLoader loader; + private ScreenStack stack; [BackgroundDependencyLoader] private void load(OsuGameBase game) { Beatmap.Value = new DummyWorkingBeatmap(game); - AddStep("load dummy beatmap", () => Add(loader = new PlayerLoader(() => new Player + InputManager.Add(stack = new ScreenStack { RelativeSizeAxes = Axes.Both }); + + AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player { AllowPause = false, AllowLeadIn = false, AllowResults = false, }))); + AddUntilStep(() => loader.IsCurrentScreen(), "wait for current"); + AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre)); AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current"); + AddStep("exit loader", () => loader.Exit()); + + AddUntilStep(() => !loader.IsAlive, "wait for no longer alive"); + AddStep("load slow dummy beatmap", () => { SlowLoadPlayer slow = null; - Add(loader = new PlayerLoader(() => slow = new SlowLoadPlayer + stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer { AllowPause = false, AllowLeadIn = false, diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs index 3dfcd0febd..74cd4684da 100644 --- a/osu.Game/Tests/Visual/OsuTestCase.cs +++ b/osu.Game/Tests/Visual/OsuTestCase.cs @@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual // This is the earliest we can get OsuGameBase, which is used by the dummy working beatmap to find textures beatmap.Default = new DummyWorkingBeatmap(Dependencies.Get()); - Dependencies.CacheAs(beatmap); + Dependencies.CacheAs>(beatmap); Dependencies.CacheAs>(beatmap); Dependencies.CacheAs(Ruleset); From 11234d3c60d5b941d8487caf446ba0c85a6871f4 Mon Sep 17 00:00:00 2001 From: Roman Kapustin Date: Tue, 12 Feb 2019 21:20:49 +0300 Subject: [PATCH 60/86] Update direct download button state on beatmap import and removal --- osu.Game/Overlays/Direct/DownloadButton.cs | 9 +++++++++ .../Direct/DownloadTrackingComposite.cs | 20 ++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/osu.Game/Overlays/Direct/DownloadButton.cs b/osu.Game/Overlays/Direct/DownloadButton.cs index 201a79f58a..b3372bf237 100644 --- a/osu.Game/Overlays/Direct/DownloadButton.cs +++ b/osu.Game/Overlays/Direct/DownloadButton.cs @@ -76,6 +76,9 @@ namespace osu.Game.Overlays.Direct { this.colours = colours; + beatmaps.ItemAdded += (set, existing, silent) => updateState(BeatmapSet.Value); + beatmaps.ItemRemoved += set => updateState(BeatmapSet.Value); + button.Action = () => { switch (State.Value) @@ -94,6 +97,12 @@ namespace osu.Game.Overlays.Direct }; } + private void updateState(BeatmapSetInfo set) + { + if (set.OnlineBeatmapSetID == BeatmapSet.Value.OnlineBeatmapSetID) + UpdateState(BeatmapSet.Value); + } + private void updateState(DownloadState state) { switch (state) diff --git a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs index f255403e81..eabc02d66e 100644 --- a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs +++ b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs @@ -34,15 +34,7 @@ namespace osu.Game.Overlays.Direct { this.beatmaps = beatmaps; - BeatmapSet.BindValueChanged(set => - { - if (set == null) - attachDownload(null); - else if (beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID).Any()) - State.Value = DownloadState.LocallyAvailable; - else - attachDownload(beatmaps.GetExistingDownload(set)); - }, true); + BeatmapSet.BindValueChanged(UpdateState, true); beatmaps.BeatmapDownloadBegan += download => { @@ -53,6 +45,16 @@ namespace osu.Game.Overlays.Direct beatmaps.ItemAdded += setAdded; } + protected void UpdateState(BeatmapSetInfo set) + { + if (set == null) + attachDownload(null); + else if (this.beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID && !s.DeletePending).Any()) + State.Value = DownloadState.LocallyAvailable; + else + attachDownload(this.beatmaps.GetExistingDownload(set)); + } + #region Disposal protected override void Dispose(bool isDisposing) From 19bef01dd0d2cdbaf067a713ec9af9ec10087fce Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 11:05:02 +0900 Subject: [PATCH 61/86] Attempt to maybe fix tests --- osu.Game/Tests/Visual/ScreenTestCase.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osu.Game/Tests/Visual/ScreenTestCase.cs b/osu.Game/Tests/Visual/ScreenTestCase.cs index 79c57ad9f4..c0eceb84a7 100644 --- a/osu.Game/Tests/Visual/ScreenTestCase.cs +++ b/osu.Game/Tests/Visual/ScreenTestCase.cs @@ -33,5 +33,11 @@ namespace osu.Game.Tests.Visual stack.Exit(); stack.Push(screen); } + + protected override void Dispose(bool isDisposing) + { + stack.Dispose(); + base.Dispose(isDisposing); + } } } From c3ae4d7b142ac66a6a19bb7f72ec006415f7224a Mon Sep 17 00:00:00 2001 From: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com> Date: Wed, 13 Feb 2019 11:34:48 +0900 Subject: [PATCH 62/86] Improve comment Co-Authored-By: peppy --- osu.Game/Screens/OsuScreen.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index 86f1f3a9d9..b8d6fda97d 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -51,7 +51,7 @@ namespace osu.Game.Screens protected new OsuGameBase Game => base.Game as OsuGameBase; /// - /// Disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children). + /// Whether to disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children). /// public virtual bool DisallowExternalBeatmapRulesetChanges => false; From ab3adafafda7efedf7e36e0278b69d449fe2c302 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 14:13:54 +0900 Subject: [PATCH 63/86] Fix crashes after entering player --- osu.Game/Screens/Select/PlaySongSelect.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 982a44a8d3..7b3c3e0ec3 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -58,7 +58,6 @@ namespace osu.Game.Screens.Select } Beatmap.Value.Track.Looping = false; - Beatmap.Disabled = true; SampleConfirm?.Play(); From 166cdab2e83c37625ff6fb5a019873572cb63f0e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 14:14:57 +0900 Subject: [PATCH 64/86] Remove unnecessary null check --- osu.Game/Screens/Play/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 5a2ef688ca..2ab207e47a 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -383,7 +383,7 @@ namespace osu.Game.Screens.Play return true; } - if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused.Value != false || RulesetContainer?.HasReplayLoaded?.Value != false) && (!pauseContainer?.IsResuming ?? true)) + if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused.Value != false || RulesetContainer?.HasReplayLoaded.Value != false) && (!pauseContainer?.IsResuming ?? true)) { // In the case of replays, we may have changed the playback rate. applyRateFromMods(); From 1373e0fad078a73f5647ed43a94ac46dd2cb8027 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 14:57:40 +0900 Subject: [PATCH 65/86] Fix BeatmapTitle not always displaying --- osu.Game/Screens/Multi/Components/BeatmapTitle.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs index ff1a1fb3a4..7a513a7f5f 100644 --- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs +++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs @@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi.Components private void updateText() { - if (!IsLoaded) + if (LoadState < LoadState.Loading) return; textFlow.Clear(); From 43843ac5586b2fb5e25292f80c4147e0ebab213c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 14:58:40 +0900 Subject: [PATCH 66/86] Remove explicit dispose --- osu.Game/Tests/Visual/ScreenTestCase.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/osu.Game/Tests/Visual/ScreenTestCase.cs b/osu.Game/Tests/Visual/ScreenTestCase.cs index c0eceb84a7..79c57ad9f4 100644 --- a/osu.Game/Tests/Visual/ScreenTestCase.cs +++ b/osu.Game/Tests/Visual/ScreenTestCase.cs @@ -33,11 +33,5 @@ namespace osu.Game.Tests.Visual stack.Exit(); stack.Push(screen); } - - protected override void Dispose(bool isDisposing) - { - stack.Dispose(); - base.Dispose(isDisposing); - } } } From 3ec94e4ab36c8ef02f4ca6dfce7127785c84ead0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 15:14:34 +0900 Subject: [PATCH 67/86] Remove disable setting --- osu.Game/Tests/Visual/OsuTestCase.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs index 74cd4684da..6bff4c0291 100644 --- a/osu.Game/Tests/Visual/OsuTestCase.cs +++ b/osu.Game/Tests/Visual/OsuTestCase.cs @@ -58,11 +58,7 @@ namespace osu.Game.Tests.Visual { base.Dispose(isDisposing); - if (beatmap != null) - { - beatmap.Disabled = true; - beatmap.Value.Track.Stop(); - } + beatmap?.Value.Track.Stop(); if (localStorage.IsValueCreated) { From e604806398ca26a392bea35b87e15ef0663ddca5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 19:43:01 +0900 Subject: [PATCH 68/86] Fix regression in screen change allowance logic --- osu.Game/OsuGame.cs | 2 +- osu.Game/Screens/IOsuScreen.cs | 6 ++++++ osu.Game/Screens/Select/MatchSongSelect.cs | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 3b71324644..4dc9d71d37 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -292,7 +292,7 @@ namespace osu.Game return; } - if ((screenStack.CurrentScreen as IOsuScreen)?.DisallowExternalBeatmapRulesetChanges != false) + if ((screenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange == false) { notifications.Post(new SimpleNotification { diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs index f256760a0a..9e28de5593 100644 --- a/osu.Game/Screens/IOsuScreen.cs +++ b/osu.Game/Screens/IOsuScreen.cs @@ -17,6 +17,12 @@ namespace osu.Game.Screens /// bool DisallowExternalBeatmapRulesetChanges { get; } + /// + /// Whether a top-level component should be allowed to exit the current screen to, for example, + /// complete an import. + /// + bool AllowExternalScreenChange { get; } + /// /// Whether this allows the cursor to be displayed. /// diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs index cfeaa1785e..d7ff95be85 100644 --- a/osu.Game/Screens/Select/MatchSongSelect.cs +++ b/osu.Game/Screens/Select/MatchSongSelect.cs @@ -17,6 +17,8 @@ namespace osu.Game.Screens.Select public string ShortTitle => "song selection"; public override string Title => ShortTitle.Humanize(); + public override bool AllowExternalScreenChange => false; + public MatchSongSelect() { Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING }; From 5318de29b4d36bba60971c12e6a8a85695e9e69e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 13 Feb 2019 19:57:54 +0900 Subject: [PATCH 69/86] Fix import logic again --- osu.Game/OsuGame.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 4dc9d71d37..ad6411a2d6 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -311,7 +311,7 @@ namespace osu.Game void loadScore() { - if (!menuScreen.IsCurrentScreen()) + if (!menuScreen.IsCurrentScreen() || Beatmap.Disabled) { menuScreen.MakeCurrent(); this.Delay(500).Schedule(loadScore, out scoreLoad); From 99046f16e8edbd16a39ab49f6f1cb83b38510fc3 Mon Sep 17 00:00:00 2001 From: Roman Kapustin Date: Wed, 13 Feb 2019 22:04:49 +0300 Subject: [PATCH 70/86] Revert "Update direct download button state on beatmap import and removal" This reverts commit 11234d3c60d5b941d8487caf446ba0c85a6871f4. --- osu.Game/Overlays/Direct/DownloadButton.cs | 9 --------- .../Direct/DownloadTrackingComposite.cs | 20 +++++++++---------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/osu.Game/Overlays/Direct/DownloadButton.cs b/osu.Game/Overlays/Direct/DownloadButton.cs index b3372bf237..201a79f58a 100644 --- a/osu.Game/Overlays/Direct/DownloadButton.cs +++ b/osu.Game/Overlays/Direct/DownloadButton.cs @@ -76,9 +76,6 @@ namespace osu.Game.Overlays.Direct { this.colours = colours; - beatmaps.ItemAdded += (set, existing, silent) => updateState(BeatmapSet.Value); - beatmaps.ItemRemoved += set => updateState(BeatmapSet.Value); - button.Action = () => { switch (State.Value) @@ -97,12 +94,6 @@ namespace osu.Game.Overlays.Direct }; } - private void updateState(BeatmapSetInfo set) - { - if (set.OnlineBeatmapSetID == BeatmapSet.Value.OnlineBeatmapSetID) - UpdateState(BeatmapSet.Value); - } - private void updateState(DownloadState state) { switch (state) diff --git a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs index eabc02d66e..f255403e81 100644 --- a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs +++ b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs @@ -34,7 +34,15 @@ namespace osu.Game.Overlays.Direct { this.beatmaps = beatmaps; - BeatmapSet.BindValueChanged(UpdateState, true); + BeatmapSet.BindValueChanged(set => + { + if (set == null) + attachDownload(null); + else if (beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID).Any()) + State.Value = DownloadState.LocallyAvailable; + else + attachDownload(beatmaps.GetExistingDownload(set)); + }, true); beatmaps.BeatmapDownloadBegan += download => { @@ -45,16 +53,6 @@ namespace osu.Game.Overlays.Direct beatmaps.ItemAdded += setAdded; } - protected void UpdateState(BeatmapSetInfo set) - { - if (set == null) - attachDownload(null); - else if (this.beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID && !s.DeletePending).Any()) - State.Value = DownloadState.LocallyAvailable; - else - attachDownload(this.beatmaps.GetExistingDownload(set)); - } - #region Disposal protected override void Dispose(bool isDisposing) From a289cb7c6a8f8b5b47983c0320f86d21eae16f91 Mon Sep 17 00:00:00 2001 From: Roman Kapustin Date: Wed, 13 Feb 2019 22:11:46 +0300 Subject: [PATCH 71/86] Handle beatmapset removal in DownloadTrackingComposite --- osu.Game/Overlays/Direct/DownloadTrackingComposite.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs index f255403e81..f7d9264af0 100644 --- a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs +++ b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs @@ -51,6 +51,7 @@ namespace osu.Game.Overlays.Direct }; beatmaps.ItemAdded += setAdded; + beatmaps.ItemRemoved += setRemoved; } #region Disposal @@ -120,12 +121,16 @@ namespace osu.Game.Overlays.Direct Schedule(() => attachDownload(null)); } - private void setAdded(BeatmapSetInfo s, bool existing, bool silent) + private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => setDownloadState(s, DownloadState.Downloaded); + + private void setRemoved(BeatmapSetInfo s) => setDownloadState(s, DownloadState.NotDownloaded); + + private void setDownloadState(BeatmapSetInfo s, DownloadState state) { if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID) return; - Schedule(() => State.Value = DownloadState.LocallyAvailable); + Schedule(() => State.Value = state); } } } From 94ceb1e32bc38e545a4d69349b8cf6a7370996e5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Feb 2019 13:28:21 +0900 Subject: [PATCH 72/86] Move screen change allowance to local usage --- osu.Game/Screens/Select/MatchSongSelect.cs | 2 -- osu.Game/Screens/Select/PlaySongSelect.cs | 2 ++ osu.Game/Screens/Select/SongSelect.cs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs index d7ff95be85..cfeaa1785e 100644 --- a/osu.Game/Screens/Select/MatchSongSelect.cs +++ b/osu.Game/Screens/Select/MatchSongSelect.cs @@ -17,8 +17,6 @@ namespace osu.Game.Screens.Select public string ShortTitle => "song selection"; public override string Title => ShortTitle.Humanize(); - public override bool AllowExternalScreenChange => false; - public MatchSongSelect() { Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING }; diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 7b3c3e0ec3..b5e9cd5f41 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -15,6 +15,8 @@ namespace osu.Game.Screens.Select private bool removeAutoModOnResume; private OsuScreen player; + public override bool AllowExternalScreenChange => true; + [BackgroundDependencyLoader] private void load(OsuColour colours) { diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index caa95ec549..3be4dd8c0b 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -45,8 +45,6 @@ namespace osu.Game.Screens.Select protected virtual bool ShowFooter => true; - public override bool AllowExternalScreenChange => true; - /// /// Can be null if is false. /// From cf66fc69242c8eeec4b3bda4a39dd6aecf29018a Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Feb 2019 13:29:07 +0900 Subject: [PATCH 73/86] Update framework --- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index c1a77a17cd..38ed6870ff 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + diff --git a/osu.iOS.props b/osu.iOS.props index c6b3494d47..fb8a46992e 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -105,8 +105,8 @@ - - + + From a5f1f9830bfc0c13d3db751d65ea39bbba1e29e0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Feb 2019 16:21:01 +0900 Subject: [PATCH 74/86] Fix potential schedule race case and regression in enum setting --- .../Direct/DownloadTrackingComposite.cs | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs index f7d9264af0..d9eb827834 100644 --- a/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs +++ b/osu.Game/Overlays/Direct/DownloadTrackingComposite.cs @@ -11,6 +11,9 @@ using osu.Game.Online.API.Requests; namespace osu.Game.Overlays.Direct { + /// + /// A component which tracks a beatmap through potential download/import/deletion. + /// public abstract class DownloadTrackingComposite : CompositeDrawable { public readonly Bindable BeatmapSet = new Bindable(); @@ -106,31 +109,22 @@ namespace osu.Game.Overlays.Direct } } - private void onRequestSuccess(string data) - { - Schedule(() => State.Value = DownloadState.Downloaded); - } + private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Downloaded); - private void onRequestProgress(float progress) - { - Schedule(() => Progress.Value = progress); - } + private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress); - private void onRequestFailure(Exception e) - { - Schedule(() => attachDownload(null)); - } + private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null)); - private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => setDownloadState(s, DownloadState.Downloaded); + private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable); - private void setRemoved(BeatmapSetInfo s) => setDownloadState(s, DownloadState.NotDownloaded); + private void setRemoved(BeatmapSetInfo s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded); - private void setDownloadState(BeatmapSetInfo s, DownloadState state) + private void setDownloadStateFromManager(BeatmapSetInfo s, DownloadState state) => Schedule(() => { if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID) return; - Schedule(() => State.Value = state); - } + State.Value = state; + }); } } From 777a606b2d82d084f8f40a1c0d76326bb5ca564b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 14 Feb 2019 17:14:58 +0900 Subject: [PATCH 75/86] Don't revert beatmap on exiting leased state --- osu.Game/Screens/OsuScreenDependencies.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/OsuScreenDependencies.cs b/osu.Game/Screens/OsuScreenDependencies.cs index 1c355d6320..b51ce0d33f 100644 --- a/osu.Game/Screens/OsuScreenDependencies.cs +++ b/osu.Game/Screens/OsuScreenDependencies.cs @@ -22,7 +22,7 @@ namespace osu.Game.Screens Beatmap = parent.Get>()?.GetBoundCopy(); if (Beatmap == null) { - Cache(Beatmap = parent.Get>().BeginLease(true)); + Cache(Beatmap = parent.Get>().BeginLease(false)); } Ruleset = parent.Get>()?.GetBoundCopy(); @@ -38,4 +38,4 @@ namespace osu.Game.Screens } } } -} \ No newline at end of file +} From 490d48fa5e106b88b5aac1952812689ec444c889 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 13:47:26 +0900 Subject: [PATCH 76/86] Fix MultiplayerTestCase not being abstract --- osu.Game/Tests/Visual/MultiplayerTestCase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Tests/Visual/MultiplayerTestCase.cs b/osu.Game/Tests/Visual/MultiplayerTestCase.cs index 6efdddbfee..7e2f915179 100644 --- a/osu.Game/Tests/Visual/MultiplayerTestCase.cs +++ b/osu.Game/Tests/Visual/MultiplayerTestCase.cs @@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer; namespace osu.Game.Tests.Visual { - public class MultiplayerTestCase : OsuTestCase + public abstract class MultiplayerTestCase : OsuTestCase { [Cached] private readonly Bindable currentRoom = new Bindable(new Room()); From 3ea13b1ade846820c94bcf70cd72d8bc1f12d0f7 Mon Sep 17 00:00:00 2001 From: Jamie Taylor Date: Fri, 15 Feb 2019 16:55:39 +0900 Subject: [PATCH 77/86] Fix mouse cursor appearing prematurely during startup --- osu.Game/OsuGame.cs | 5 +++++ osu.Game/Screens/Loader.cs | 2 ++ 2 files changed, 7 insertions(+) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index ad6411a2d6..7b4ff3d295 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -337,6 +337,11 @@ namespace osu.Game { base.LoadComplete(); + // The next time this is updated is in UpdateAfterChildren, which occurs too late and results + // in the cursor being shown for a few frames during the intro. + // This prevents the cursor from showing until we have a screen with CursorVisible = true + MenuCursorContainer.CanShowCursor = menuScreen?.CursorVisible ?? false; + // todo: all archive managers should be able to be looped here. SkinManager.PostNotification = n => notifications?.Post(n); SkinManager.GetStableStorage = GetStorageForStableInstall; diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs index 9703d79442..0db0f1a1a3 100644 --- a/osu.Game/Screens/Loader.cs +++ b/osu.Game/Screens/Loader.cs @@ -21,6 +21,8 @@ namespace osu.Game.Screens public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled; + public override bool CursorVisible => false; + protected override bool AllowBackButton => false; public Loader() From 65721a01aba53c4baefcc4d0f5aa3b429b46c99b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 17:01:06 +0900 Subject: [PATCH 78/86] Fix regressed screen test cases --- osu.Game.Tests/Visual/TestCaseDisclaimer.cs | 15 ++------------- osu.Game.Tests/Visual/TestCaseDrawings.cs | 4 ++-- osu.Game.Tests/Visual/TestCaseMatchResults.cs | 4 ++-- osu.Game.Tests/Visual/TestCaseMultiScreen.cs | 4 ++-- .../Visual/TestCaseParallaxContainer.cs | 7 ++++++- osu.Game.Tests/Visual/TestCasePlaySongSelect.cs | 6 ++++-- osu.Game.Tests/Visual/TestCaseResults.cs | 4 ++-- osu.Game/Tests/OsuTestBrowser.cs | 8 +++++--- osu.Game/Tests/Visual/MultiplayerTestCase.cs | 2 +- 9 files changed, 26 insertions(+), 28 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseDisclaimer.cs b/osu.Game.Tests/Visual/TestCaseDisclaimer.cs index d3a53e4a05..3ceb3eb4bd 100644 --- a/osu.Game.Tests/Visual/TestCaseDisclaimer.cs +++ b/osu.Game.Tests/Visual/TestCaseDisclaimer.cs @@ -2,27 +2,16 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Shapes; using osu.Game.Screens.Menu; -using osuTK.Graphics; namespace osu.Game.Tests.Visual { - public class TestCaseDisclaimer : OsuTestCase + public class TestCaseDisclaimer : ScreenTestCase { [BackgroundDependencyLoader] private void load() { - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.Black, - }, - new Disclaimer() - }; + LoadScreen(new Disclaimer()); } } } diff --git a/osu.Game.Tests/Visual/TestCaseDrawings.cs b/osu.Game.Tests/Visual/TestCaseDrawings.cs index 51f34d54db..aad135b71f 100644 --- a/osu.Game.Tests/Visual/TestCaseDrawings.cs +++ b/osu.Game.Tests/Visual/TestCaseDrawings.cs @@ -9,11 +9,11 @@ using osu.Game.Screens.Tournament.Teams; namespace osu.Game.Tests.Visual { [Description("for tournament use")] - public class TestCaseDrawings : OsuTestCase + public class TestCaseDrawings : ScreenTestCase { public TestCaseDrawings() { - Add(new Drawings + LoadScreen(new Drawings { TeamList = new TestTeamList(), }); diff --git a/osu.Game.Tests/Visual/TestCaseMatchResults.cs b/osu.Game.Tests/Visual/TestCaseMatchResults.cs index 33469e74b7..582c035e82 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchResults.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchResults.cs @@ -40,10 +40,10 @@ namespace osu.Game.Tests.Visual Room.RoomID.Value = 1; Room.Name.Value = "an awesome room"; - Child = new TestMatchResults(new ScoreInfo + LoadScreen(new TestMatchResults(new ScoreInfo { User = new User { Id = 10 }, - }); + })); } private class TestMatchResults : MatchResults diff --git a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs index d83b90d6e1..fc4037f58b 100644 --- a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs +++ b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs @@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.Lounge.Components; namespace osu.Game.Tests.Visual { [TestFixture] - public class TestCaseMultiScreen : OsuTestCase + public class TestCaseMultiScreen : ScreenTestCase { public override IReadOnlyList RequiredTypes => new[] { @@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual { Multiplayer multi = new Multiplayer(); - AddStep(@"show", () => Add(multi)); + AddStep(@"show", () => LoadScreen(multi)); AddWaitStep(5); AddStep(@"exit", multi.Exit); } diff --git a/osu.Game.Tests/Visual/TestCaseParallaxContainer.cs b/osu.Game.Tests/Visual/TestCaseParallaxContainer.cs index f9804655ea..41b029d69e 100644 --- a/osu.Game.Tests/Visual/TestCaseParallaxContainer.cs +++ b/osu.Game.Tests/Visual/TestCaseParallaxContainer.cs @@ -1,6 +1,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.Graphics; +using osu.Framework.Screens; using osu.Game.Graphics.Containers; using osu.Game.Screens.Backgrounds; @@ -14,7 +16,10 @@ namespace osu.Game.Tests.Visual Add(parallax = new ParallaxContainer { - Child = new BackgroundScreenDefault { Alpha = 0.8f } + Child = new ScreenStack(new BackgroundScreenDefault { Alpha = 0.8f }) + { + RelativeSizeAxes = Axes.Both, + } }); AddStep("default parallax", () => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT); diff --git a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs index dedcc24e53..c5cc1776f8 100644 --- a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs +++ b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs @@ -12,6 +12,7 @@ using osu.Framework.Configuration; using osu.Framework.Extensions; using osu.Framework.MathUtils; using osu.Framework.Platform; +using osu.Framework.Screens; using osu.Game.Beatmaps; using osu.Game.Database; using osu.Game.Rulesets; @@ -25,7 +26,7 @@ using osu.Game.Screens.Select.Filter; namespace osu.Game.Tests.Visual { [TestFixture] - public class TestCasePlaySongSelect : OsuTestCase + public class TestCasePlaySongSelect : ScreenTestCase { private BeatmapManager manager; @@ -107,7 +108,8 @@ namespace osu.Game.Tests.Visual Schedule(() => { manager?.Delete(manager.GetAllUsableBeatmapSets()); - Child = songSelect = new TestSongSelect(); + LoadScreen(songSelect = new TestSongSelect()); + AddUntilStep(() => songSelect.IsPresent, "wait for present"); }); } diff --git a/osu.Game.Tests/Visual/TestCaseResults.cs b/osu.Game.Tests/Visual/TestCaseResults.cs index 403742a7b5..c2880c1ea2 100644 --- a/osu.Game.Tests/Visual/TestCaseResults.cs +++ b/osu.Game.Tests/Visual/TestCaseResults.cs @@ -16,7 +16,7 @@ using osu.Game.Users; namespace osu.Game.Tests.Visual { [TestFixture] - public class TestCaseResults : OsuTestCase + public class TestCaseResults : ScreenTestCase { private BeatmapManager beatmaps; @@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual if (beatmapInfo != null) Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo); - Add(new SoloResults(new ScoreInfo + LoadScreen(new SoloResults(new ScoreInfo { TotalScore = 2845370, Accuracy = 0.98, diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs index ae347965a9..71b0b02fa6 100644 --- a/osu.Game/Tests/OsuTestBrowser.cs +++ b/osu.Game/Tests/OsuTestBrowser.cs @@ -1,7 +1,9 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.Graphics; using osu.Framework.Platform; +using osu.Framework.Screens; using osu.Framework.Testing; using osu.Game.Graphics; using osu.Game.Screens.Backgrounds; @@ -14,10 +16,10 @@ namespace osu.Game.Tests { base.LoadComplete(); - LoadComponentAsync(new BackgroundScreenDefault + LoadComponentAsync(new ScreenStack(new BackgroundScreenDefault { Colour = OsuColour.Gray(0.5f) }) { - Colour = OsuColour.Gray(0.5f), - Depth = 10 + Depth = 10, + RelativeSizeAxes = Axes.Both, }, AddInternal); // Have to construct this here, rather than in the constructor, because diff --git a/osu.Game/Tests/Visual/MultiplayerTestCase.cs b/osu.Game/Tests/Visual/MultiplayerTestCase.cs index 7e2f915179..578ef6632c 100644 --- a/osu.Game/Tests/Visual/MultiplayerTestCase.cs +++ b/osu.Game/Tests/Visual/MultiplayerTestCase.cs @@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer; namespace osu.Game.Tests.Visual { - public abstract class MultiplayerTestCase : OsuTestCase + public abstract class MultiplayerTestCase : ScreenTestCase { [Cached] private readonly Bindable currentRoom = new Bindable(new Room()); From 5d502250d8cbdc97c8795252ea7e5049a0b76479 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 17:01:51 +0900 Subject: [PATCH 79/86] Fix account creation overlay not working Regressed with screen stack changes. --- osu.Game/Overlays/AccountCreationOverlay.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs index dab960db25..bc780538d5 100644 --- a/osu.Game/Overlays/AccountCreationOverlay.cs +++ b/osu.Game/Overlays/AccountCreationOverlay.cs @@ -70,7 +70,10 @@ namespace osu.Game.Overlays Colour = Color4.Black, Alpha = 0.9f, }, - welcomeScreen = new ScreenWelcome(), + new ScreenStack(welcomeScreen = new ScreenWelcome()) + { + RelativeSizeAxes = Axes.Both, + }, } } } From fc583590d3aa4a6daf27b5cabde29b3ecbbd9715 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 17:40:49 +0900 Subject: [PATCH 80/86] Fix OsuGame testcase --- osu.Game.Tests/Visual/TestCaseOsuGame.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osu.Game.Tests/Visual/TestCaseOsuGame.cs b/osu.Game.Tests/Visual/TestCaseOsuGame.cs index 16087b5ad8..c527bce683 100644 --- a/osu.Game.Tests/Visual/TestCaseOsuGame.cs +++ b/osu.Game.Tests/Visual/TestCaseOsuGame.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using NUnit.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Shapes; +using osu.Framework.Screens; using osu.Game.Screens; using osu.Game.Screens.Menu; using osuTK.Graphics; @@ -29,7 +30,10 @@ namespace osu.Game.Tests.Visual RelativeSizeAxes = Axes.Both, Colour = Color4.Black, }, - new Loader() + new ScreenStack(new Loader()) + { + RelativeSizeAxes = Axes.Both, + } }; } } From 38cf5a1ea4670d6eaa62fc8b08eaec22a02c95de Mon Sep 17 00:00:00 2001 From: Jamie Taylor Date: Fri, 15 Feb 2019 21:03:06 +0900 Subject: [PATCH 81/86] Add support for the HitCircleOverlap property in legacy skins --- osu.Game/Skinning/LegacySkin.cs | 9 ++++++++- osu.Game/Skinning/LegacySkinDecoder.cs | 3 +++ osu.Game/Skinning/SkinConfiguration.cs | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs index 80f79129c9..5dfefcb777 100644 --- a/osu.Game/Skinning/LegacySkin.cs +++ b/osu.Game/Skinning/LegacySkin.cs @@ -58,7 +58,14 @@ namespace osu.Game.Skinning componentName = "hit300"; break; case "Play/osu/number-text": - return !hasFont(Configuration.HitCircleFont) ? null : new LegacySpriteText(Textures, Configuration.HitCircleFont) { Scale = new Vector2(0.96f) }; + return !hasFont(Configuration.HitCircleFont) + ? null + : new LegacySpriteText(Textures, Configuration.HitCircleFont) + { + Scale = new Vector2(0.96f), + // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size + Spacing = new Vector2(-Configuration.HitCircleOverlap * 0.89f, 0) + }; } var texture = GetTexture(componentName); diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs index 44bb9c3f41..96a9116c51 100644 --- a/osu.Game/Skinning/LegacySkinDecoder.cs +++ b/osu.Game/Skinning/LegacySkinDecoder.cs @@ -46,6 +46,9 @@ namespace osu.Game.Skinning case "HitCirclePrefix": skin.HitCircleFont = pair.Value; break; + case "HitCircleOverlap": + skin.HitCircleOverlap = int.Parse(pair.Value); + break; } break; diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs index a8091d1f36..5b832e15a3 100644 --- a/osu.Game/Skinning/SkinConfiguration.cs +++ b/osu.Game/Skinning/SkinConfiguration.cs @@ -22,6 +22,7 @@ namespace osu.Game.Skinning public Dictionary CustomColours { get; set; } = new Dictionary(); public string HitCircleFont { get; set; } = "default"; + public int HitCircleOverlap { get; set; } public bool? CursorExpand { get; set; } = true; } From 1c8212d510e6bb218570a2ad2fa1afb5a3abc383 Mon Sep 17 00:00:00 2001 From: Jamie Taylor Date: Fri, 15 Feb 2019 21:03:55 +0900 Subject: [PATCH 82/86] Add a TestCase for looong combos --- .../TestCaseHitCircleLongCombo.cs | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 osu.Game.Rulesets.Osu.Tests/TestCaseHitCircleLongCombo.cs diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseHitCircleLongCombo.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseHitCircleLongCombo.cs new file mode 100644 index 0000000000..f5fe36b56a --- /dev/null +++ b/osu.Game.Rulesets.Osu.Tests/TestCaseHitCircleLongCombo.cs @@ -0,0 +1,36 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using NUnit.Framework; +using osu.Game.Beatmaps; +using osu.Game.Rulesets.Osu.Objects; +using osuTK; + +namespace osu.Game.Rulesets.Osu.Tests +{ + [TestFixture] + public class TestCaseHitCircleLongCombo : Game.Tests.Visual.TestCasePlayer + { + public TestCaseHitCircleLongCombo() + : base(new OsuRuleset()) + { + } + + protected override IBeatmap CreateBeatmap(Ruleset ruleset) + { + var beatmap = new Beatmap + { + BeatmapInfo = new BeatmapInfo + { + BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 }, + Ruleset = ruleset.RulesetInfo + } + }; + + for (int i = 0; i < 512; i++) + beatmap.HitObjects.Add(new HitCircle { Position = new Vector2(256, 192), StartTime = i * 100 }); + + return beatmap; + } + } +} From 90e462309f61e30e718552829e26940c6b9733a9 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 21:16:54 +0900 Subject: [PATCH 83/86] Add newline --- osu.Game/Skinning/SkinConfiguration.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs index 5b832e15a3..82faec4e9d 100644 --- a/osu.Game/Skinning/SkinConfiguration.cs +++ b/osu.Game/Skinning/SkinConfiguration.cs @@ -22,6 +22,7 @@ namespace osu.Game.Skinning public Dictionary CustomColours { get; set; } = new Dictionary(); public string HitCircleFont { get; set; } = "default"; + public int HitCircleOverlap { get; set; } public bool? CursorExpand { get; set; } = true; From c607b8c979ec4743a7ad69c58118fd7193bbc155 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 21:28:59 +0900 Subject: [PATCH 84/86] Update framework --- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 38ed6870ff..6b94fa4f98 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -16,7 +16,7 @@ - + diff --git a/osu.iOS.props b/osu.iOS.props index fb8a46992e..d677ef4e21 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -105,8 +105,8 @@ - - + + From aceb8c4cb08804f1f92fd47c6ae603c66c4c7a51 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Feb 2019 21:50:40 +0900 Subject: [PATCH 85/86] Fix TestCasePlaySongSelect --- .../Visual/TestCasePlaySongSelect.cs | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs index c5cc1776f8..78e90987b1 100644 --- a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs +++ b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs @@ -103,22 +103,16 @@ namespace osu.Game.Tests.Visual } [SetUp] - public virtual void SetUp() - { - Schedule(() => - { - manager?.Delete(manager.GetAllUsableBeatmapSets()); - LoadScreen(songSelect = new TestSongSelect()); - AddUntilStep(() => songSelect.IsPresent, "wait for present"); - }); - } + public virtual void SetUp() => + Schedule(() => { manager?.Delete(manager.GetAllUsableBeatmapSets()); }); [Test] public void TestDummy() { + createSongSelect(); AddAssert("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap); - AddAssert("dummy shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap); + AddUntilStep(() => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap, "dummy shown on wedge"); addManyTestMaps(); AddWaitStep(3); @@ -129,6 +123,7 @@ namespace osu.Game.Tests.Visual [Test] public void TestSorting() { + createSongSelect(); addManyTestMaps(); AddWaitStep(3); @@ -144,6 +139,7 @@ namespace osu.Game.Tests.Visual [Ignore("needs fixing")] public void TestImportUnderDifferentRuleset() { + createSongSelect(); changeRuleset(2); importForRuleset(0); AddUntilStep(() => songSelect.Carousel.SelectedBeatmap == null, "no selection"); @@ -152,6 +148,7 @@ namespace osu.Game.Tests.Visual [Test] public void TestImportUnderCurrentRuleset() { + createSongSelect(); changeRuleset(2); importForRuleset(2); importForRuleset(1); @@ -167,6 +164,7 @@ namespace osu.Game.Tests.Visual [Test] public void TestRulesetChangeResetsMods() { + createSongSelect(); changeRuleset(0); changeMods(new OsuModHardRock()); @@ -196,6 +194,7 @@ namespace osu.Game.Tests.Visual [Test] public void TestStartAfterUnMatchingFilterDoesNotStart() { + createSongSelect(); addManyTestMaps(); AddUntilStep(() => songSelect.Carousel.SelectedBeatmap != null, "has selection"); @@ -223,6 +222,12 @@ namespace osu.Game.Tests.Visual private void changeRuleset(int id) => AddStep($"change ruleset to {id}", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == id)); + private void createSongSelect() + { + AddStep("create song select", () => LoadScreen(songSelect = new TestSongSelect())); + AddUntilStep(() => songSelect.IsCurrentScreen(), "wait for present"); + } + private void addManyTestMaps() { AddStep("import test maps", () => From 134840f118f9c5730f3736bfa7b3d5d6d857909f Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Sat, 16 Feb 2019 11:18:17 +0900 Subject: [PATCH 86/86] Fix nullref --- osu.Game/Screens/Multi/Multiplayer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 822be0891b..32eea88fbc 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi private readonly Bindable currentRoom = new Bindable(); [Cached] - private readonly Bindable currentFilter = new Bindable(); + private readonly Bindable currentFilter = new Bindable(new FilterCriteria()); [Cached(Type = typeof(IRoomManager))] private RoomManager roomManager;