h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 09:42:55 +08:00
Code Issues Releases Wiki Activity

Add OsuGameMode. Standardise naming of classes.

Browse Source
This commit is contained in:
Dean Herbert 2016-09-30 13:30:55 +09:00
parent a114463678
commit 357c94ed8a
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/GameModes/GameModeWhiteBox.cs
View File

@ -10,13 +10,13 @@ using osu.Framework.Graphics.Drawables;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.MathUtils; using osu.Game.Graphics.Containers;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.GameModes namespace osu.Game.GameModes
{ {
public class GameModeWhiteBox : GameMode public class GameModeWhiteBox : OsuGameMode
{ {
private Button popButton; private Button popButton;

6
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -19,7 +19,7 @@ using OpenTK.Input;
namespace osu.Game.GameModes.Menu namespace osu.Game.GameModes.Menu
{ {
public class ButtonSystem : OsuLargeComponent public class ButtonSystem : OsuLargeContainer
{ {
public Action OnEdit; public Action OnEdit;
public Action OnExit; public Action OnExit;
@ -247,7 +247,7 @@ namespace osu.Game.GameModes.Menu
/// <summary> /// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.) /// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary> /// </summary>
class OsuLogo : OsuComponent class OsuLogo : OsuContainer
{ {
private Sprite logo; private Sprite logo;
private Container logoBounceContainer; private Container logoBounceContainer;
@ -367,7 +367,7 @@ namespace osu.Game.GameModes.Menu
/// Button designed specifically for the osu!next main menu. /// Button designed specifically for the osu!next main menu.
/// In order to correctly flow, we have to use a negative margin on the parent container (due to the parallelogram shape). /// In order to correctly flow, we have to use a negative margin on the parent container (due to the parallelogram shape).
/// </summary> /// </summary>
private class Button : OsuComponent private class Button : OsuContainer
{ {
private Container iconText; private Container iconText;
private WedgedBox box; private WedgedBox box;

3
osu.Game/GameModes/Menu/MainMenu.cs
View File

@ -11,10 +11,11 @@ using osu.Game.GameModes.Direct;
using osu.Game.GameModes.Edit; using osu.Game.GameModes.Edit;
using osu.Game.GameModes.Multiplayer; using osu.Game.GameModes.Multiplayer;
using osu.Game.GameModes.Play; using osu.Game.GameModes.Play;
using osu.Game.Graphics.Containers;
namespace osu.Game.GameModes.Menu namespace osu.Game.GameModes.Menu
{ {
internal class MainMenu : GameMode internal class MainMenu : OsuGameMode
{ {
public override string Name => @"Main Menu"; public override string Name => @"Main Menu";

2
osu.Game/Graphics/Containers/OsuComponent.cs → osu.Game/Graphics/Containers/OsuContainer.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers;
namespace osu.Game.Graphics.Containers namespace osu.Game.Graphics.Containers
{ {
class OsuComponent : AutoSizeContainer class OsuContainer : AutoSizeContainer
{ {
public new OsuGameBase Game => base.Game as OsuGameBase; public new OsuGameBase Game => base.Game as OsuGameBase;
} }

7
osu.Game/Graphics/Containers/OsuGameMode.cs
View File

@ -1,16 +1,11 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //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.GameModes;
namespace osu.Game.Graphics.Containers namespace osu.Game.Graphics.Containers
{ {
class OsuGameMode : GameMode public class OsuGameMode : GameMode
{ {
public new OsuGame Game => base.Game as OsuGame; public new OsuGame Game => base.Game as OsuGame;
} }

2
osu.Game/Graphics/Containers/OsuLargeComponent.cs → osu.Game/Graphics/Containers/OsuLargeContainer.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers;
namespace osu.Game.Graphics.Containers namespace osu.Game.Graphics.Containers
{ {
public class OsuLargeComponent : LargeContainer public class OsuLargeContainer : LargeContainer
{ {
public new OsuGameBase Game => base.Game as OsuGameBase; public new OsuGameBase Game => base.Game as OsuGameBase;
} }

4
osu.Game/osu.Game.csproj
View File

@ -62,9 +62,9 @@
<Compile Include="GameModes\Direct\OnlineListing.cs" /> <Compile Include="GameModes\Direct\OnlineListing.cs" />
<Compile Include="GameModes\Play\SongSelectPlay.cs" /> <Compile Include="GameModes\Play\SongSelectPlay.cs" />
<Compile Include="GameModes\Edit\SongSelectEdit.cs" /> <Compile Include="GameModes\Edit\SongSelectEdit.cs" />
<Compile Include="Graphics\Containers\OsuComponent.cs" /> <Compile Include="Graphics\Containers\OsuContainer.cs" />
<Compile Include="Graphics\Containers\OsuGameMode.cs" /> <Compile Include="Graphics\Containers\OsuGameMode.cs" />
<Compile Include="Graphics\Containers\OsuLargeComponent.cs" /> <Compile Include="Graphics\Containers\OsuLargeContainer.cs" />
<Compile Include="Graphics\Cursor\OsuCursorContainer.cs" /> <Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
<Compile Include="Graphics\Processing\RatioAdjust.cs" /> <Compile Include="Graphics\Processing\RatioAdjust.cs" />
<Compile Include="Graphics\TextAwesome.cs" /> <Compile Include="Graphics\TextAwesome.cs" />