From da2bfe6d3c477682d0617ee26efb0ae2f5008e45 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 23 Feb 2017 15:38:17 +0900 Subject: [PATCH] Framework updates. --- osu-framework | 2 +- osu.Desktop.VisualTests/Benchmark.cs | 2 +- osu.Desktop.VisualTests/Program.cs | 2 +- osu.Desktop/OsuGameDesktop.cs | 2 +- osu.Desktop/Program.cs | 8 +------- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 2 +- osu.Game/Beatmaps/IO/ArchiveReader.cs | 6 +++--- osu.Game/Configuration/OsuConfigManager.cs | 2 +- osu.Game/Database/BeatmapDatabase.cs | 4 ++-- osu.Game/IPC/BeatmapImporter.cs | 2 +- osu.Game/OsuGameBase.cs | 4 ++-- osu.Game/Overlays/MusicController.cs | 4 ++-- .../Overlays/Options/Sections/General/UpdateOptions.cs | 2 +- osu.Game/Screens/BackgroundScreen.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs | 2 +- osu.Game/Screens/Play/PlayerInputManager.cs | 2 +- osu.Game/Screens/Select/PlaySongSelect.cs | 6 +++--- 17 files changed, 25 insertions(+), 31 deletions(-) diff --git a/osu-framework b/osu-framework index de1568254c..6e1f811d9d 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit de1568254c4c9a4ea540ccad94700c5c51f70dc2 +Subproject commit 6e1f811d9d6e45a3a4b8c270b8c8cf10297dc3d7 diff --git a/osu.Desktop.VisualTests/Benchmark.cs b/osu.Desktop.VisualTests/Benchmark.cs index 9584dc52a4..eaceea02b1 100644 --- a/osu.Desktop.VisualTests/Benchmark.cs +++ b/osu.Desktop.VisualTests/Benchmark.cs @@ -24,7 +24,7 @@ namespace osu.Desktop.VisualTests private double timePerTest = 200; [BackgroundDependencyLoader] - private void load(BaseGame game) + private void load(Framework.Game game) { Host.MaximumDrawHz = int.MaxValue; Host.MaximumUpdateHz = int.MaxValue; diff --git a/osu.Desktop.VisualTests/Program.cs b/osu.Desktop.VisualTests/Program.cs index b89c6bcf4d..0532049690 100644 --- a/osu.Desktop.VisualTests/Program.cs +++ b/osu.Desktop.VisualTests/Program.cs @@ -20,7 +20,7 @@ namespace osu.Desktop.VisualTests { bool benchmark = args.Length > 0 && args[0] == @"-benchmark"; - using (BasicGameHost host = Host.GetSuitableHost(@"osu")) + using (GameHost host = Host.GetSuitableHost(@"osu")) { Ruleset.Register(new OsuRuleset()); Ruleset.Register(new TaikoRuleset()); diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index 3111d72662..c3adb8f81f 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -42,7 +42,7 @@ namespace osu.Desktop }; } - public override void SetHost(BasicGameHost host) + public override void SetHost(GameHost host) { base.SetHost(host); var desktopWindow = host.Window as DesktopGameWindow; diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index f9a4c94b8d..3023cbfc39 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -3,14 +3,9 @@ using System; using System.IO; -using System.Linq; -using System.Threading; using osu.Desktop.Beatmaps.IO; -using osu.Framework; using osu.Framework.Desktop; using osu.Framework.Desktop.Platform; -using osu.Framework.Platform; -using osu.Game; using osu.Game.IPC; using osu.Game.Modes; using osu.Game.Modes.Catch; @@ -51,8 +46,7 @@ namespace osu.Desktop Ruleset.Register(new ManiaRuleset()); Ruleset.Register(new CatchRuleset()); - BaseGame osu = new OsuGameDesktop(args); - host.Add(osu); + host.Add(new OsuGameDesktop(args)); host.Run(); } return 0; diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 6a162a4ab9..8c892c0725 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -65,7 +65,7 @@ namespace osu.Game.Tests.Beatmaps.IO } } - private OsuGameBase loadOsu(BasicGameHost host) + private OsuGameBase loadOsu(GameHost host) { var osu = new OsuGameBase(); host.Add(osu); diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs index cb5f936939..bbf4de20f5 100644 --- a/osu.Game/Beatmaps/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -14,13 +14,13 @@ namespace osu.Game.Beatmaps.IO { private class Reader { - public Func Test { get; set; } + public Func Test { get; set; } public Type Type { get; set; } } private static List readers { get; } = new List(); - public static ArchiveReader GetReader(BasicStorage storage, string path) + public static ArchiveReader GetReader(Storage storage, string path) { foreach (var reader in readers) { @@ -30,7 +30,7 @@ namespace osu.Game.Beatmaps.IO throw new IOException(@"Unknown file format"); } - protected static void AddReader(Func test) where T : ArchiveReader + protected static void AddReader(Func test) where T : ArchiveReader { readers.Add(new Reader { Test = test, Type = typeof(T) }); } diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index 1562571efc..ccf53ed714 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -189,7 +189,7 @@ namespace osu.Game.Configuration public string GetUnicodeString(string nonunicode, string unicode) => Get(OsuConfig.ShowUnicode) ? unicode ?? nonunicode : nonunicode ?? unicode; - public OsuConfigManager(BasicStorage storage) : base(storage) + public OsuConfigManager(Storage storage) : base(storage) { } } diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index 9c7e70f8eb..566131acdd 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -22,12 +22,12 @@ namespace osu.Game.Database public class BeatmapDatabase { private SQLiteConnection connection { get; set; } - private BasicStorage storage; + private Storage storage; public event Action BeatmapSetAdded; private BeatmapImporter ipc; - public BeatmapDatabase(BasicStorage storage, BasicGameHost importHost = null) + public BeatmapDatabase(Storage storage, GameHost importHost = null) { this.storage = storage; diff --git a/osu.Game/IPC/BeatmapImporter.cs b/osu.Game/IPC/BeatmapImporter.cs index 5b058d5bd8..73c47a1b97 100644 --- a/osu.Game/IPC/BeatmapImporter.cs +++ b/osu.Game/IPC/BeatmapImporter.cs @@ -13,7 +13,7 @@ namespace osu.Game.IPC private IpcChannel channel; private BeatmapDatabase beatmaps; - public BeatmapImporter(BasicGameHost host, BeatmapDatabase beatmaps = null) + public BeatmapImporter(GameHost host, BeatmapDatabase beatmaps = null) { this.beatmaps = beatmaps; diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index db546ac088..ca11d3659f 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -20,7 +20,7 @@ using osu.Game.Online.API; namespace osu.Game { - public class OsuGameBase : BaseGame, IOnlineComponent + public class OsuGameBase : Framework.Game, IOnlineComponent { protected OsuConfigManager LocalConfig; @@ -101,7 +101,7 @@ namespace osu.Game }); } - public override void SetHost(BasicGameHost host) + public override void SetHost(GameHost host) { if (LocalConfig == null) LocalConfig = new OsuConfigManager(host.Storage); diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 3b13c7bf88..03575a10f0 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -45,7 +45,7 @@ namespace osu.Game.Overlays private Bindable preferUnicode; private WorkingBeatmap current; private BeatmapDatabase beatmaps; - private BaseGame game; + private Framework.Game game; private Container dragContainer; @@ -322,7 +322,7 @@ namespace osu.Game.Overlays updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); } - protected override void PerformLoad(BaseGame game) + protected override void PerformLoad(Framework.Game game) { this.game = game; base.PerformLoad(game); diff --git a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs index 6c7c29d966..c45dc9cbd4 100644 --- a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs +++ b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs @@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.General protected override string Header => "Updates"; [BackgroundDependencyLoader] - private void load(BasicStorage storage, OsuConfigManager config) + private void load(Storage storage, OsuConfigManager config) { Children = new Drawable[] { diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs index 0bce73b92f..5b79158946 100644 --- a/osu.Game/Screens/BackgroundScreen.cs +++ b/osu.Game/Screens/BackgroundScreen.cs @@ -29,10 +29,10 @@ namespace osu.Game.Screens return false; } - BaseGame game; + Framework.Game game; [BackgroundDependencyLoader] - private void load(BaseGame game) + private void load(Framework.Game game) { this.game = game; } diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs index 6807085061..d4781146c3 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs @@ -10,7 +10,7 @@ namespace osu.Game.Screens.Backgrounds public class BackgroundScreenDefault : BackgroundScreen { [BackgroundDependencyLoader] - private void load(BaseGame game) + private void load(Framework.Game game) { Add(new Background(@"Backgrounds/bg1")); } diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs index f3041cb1e2..20fd4deed3 100644 --- a/osu.Game/Screens/Play/PlayerInputManager.cs +++ b/osu.Game/Screens/Play/PlayerInputManager.cs @@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play { class PlayerInputManager : UserInputManager { - public PlayerInputManager(BasicGameHost host) + public PlayerInputManager(GameHost host) : base(host) { } diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 2dcd957950..53a8aa4c14 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select } [BackgroundDependencyLoader(permitNulls: true)] - private void load(BeatmapDatabase beatmaps, AudioManager audio, BaseGame game, + private void load(BeatmapDatabase beatmaps, AudioManager audio, Framework.Game game, OsuGame osuGame, OsuColour colours) { const float carousel_width = 640; @@ -328,7 +328,7 @@ namespace osu.Game.Screens.Select } } - private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game, bool select = false) + private void addBeatmapSet(BeatmapSetInfo beatmapSet, Framework.Game game, bool select = false) { beatmapSet = database.GetWithChildren(beatmapSet.ID); beatmapSet.Beatmaps.ForEach(b => @@ -368,7 +368,7 @@ namespace osu.Game.Screens.Select })); } - private void addBeatmapSets(BaseGame game, CancellationToken token) + private void addBeatmapSets(Framework.Game game, CancellationToken token) { foreach (var beatmapSet in database.Query()) {