diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index d5b9a9fd03..db0de0a3f9 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -9,10 +9,10 @@ using osu.Framework.Timing; using osu.Game.Beatmaps; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Osu; -using osu.Game.GameModes.Play.Catch; -using osu.Game.GameModes.Play.Mania; -using osu.Game.GameModes.Play.Osu; -using osu.Game.GameModes.Play.Taiko; +using osu.Game.Screens.Play.Catch; +using osu.Game.Screens.Play.Mania; +using osu.Game.Screens.Play.Osu; +using osu.Game.Screens.Play.Taiko; using OpenTK; namespace osu.Desktop.VisualTests.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs index eaa0a3eea4..c7889134bb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs @@ -2,7 +2,7 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; -using osu.Game.GameModes.Menu; +using osu.Game.Screens.Menu; namespace osu.Desktop.VisualTests.Tests { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs index c3d6263d86..0ef743792d 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs @@ -5,10 +5,10 @@ using osu.Framework.GameModes.Testing; using System.Collections.Generic; using osu.Desktop.Platform; using osu.Game.Database; -using osu.Game.GameModes.Play; using SQLiteNetExtensions.Extensions; using osu.Framework; using osu.Game; +using osu.Game.Screens.Play; namespace osu.Desktop.Tests { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index 03e382b71e..e69b669335 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -9,10 +9,10 @@ using osu.Game.Beatmaps; using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Osu; -using osu.Game.GameModes.Play; using OpenTK; using osu.Framework; using osu.Framework.Allocation; +using osu.Game.Screens.Play; namespace osu.Desktop.VisualTests.Tests { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs index eb5f51d883..87a5e1ec45 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs @@ -6,12 +6,12 @@ using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.MathUtils; -using osu.Game.GameModes.Play; -using osu.Game.GameModes.Play.Catch; -using osu.Game.GameModes.Play.Mania; -using osu.Game.GameModes.Play.Osu; -using osu.Game.GameModes.Play.Taiko; using osu.Game.Graphics.UserInterface; +using osu.Game.Screens.Play; +using osu.Game.Screens.Play.Catch; +using osu.Game.Screens.Play.Mania; +using osu.Game.Screens.Play.Osu; +using osu.Game.Screens.Play.Taiko; using OpenTK; using OpenTK.Graphics; diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs index 881a8e9bde..4d5d349fca 100644 --- a/osu.Desktop.VisualTests/VisualTestGame.cs +++ b/osu.Desktop.VisualTests/VisualTestGame.cs @@ -10,7 +10,6 @@ using osu.Framework.Desktop.Platform; using System.Reflection; using System.IO; using System.Collections.Generic; -using osu.Game.GameModes.Play; using SQLiteNetExtensions.Extensions; using osu.Desktop.Platform; using osu.Framework.Allocation; diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index 2d854ab3b7..f5aee52853 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs @@ -7,7 +7,7 @@ using osu.Game.Beatmaps; using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Objects.Osu; using osu.Game.Beatmaps.Samples; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Play; using osu.Game.Tests.Resources; namespace osu.Game.Tests.Beatmaps.Formats diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 8f604696b5..28dd5661b1 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -8,7 +8,7 @@ using osu.Framework.Desktop.Platform; using osu.Framework.Platform; using osu.Game.Database; using osu.Game.IPC; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Play; namespace osu.Game.Tests.Beatmaps.IO { diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index ea26cce467..8a0364a03b 100644 --- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs @@ -2,7 +2,6 @@ using System.IO; using NUnit.Framework; using osu.Game.Beatmaps.IO; -using osu.Game.GameModes.Play; using osu.Game.Tests.Resources; namespace osu.Game.Tests.Beatmaps.IO diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index e988498093..165f1808ee 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -8,7 +8,7 @@ using osu.Game.Beatmaps.Events; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Samples; using osu.Game.Beatmaps.Timing; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Play; namespace osu.Game.Beatmaps.Formats { diff --git a/osu.Game/Beatmaps/Objects/HitObject.cs b/osu.Game/Beatmaps/Objects/HitObject.cs index ef6659224f..597d6b4c6a 100644 --- a/osu.Game/Beatmaps/Objects/HitObject.cs +++ b/osu.Game/Beatmaps/Objects/HitObject.cs @@ -3,7 +3,7 @@ using osu.Game.Beatmaps.Objects.Osu; using osu.Game.Beatmaps.Samples; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Play; using OpenTK.Graphics; namespace osu.Game.Beatmaps.Objects diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index 109d3eb527..bf56e10429 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -3,8 +3,8 @@ using osu.Framework.Configuration; using osu.Framework.Platform; -using osu.Game.GameModes.Play; using osu.Game.Online.API; +using osu.Game.Screens.Play; namespace osu.Game.Configuration { diff --git a/osu.Game/Database/BeatmapInfo.cs b/osu.Game/Database/BeatmapInfo.cs index 14bfcb337e..de3ba15508 100644 --- a/osu.Game/Database/BeatmapInfo.cs +++ b/osu.Game/Database/BeatmapInfo.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using osu.Game.Beatmaps.Samples; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Play; using SQLite.Net.Attributes; using SQLiteNetExtensions.Attributes; diff --git a/osu.Game/Database/BeatmapMetadata.cs b/osu.Game/Database/BeatmapMetadata.cs index 0b4d692abc..45b7b8de0f 100644 --- a/osu.Game/Database/BeatmapMetadata.cs +++ b/osu.Game/Database/BeatmapMetadata.cs @@ -1,7 +1,6 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Game.GameModes.Play; using SQLite.Net.Attributes; namespace osu.Game.Database diff --git a/osu.Game/GameModes/Menu/MenuVisualisation.cs b/osu.Game/GameModes/Menu/MenuVisualisation.cs deleted file mode 100644 index 84f150c413..0000000000 --- a/osu.Game/GameModes/Menu/MenuVisualisation.cs +++ /dev/null @@ -1,13 +0,0 @@ -using osu.Framework.Graphics; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace osu.Game.GameModes.Menu -{ - internal class MenuVisualisation : Drawable - { - } -} diff --git a/osu.Game/Online/Chat/Display/ChannelDisplay.cs b/osu.Game/Online/Chat/Display/ChannelDisplay.cs index b3a08a1196..93e235f3f3 100644 --- a/osu.Game/Online/Chat/Display/ChannelDisplay.cs +++ b/osu.Game/Online/Chat/Display/ChannelDisplay.cs @@ -8,7 +8,6 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; -using osu.Game.Online.Chat.Display.osu.Online.Social; using OpenTK; using osu.Framework; using osu.Framework.Allocation; diff --git a/osu.Game/Online/Chat/Display/ChatLine.cs b/osu.Game/Online/Chat/Display/ChatLine.cs index 662a72f533..f214c24443 100644 --- a/osu.Game/Online/Chat/Display/ChatLine.cs +++ b/osu.Game/Online/Chat/Display/ChatLine.cs @@ -1,74 +1,67 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using OpenTK; using OpenTK.Graphics; -using osu.Framework; -using osu.Framework.Graphics.Primitives; -using osu.Framework.Allocation; namespace osu.Game.Online.Chat.Display { - namespace osu.Online.Social + public class ChatLine : Container { - public class ChatLine : Container + public readonly Message Message; + + const float padding = 200; + const float text_size = 20; + + public ChatLine(Message message) { - public readonly Message Message; + this.Message = message; - const float padding = 200; - const float text_size = 20; + RelativeSizeAxes = Axes.X; + AutoSizeAxes = Axes.Y; - public ChatLine(Message message) + Children = new Drawable[] { - this.Message = message; - - RelativeSizeAxes = Axes.X; - AutoSizeAxes = Axes.Y; - - Children = new Drawable[] + new Container { - new Container + Size = new Vector2(padding, text_size), + Children = new Drawable[] { - Size = new Vector2(padding, text_size), - Children = new Drawable[] + new SpriteText { - new SpriteText - { - Text = Message.Timestamp.LocalDateTime.ToLongTimeString(), - TextSize = text_size, - Colour = new Color4(128, 128, 128, 255) - }, - new SpriteText - { - Text = Message.User.Name, - TextSize = text_size, - Origin = Anchor.TopRight, - Anchor = Anchor.TopRight, - } - } - }, - new Container - { - RelativeSizeAxes = Axes.X, - AutoSizeAxes = Axes.Y, - Padding = new MarginPadding { Left = padding + 10 }, - Children = new Drawable[] + Text = Message.Timestamp.LocalDateTime.ToLongTimeString(), + TextSize = text_size, + Colour = new Color4(128, 128, 128, 255) + }, + new SpriteText { - new SpriteText - { - Text = Message.Content, - TextSize = text_size, - RelativeSizeAxes = Axes.X, - } + Text = Message.User.Name, + TextSize = text_size, + Origin = Anchor.TopRight, + Anchor = Anchor.TopRight, } } - }; - } + }, + new Container + { + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, + Padding = new MarginPadding { Left = padding + 10 }, + Children = new Drawable[] + { + new SpriteText + { + Text = Message.Content, + TextSize = text_size, + RelativeSizeAxes = Axes.X, + } + } + } + }; } } } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index c80562fc11..e78c58a656 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -6,22 +6,22 @@ using System.Threading; using osu.Framework.Configuration; using osu.Framework.GameModes; using osu.Game.Configuration; -using osu.Game.GameModes.Menu; using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Platform; -using osu.Game.GameModes.Play; using osu.Game.Overlays; using osu.Framework; using osu.Framework.Input; using osu.Game.Input; using OpenTK.Input; using osu.Framework.Logging; -using osu.Game.GameModes; using osu.Game.Graphics.UserInterface.Volume; using osu.Game.Database; using osu.Framework.Allocation; +using osu.Game.Screens; +using osu.Game.Screens.Menu; +using osu.Game.Screens.Play; namespace osu.Game { diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs index 4f2513b130..77b35740ce 100644 --- a/osu.Game/Overlays/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar.cs @@ -9,10 +9,10 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Transformations; using osu.Game.Configuration; -using osu.Game.GameModes.Play; using osu.Game.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Allocation; +using osu.Game.Screens.Play; namespace osu.Game.Overlays { diff --git a/osu.Game/Overlays/ToolbarModeButton.cs b/osu.Game/Overlays/ToolbarModeButton.cs index bd88eae7c9..e2982597f5 100644 --- a/osu.Game/Overlays/ToolbarModeButton.cs +++ b/osu.Game/Overlays/ToolbarModeButton.cs @@ -2,11 +2,11 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Extensions; -using osu.Game.GameModes.Play; using osu.Game.Graphics; using OpenTK.Graphics; using osu.Framework; using osu.Framework.Allocation; +using osu.Game.Screens.Play; namespace osu.Game.Overlays { diff --git a/osu.Game/Overlays/ToolbarModeSelector.cs b/osu.Game/Overlays/ToolbarModeSelector.cs index 3b17a28f81..a0b8216f98 100644 --- a/osu.Game/Overlays/ToolbarModeSelector.cs +++ b/osu.Game/Overlays/ToolbarModeSelector.cs @@ -6,13 +6,13 @@ using System.Linq; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Transformations; -using osu.Game.GameModes.Play; using OpenTK; using OpenTK.Graphics; using osu.Framework; using osu.Framework.Caching; using osu.Framework.Graphics.Sprites; using osu.Framework.Allocation; +using osu.Game.Screens.Play; namespace osu.Game.Overlays { diff --git a/osu.Game/GameModes/BackgroundMode.cs b/osu.Game/Screens/BackgroundMode.cs similarity index 92% rename from osu.Game/GameModes/BackgroundMode.cs rename to osu.Game/Screens/BackgroundMode.cs index dd485df9d9..cf28abc1ac 100644 --- a/osu.Game/GameModes/BackgroundMode.cs +++ b/osu.Game/Screens/BackgroundMode.cs @@ -2,20 +2,16 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework.GameModes; -using osu.Framework.Graphics.Transformations; -using OpenTK; -using osu.Framework.Graphics; -using osu.Framework.Input; -using osu.Framework; using System.Threading; +using osu.Framework; using osu.Framework.Allocation; +using osu.Framework.GameModes; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Transformations; +using osu.Framework.Input; +using OpenTK; -namespace osu.Game.GameModes +namespace osu.Game.Screens { public abstract class BackgroundMode : GameMode, IEquatable { diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs similarity index 91% rename from osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs rename to osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs index 0afb9c3945..9a2901ed63 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs @@ -3,7 +3,7 @@ using osu.Game.Graphics.Background; -namespace osu.Game.GameModes.Backgrounds +namespace osu.Game.Screens.Backgrounds { public class BackgroundModeCustom : BackgroundMode { diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs similarity index 88% rename from osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs rename to osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs index c7fe2139dc..aec43212f5 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs @@ -5,7 +5,7 @@ using osu.Framework; using osu.Framework.Allocation; using osu.Game.Graphics.Background; -namespace osu.Game.GameModes.Backgrounds +namespace osu.Game.Screens.Backgrounds { public class BackgroundModeDefault : BackgroundMode { diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs b/osu.Game/Screens/Backgrounds/BackgroundModeEmpty.cs similarity index 81% rename from osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs rename to osu.Game/Screens/Backgrounds/BackgroundModeEmpty.cs index 6f38c03010..fafb5324b7 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeEmpty.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.GameModes.Backgrounds +namespace osu.Game.Screens.Backgrounds { public class BackgroundModeEmpty : BackgroundMode { diff --git a/osu.Game/GameModes/Charts/ChartInfo.cs b/osu.Game/Screens/Charts/ChartInfo.cs similarity index 55% rename from osu.Game/GameModes/Charts/ChartInfo.cs rename to osu.Game/Screens/Charts/ChartInfo.cs index 67a11e632a..ef928ecf4c 100644 --- a/osu.Game/GameModes/Charts/ChartInfo.cs +++ b/osu.Game/Screens/Charts/ChartInfo.cs @@ -1,13 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace osu.Game.GameModes.Charts +namespace osu.Game.Screens.Charts { class ChartInfo : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Charts/ChartListing.cs b/osu.Game/Screens/Charts/ChartListing.cs similarity index 88% rename from osu.Game/GameModes/Charts/ChartListing.cs rename to osu.Game/Screens/Charts/ChartListing.cs index 7be9d09bcf..b3512907c1 100644 --- a/osu.Game/GameModes/Charts/ChartListing.cs +++ b/osu.Game/Screens/Charts/ChartListing.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace osu.Game.GameModes.Charts +namespace osu.Game.Screens.Charts { class ChartListing : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Direct/OnlineListing.cs b/osu.Game/Screens/Direct/OnlineListing.cs similarity index 82% rename from osu.Game/GameModes/Direct/OnlineListing.cs rename to osu.Game/Screens/Direct/OnlineListing.cs index c30017cb77..d4b6db51a4 100644 --- a/osu.Game/GameModes/Direct/OnlineListing.cs +++ b/osu.Game/Screens/Direct/OnlineListing.cs @@ -1,7 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.GameModes.Direct +namespace osu.Game.Screens.Direct { class OnlineListing : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Edit/EditSongSelect.cs b/osu.Game/Screens/Edit/EditSongSelect.cs similarity index 84% rename from osu.Game/GameModes/Edit/EditSongSelect.cs rename to osu.Game/Screens/Edit/EditSongSelect.cs index c4686b03ac..323a92f3b5 100644 --- a/osu.Game/GameModes/Edit/EditSongSelect.cs +++ b/osu.Game/Screens/Edit/EditSongSelect.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; -namespace osu.Game.GameModes.Edit +namespace osu.Game.Screens.Edit { class EditSongSelect : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs similarity index 77% rename from osu.Game/GameModes/Edit/Editor.cs rename to osu.Game/Screens/Edit/Editor.cs index 495e2eef8e..058f1623fa 100644 --- a/osu.Game/GameModes/Edit/Editor.cs +++ b/osu.Game/Screens/Edit/Editor.cs @@ -1,16 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.GameModes; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; -namespace osu.Game.GameModes.Edit +namespace osu.Game.Screens.Edit { class Editor : GameModeWhiteBox { diff --git a/osu.Game/GameModes/GameModeWhiteBox.cs b/osu.Game/Screens/GameModeWhiteBox.cs similarity index 95% rename from osu.Game/GameModes/GameModeWhiteBox.cs rename to osu.Game/Screens/GameModeWhiteBox.cs index 60630c5a9b..ac6cc5ece3 100644 --- a/osu.Game/GameModes/GameModeWhiteBox.cs +++ b/osu.Game/Screens/GameModeWhiteBox.cs @@ -9,13 +9,11 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.UserInterface; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; using OpenTK; using OpenTK.Graphics; -using osu.Framework; -using osu.Framework.Allocation; -namespace osu.Game.GameModes +namespace osu.Game.Screens { public class GameModeWhiteBox : OsuGameMode { diff --git a/osu.Game/GameModes/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs similarity index 95% rename from osu.Game/GameModes/Menu/Button.cs rename to osu.Game/Screens/Menu/Button.cs index 8509766132..fa5dbb3b99 100644 --- a/osu.Game/GameModes/Menu/Button.cs +++ b/osu.Game/Screens/Menu/Button.cs @@ -1,18 +1,16 @@ -using OpenTK; -using OpenTK.Graphics; -using OpenTK.Input; +using System; using osu.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Framework.Input; using osu.Game.Graphics; -using System; -using osu.Framework.Allocation; +using OpenTK; +using OpenTK.Graphics; +using OpenTK.Input; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { /// /// Button designed specifically for the osu!next main menu. diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs similarity index 96% rename from osu.Game/GameModes/Menu/ButtonSystem.cs rename to osu.Game/Screens/Menu/ButtonSystem.cs index dec776da13..2d8ed9c374 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/Screens/Menu/ButtonSystem.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; +using osu.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; @@ -13,10 +14,8 @@ using osu.Game.Graphics; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; -using osu.Framework; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { public partial class ButtonSystem : Container, IStateful { diff --git a/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs b/osu.Game/Screens/Menu/FlowContainerWithOrigin.cs similarity index 87% rename from osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs rename to osu.Game/Screens/Menu/FlowContainerWithOrigin.cs index d59c291d14..fc72365812 100644 --- a/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs +++ b/osu.Game/Screens/Menu/FlowContainerWithOrigin.cs @@ -1,8 +1,8 @@ -using OpenTK; -using osu.Framework.Graphics; +using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; +using OpenTK; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { /// /// A flow container with an origin based on one of its contained drawables. diff --git a/osu.Game/GameModes/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs similarity index 92% rename from osu.Game/GameModes/Menu/Intro.cs rename to osu.Game/Screens/Menu/Intro.cs index 92d64f838b..4875c8b7eb 100644 --- a/osu.Game/GameModes/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -1,19 +1,17 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Threading; +using osu.Framework.Allocation; +using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Audio.Track; using osu.Framework.GameModes; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; -using osu.Framework; -using osu.Framework.Allocation; -using osu.Framework.Audio; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { class Intro : OsuGameMode { diff --git a/osu.Game/GameModes/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs similarity index 85% rename from osu.Game/GameModes/Menu/MainMenu.cs rename to osu.Game/Screens/Menu/MainMenu.cs index ed29d5e3db..11aaf3cc19 100644 --- a/osu.Game/GameModes/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -1,26 +1,21 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Linq; +using osu.Framework.Allocation; using osu.Framework.GameModes; using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; -using osu.Game.GameModes.Backgrounds; -using osu.Game.GameModes.Charts; -using osu.Game.GameModes.Direct; -using osu.Game.GameModes.Edit; -using osu.Game.GameModes.Multiplayer; -using osu.Game.GameModes.Play; using osu.Game.Graphics.Containers; +using osu.Game.Screens.Backgrounds; +using osu.Game.Screens.Charts; +using osu.Game.Screens.Direct; +using osu.Game.Screens.Edit; +using osu.Game.Screens.Multiplayer; +using osu.Game.Screens.Play; using OpenTK; -using osu.Framework; -using osu.Game.Overlays; -using System.Threading.Tasks; -using osu.Game.Configuration; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { public class MainMenu : OsuGameMode { diff --git a/osu.Game/Screens/Menu/MenuVisualisation.cs b/osu.Game/Screens/Menu/MenuVisualisation.cs new file mode 100644 index 0000000000..194b0eee02 --- /dev/null +++ b/osu.Game/Screens/Menu/MenuVisualisation.cs @@ -0,0 +1,8 @@ +using osu.Framework.Graphics; + +namespace osu.Game.Screens.Menu +{ + internal class MenuVisualisation : Drawable + { + } +} diff --git a/osu.Game/GameModes/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs similarity index 95% rename from osu.Game/GameModes/Menu/OsuLogo.cs rename to osu.Game/Screens/Menu/OsuLogo.cs index 0663b79161..6047339b25 100644 --- a/osu.Game/GameModes/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -2,17 +2,16 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using osu.Framework.Input; -using osu.Framework; using OpenTK; -using osu.Framework.Allocation; -using osu.Framework.Graphics.Textures; -namespace osu.Game.GameModes.Menu +namespace osu.Game.Screens.Menu { /// /// osu! logo and its attachments (pulsing, visualiser etc.) diff --git a/osu.Game/GameModes/Multiplayer/Lobby.cs b/osu.Game/Screens/Multiplayer/Lobby.cs similarity index 75% rename from osu.Game/GameModes/Multiplayer/Lobby.cs rename to osu.Game/Screens/Multiplayer/Lobby.cs index 6700736234..565e671150 100644 --- a/osu.Game/GameModes/Multiplayer/Lobby.cs +++ b/osu.Game/Screens/Multiplayer/Lobby.cs @@ -3,11 +3,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace osu.Game.GameModes.Multiplayer +namespace osu.Game.Screens.Multiplayer { class Lobby : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Multiplayer/Match.cs b/osu.Game/Screens/Multiplayer/Match.cs similarity index 81% rename from osu.Game/GameModes/Multiplayer/Match.cs rename to osu.Game/Screens/Multiplayer/Match.cs index d5dfdffdb3..11d9ef4b8e 100644 --- a/osu.Game/GameModes/Multiplayer/Match.cs +++ b/osu.Game/Screens/Multiplayer/Match.cs @@ -3,15 +3,12 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.GameModes; -using osu.Game.GameModes.Backgrounds; -using osu.Game.GameModes.Play; +using osu.Game.Screens.Backgrounds; +using osu.Game.Screens.Play; using OpenTK.Graphics; -namespace osu.Game.GameModes.Multiplayer +namespace osu.Game.Screens.Multiplayer { class Match : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Multiplayer/MatchCreate.cs b/osu.Game/Screens/Multiplayer/MatchCreate.cs similarity index 74% rename from osu.Game/GameModes/Multiplayer/MatchCreate.cs rename to osu.Game/Screens/Multiplayer/MatchCreate.cs index 8d134d170e..c6c070661c 100644 --- a/osu.Game/GameModes/Multiplayer/MatchCreate.cs +++ b/osu.Game/Screens/Multiplayer/MatchCreate.cs @@ -3,11 +3,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace osu.Game.GameModes.Multiplayer +namespace osu.Game.Screens.Multiplayer { class MatchCreate : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs b/osu.Game/Screens/Multiplayer/MatchSongSelect.cs similarity index 54% rename from osu.Game/GameModes/Multiplayer/MatchSongSelect.cs rename to osu.Game/Screens/Multiplayer/MatchSongSelect.cs index da86641c04..442dea9f30 100644 --- a/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs +++ b/osu.Game/Screens/Multiplayer/MatchSongSelect.cs @@ -1,16 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework.GameModes; -using osu.Game.GameModes.Backgrounds; -using OpenTK.Graphics; +using osu.Game.Screens.Backgrounds; -namespace osu.Game.GameModes.Multiplayer +namespace osu.Game.Screens.Multiplayer { class MatchSongSelect : GameModeWhiteBox { diff --git a/osu.Game/GameModes/OsuGameMode.cs b/osu.Game/Screens/OsuGameMode.cs similarity index 90% rename from osu.Game/GameModes/OsuGameMode.cs rename to osu.Game/Screens/OsuGameMode.cs index 0c44a6488a..b919e257d4 100644 --- a/osu.Game/GameModes/OsuGameMode.cs +++ b/osu.Game/Screens/OsuGameMode.cs @@ -2,21 +2,13 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework; using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.GameModes; -using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; -using osu.Game.Graphics.Background; using osu.Game.Graphics.Containers; -namespace osu.Game.GameModes +namespace osu.Game.Screens { public abstract class OsuGameMode : GameMode { diff --git a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs b/osu.Game/Screens/Play/Catch/CatchComboCounter.cs similarity index 87% rename from osu.Game/GameModes/Play/Catch/CatchComboCounter.cs rename to osu.Game/Screens/Play/Catch/CatchComboCounter.cs index cf6f153ea1..19c9a4ddf2 100644 --- a/osu.Game/GameModes/Play/Catch/CatchComboCounter.cs +++ b/osu.Game/Screens/Play/Catch/CatchComboCounter.cs @@ -1,15 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Screens.Play.Osu; using OpenTK.Graphics; -using osu.Game.GameModes.Play.Osu; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace osu.Game.GameModes.Play.Catch +namespace osu.Game.Screens.Play.Catch { /// /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch. diff --git a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs b/osu.Game/Screens/Play/Catch/CatchHitRenderer.cs similarity index 81% rename from osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs rename to osu.Game/Screens/Play/Catch/CatchHitRenderer.cs index 729839de7c..114dd0c930 100644 --- a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs +++ b/osu.Game/Screens/Play/Catch/CatchHitRenderer.cs @@ -1,12 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Catch; -using osu.Game.Beatmaps.Objects.Catch.Drawable; -namespace osu.Game.GameModes.Play.Catch +namespace osu.Game.Screens.Play.Catch { public class CatchHitRenderer : HitRenderer { diff --git a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs b/osu.Game/Screens/Play/Catch/CatchPlayfield.cs similarity index 76% rename from osu.Game/GameModes/Play/Catch/CatchPlayfield.cs rename to osu.Game/Screens/Play/Catch/CatchPlayfield.cs index 7db68771c0..92ab69a627 100644 --- a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs +++ b/osu.Game/Screens/Play/Catch/CatchPlayfield.cs @@ -2,14 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using OpenTK; -using OpenTK.Graphics; -using osu.Framework; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Play.Catch +namespace osu.Game.Screens.Play.Catch { public class CatchPlayfield : Playfield { diff --git a/osu.Game/GameModes/Play/Catch/CatchRuleset.cs b/osu.Game/Screens/Play/Catch/CatchRuleset.cs similarity index 73% rename from osu.Game/GameModes/Play/Catch/CatchRuleset.cs rename to osu.Game/Screens/Play/Catch/CatchRuleset.cs index 5aa77f1f2e..ab887a23f8 100644 --- a/osu.Game/GameModes/Play/Catch/CatchRuleset.cs +++ b/osu.Game/Screens/Play/Catch/CatchRuleset.cs @@ -1,15 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Beatmaps.Objects; -using osu.Game.GameModes.Play.Osu; +using osu.Game.Screens.Play.Osu; -namespace osu.Game.GameModes.Play.Catch +namespace osu.Game.Screens.Play.Catch { class CatchRuleset : Ruleset { diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/Screens/Play/ComboCounter.cs similarity index 93% rename from osu.Game/GameModes/Play/ComboCounter.cs rename to osu.Game/Screens/Play/ComboCounter.cs index 96660afb6a..f634e215b5 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/Screens/Play/ComboCounter.cs @@ -1,22 +1,13 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; -using osu.Framework.Timing; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public abstract class ComboCounter : Container { diff --git a/osu.Game/GameModes/Play/ComboResultCounter.cs b/osu.Game/Screens/Play/ComboResultCounter.cs similarity index 88% rename from osu.Game/GameModes/Play/ComboResultCounter.cs rename to osu.Game/Screens/Play/ComboResultCounter.cs index 9607c6df14..0c6eb8f2fe 100644 --- a/osu.Game/GameModes/Play/ComboResultCounter.cs +++ b/osu.Game/Screens/Play/ComboResultCounter.cs @@ -1,18 +1,13 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; -using osu.Framework.Timing; using osu.Game.Graphics.UserInterface; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { /// /// Used to display combo with a roll-up animation in results screen. diff --git a/osu.Game/GameModes/Play/HitRenderer.cs b/osu.Game/Screens/Play/HitRenderer.cs similarity index 93% rename from osu.Game/GameModes/Play/HitRenderer.cs rename to osu.Game/Screens/Play/HitRenderer.cs index 0766e0f6b4..8dd1ab97aa 100644 --- a/osu.Game/GameModes/Play/HitRenderer.cs +++ b/osu.Game/Screens/Play/HitRenderer.cs @@ -1,16 +1,15 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; using System.Collections.Generic; +using System.Linq; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps.Objects; -using osu.Framework; -using System; -using System.Linq; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public abstract class HitRenderer : Container { diff --git a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs b/osu.Game/Screens/Play/Mania/ManiaComboCounter.cs similarity index 89% rename from osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs rename to osu.Game/Screens/Play/Mania/ManiaComboCounter.cs index 0a087225fc..9be76a112f 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs +++ b/osu.Game/Screens/Play/Mania/ManiaComboCounter.cs @@ -1,18 +1,12 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK.Graphics; -using osu.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; -using osu.Game.GameModes.Play.Taiko; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using osu.Game.Screens.Play.Taiko; +using OpenTK.Graphics; -namespace osu.Game.GameModes.Play.Mania +namespace osu.Game.Screens.Play.Mania { /// /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania. diff --git a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs b/osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs similarity index 85% rename from osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs rename to osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs index 417ed1b698..73c106949b 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs +++ b/osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs @@ -1,13 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using osu.Framework.Graphics; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Mania; -using osu.Game.Beatmaps.Objects.Mania.Drawable; -namespace osu.Game.GameModes.Play.Mania +namespace osu.Game.Screens.Play.Mania { public class ManiaHitRenderer : HitRenderer { diff --git a/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs b/osu.Game/Screens/Play/Mania/ManiaPlayfield.cs similarity index 93% rename from osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs rename to osu.Game/Screens/Play/Mania/ManiaPlayfield.cs index c5b13fdaeb..b5f91de664 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs +++ b/osu.Game/Screens/Play/Mania/ManiaPlayfield.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites; using OpenTK; using OpenTK.Graphics; -namespace osu.Game.GameModes.Play.Mania +namespace osu.Game.Screens.Play.Mania { public class ManiaPlayfield : Playfield { diff --git a/osu.Game/GameModes/Play/Mania/ManiaRuleset.cs b/osu.Game/Screens/Play/Mania/ManiaRuleset.cs similarity index 73% rename from osu.Game/GameModes/Play/Mania/ManiaRuleset.cs rename to osu.Game/Screens/Play/Mania/ManiaRuleset.cs index 3b37082c39..193a1b35ac 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaRuleset.cs +++ b/osu.Game/Screens/Play/Mania/ManiaRuleset.cs @@ -1,15 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Beatmaps.Objects; -using osu.Game.GameModes.Play.Osu; +using osu.Game.Screens.Play.Osu; -namespace osu.Game.GameModes.Play.Mania +namespace osu.Game.Screens.Play.Mania { class ManiaRuleset : Ruleset { diff --git a/osu.Game/GameModes/Play/ModSelect.cs b/osu.Game/Screens/Play/ModSelect.cs similarity index 77% rename from osu.Game/GameModes/Play/ModSelect.cs rename to osu.Game/Screens/Play/ModSelect.cs index 33cb00ce35..cead514e11 100644 --- a/osu.Game/GameModes/Play/ModSelect.cs +++ b/osu.Game/Screens/Play/ModSelect.cs @@ -1,16 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OpenTK.Graphics; using osu.Framework.GameModes; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; +using OpenTK.Graphics; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { class ModSelect : GameModeWhiteBox { diff --git a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs b/osu.Game/Screens/Play/Osu/OsuComboCounter.cs similarity index 92% rename from osu.Game/GameModes/Play/Osu/OsuComboCounter.cs rename to osu.Game/Screens/Play/Osu/OsuComboCounter.cs index 5fdc4fcc5e..3a86f79ac1 100644 --- a/osu.Game/GameModes/Play/Osu/OsuComboCounter.cs +++ b/osu.Game/Screens/Play/Osu/OsuComboCounter.cs @@ -2,15 +2,8 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; -using osu.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework.Allocation; -namespace osu.Game.GameModes.Play.Osu +namespace osu.Game.Screens.Play.Osu { /// /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard. diff --git a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs b/osu.Game/Screens/Play/Osu/OsuHitRenderer.cs similarity index 88% rename from osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs rename to osu.Game/Screens/Play/Osu/OsuHitRenderer.cs index 9e12d69d2b..b982998c3e 100644 --- a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs +++ b/osu.Game/Screens/Play/Osu/OsuHitRenderer.cs @@ -1,12 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Osu; using osu.Game.Beatmaps.Objects.Osu.Drawable; -namespace osu.Game.GameModes.Play.Osu +namespace osu.Game.Screens.Play.Osu { public class OsuHitRenderer : HitRenderer { diff --git a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs b/osu.Game/Screens/Play/Osu/OsuPlayfield.cs similarity index 93% rename from osu.Game/GameModes/Play/Osu/OsuPlayfield.cs rename to osu.Game/Screens/Play/Osu/OsuPlayfield.cs index 09a7666246..291bfd16be 100644 --- a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs +++ b/osu.Game/Screens/Play/Osu/OsuPlayfield.cs @@ -3,12 +3,11 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using OpenTK; -using osu.Framework; using osu.Framework.Graphics.Sprites; +using OpenTK; using OpenTK.Graphics; -namespace osu.Game.GameModes.Play.Osu +namespace osu.Game.Screens.Play.Osu { public class OsuPlayfield : Playfield { diff --git a/osu.Game/GameModes/Play/Osu/OsuRuleset.cs b/osu.Game/Screens/Play/Osu/OsuRuleset.cs similarity index 77% rename from osu.Game/GameModes/Play/Osu/OsuRuleset.cs rename to osu.Game/Screens/Play/Osu/OsuRuleset.cs index 33eeb72e3f..afc461d876 100644 --- a/osu.Game/GameModes/Play/Osu/OsuRuleset.cs +++ b/osu.Game/Screens/Play/Osu/OsuRuleset.cs @@ -1,14 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Beatmaps.Objects; -namespace osu.Game.GameModes.Play.Osu +namespace osu.Game.Screens.Play.Osu { class OsuRuleset : Ruleset { diff --git a/osu.Game/GameModes/Play/Osu/ScoreOverlayOsu.cs b/osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs similarity index 86% rename from osu.Game/GameModes/Play/Osu/ScoreOverlayOsu.cs rename to osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs index 1622379fe8..dda22cbbb6 100644 --- a/osu.Game/GameModes/Play/Osu/ScoreOverlayOsu.cs +++ b/osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs @@ -1,18 +1,12 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.Graphics; using osu.Game.Graphics.UserInterface; using OpenTK; using OpenTK.Input; -using osu.Game.Beatmaps.Objects; -namespace osu.Game.GameModes.Play.Osu +namespace osu.Game.Screens.Play.Osu { class ScoreOverlayOsu : ScoreOverlay { diff --git a/osu.Game/GameModes/Play/PlayMode.cs b/osu.Game/Screens/Play/PlayMode.cs similarity index 88% rename from osu.Game/GameModes/Play/PlayMode.cs rename to osu.Game/Screens/Play/PlayMode.cs index 8234baa523..c1c3f25e72 100644 --- a/osu.Game/GameModes/Play/PlayMode.cs +++ b/osu.Game/Screens/Play/PlayMode.cs @@ -4,7 +4,7 @@ using System.ComponentModel; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public enum PlayMode { diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/Screens/Play/PlaySongSelect.cs similarity index 95% rename from osu.Game/GameModes/Play/PlaySongSelect.cs rename to osu.Game/Screens/Play/PlaySongSelect.cs index d083808e5d..352a307f63 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/Screens/Play/PlaySongSelect.cs @@ -2,29 +2,26 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Diagnostics; -using osu.Framework.Configuration; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Sprites; -using osu.Game.GameModes.Backgrounds; -using osu.Framework; -using osu.Game.Database; -using osu.Framework.Graphics.Primitives; using System.Linq; -using OpenTK; -using OpenTK.Graphics; -using osu.Framework.Graphics.UserInterface; using System.Threading.Tasks; -using osu.Framework.Audio.Track; -using osu.Game.Beatmaps.Drawable; -using osu.Framework.Extensions.IEnumerableExtensions; -using osu.Game.Beatmaps; -using osu.Framework.GameModes; using osu.Framework.Allocation; using osu.Framework.Audio; +using osu.Framework.Audio.Track; +using osu.Framework.Configuration; +using osu.Framework.GameModes; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Primitives; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.UserInterface; +using osu.Game.Beatmaps; +using osu.Game.Beatmaps.Drawable; +using osu.Game.Database; +using osu.Game.Screens.Backgrounds; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public class PlaySongSelect : OsuGameMode { diff --git a/osu.Game/GameModes/Play/Player.cs b/osu.Game/Screens/Play/Player.cs similarity index 90% rename from osu.Game/GameModes/Play/Player.cs rename to osu.Game/Screens/Play/Player.cs index a511921c4e..62a0e7dce5 100644 --- a/osu.Game/GameModes/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -1,28 +1,21 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics; -using osu.Game.Beatmaps.Objects; -using osu.Game.GameModes.Backgrounds; -using osu.Game.GameModes.Play.Catch; -using osu.Game.GameModes.Play.Mania; -using osu.Game.GameModes.Play.Osu; -using osu.Game.GameModes.Play.Taiko; -using osu.Framework; -using osu.Game.Database; -using osu.Framework.Timing; -using osu.Framework.Audio.Track; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Allocation; using osu.Framework.Audio; -using osu.Framework.Graphics.Cursor; +using osu.Framework.Audio.Track; +using osu.Framework.Extensions.IEnumerableExtensions; +using osu.Framework.Graphics; using osu.Framework.Input; using osu.Framework.Platform; +using osu.Framework.Timing; +using osu.Game.Beatmaps.Objects; +using osu.Game.Database; +using osu.Game.Screens.Backgrounds; using OpenTK.Input; using MouseState = osu.Framework.Input.MouseState; -using osu.Framework.Graphics.Primitives; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public class Player : OsuGameMode { diff --git a/osu.Game/GameModes/Play/Playfield.cs b/osu.Game/Screens/Play/Playfield.cs similarity index 78% rename from osu.Game/GameModes/Play/Playfield.cs rename to osu.Game/Screens/Play/Playfield.cs index d87bec8011..1acd52638b 100644 --- a/osu.Game/GameModes/Play/Playfield.cs +++ b/osu.Game/Screens/Play/Playfield.cs @@ -1,10 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework; using osu.Framework.Graphics.Containers; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public class Playfield : Container { diff --git a/osu.Game/GameModes/Play/Ruleset.cs b/osu.Game/Screens/Play/Ruleset.cs similarity index 74% rename from osu.Game/GameModes/Play/Ruleset.cs rename to osu.Game/Screens/Play/Ruleset.cs index a5cbc63269..5deb994309 100644 --- a/osu.Game/GameModes/Play/Ruleset.cs +++ b/osu.Game/Screens/Play/Ruleset.cs @@ -1,18 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Beatmaps.Objects; -using osu.Game.GameModes.Play.Catch; -using osu.Game.GameModes.Play.Mania; -using osu.Game.GameModes.Play.Osu; -using osu.Game.GameModes.Play.Taiko; +using osu.Game.Screens.Play.Catch; +using osu.Game.Screens.Play.Mania; +using osu.Game.Screens.Play.Osu; +using osu.Game.Screens.Play.Taiko; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public abstract class Ruleset { diff --git a/osu.Game/GameModes/Play/ScoreOverlay.cs b/osu.Game/Screens/Play/ScoreOverlay.cs similarity index 89% rename from osu.Game/GameModes/Play/ScoreOverlay.cs rename to osu.Game/Screens/Play/ScoreOverlay.cs index 3d60df1858..f242a97da2 100644 --- a/osu.Game/GameModes/Play/ScoreOverlay.cs +++ b/osu.Game/Screens/Play/ScoreOverlay.cs @@ -2,16 +2,12 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps.Objects; using osu.Game.Graphics.UserInterface; -namespace osu.Game.GameModes.Play +namespace osu.Game.Screens.Play { public abstract class ScoreOverlay : Container { diff --git a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs b/osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs similarity index 90% rename from osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs rename to osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs index 70afd31988..beb96f94f9 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs +++ b/osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs @@ -1,15 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Framework.Graphics.Transformations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using OpenTK; -namespace osu.Game.GameModes.Play.Taiko +namespace osu.Game.Screens.Play.Taiko { /// /// Allows tint and scaling animations. Used in osu!taiko. diff --git a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs b/osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs similarity index 81% rename from osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs rename to osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs index 837185d4d8..ec02c89d9a 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs +++ b/osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs @@ -1,12 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Taiko; -using osu.Game.Beatmaps.Objects.Taiko.Drawable; -namespace osu.Game.GameModes.Play.Taiko +namespace osu.Game.Screens.Play.Taiko { public class TaikoHitRenderer : HitRenderer { diff --git a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs b/osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs similarity index 88% rename from osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs rename to osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs index b563cc718a..c8dee06a45 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs +++ b/osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs @@ -1,16 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Framework.Allocation; using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using OpenTK; using OpenTK.Graphics; -using osu.Framework; -using osu.Framework.Allocation; -using osu.Framework.Graphics.Textures; -namespace osu.Game.GameModes.Play.Taiko +namespace osu.Game.Screens.Play.Taiko { public class TaikoPlayfield : Playfield { diff --git a/osu.Game/GameModes/Play/Taiko/TaikoRuleset.cs b/osu.Game/Screens/Play/Taiko/TaikoRuleset.cs similarity index 73% rename from osu.Game/GameModes/Play/Taiko/TaikoRuleset.cs rename to osu.Game/Screens/Play/Taiko/TaikoRuleset.cs index dacf17df21..0ae94a118a 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoRuleset.cs +++ b/osu.Game/Screens/Play/Taiko/TaikoRuleset.cs @@ -1,15 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Beatmaps.Objects; -using osu.Game.GameModes.Play.Osu; +using osu.Game.Screens.Play.Osu; -namespace osu.Game.GameModes.Play.Taiko +namespace osu.Game.Screens.Play.Taiko { class TaikoRuleset : Ruleset { diff --git a/osu.Game/GameModes/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs similarity index 88% rename from osu.Game/GameModes/Ranking/Results.cs rename to osu.Game/Screens/Ranking/Results.cs index 5c941e85a8..b1d55ab54a 100644 --- a/osu.Game/GameModes/Ranking/Results.cs +++ b/osu.Game/Screens/Ranking/Results.cs @@ -2,10 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes; -using osu.Game.GameModes.Backgrounds; +using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; -namespace osu.Game.GameModes.Ranking +namespace osu.Game.Screens.Ranking { class Results : GameModeWhiteBox { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 09e19ef4e5..4e056a03e7 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -102,56 +102,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + @@ -159,15 +159,15 @@ - + - - + +