h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-03 13:33:07 +08:00
Code Issues Releases Wiki Activity

Fix some namespaces.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-23 11:59:50 +09:00
parent b3b7fb90c5
commit 611619fd9c
12 changed files with 48 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Beatmaps/Drawable/BeatmapGroup.cs → osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
View File

@ -4,18 +4,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Game.Database;
using OpenTK;
using osu.Framework.Allocation;
namespace osu.Game.Beatmaps.Drawable
namespace osu.Game.Beatmaps.Drawables
{
class BeatmapGroup : IStateful<BeatmapGroupState>
{

4
osu.Game/Beatmaps/Drawable/BeatmapPanel.cs → osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -3,6 +3,7 @@
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites;
@ -11,9 +12,8 @@ using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics.Colour;
namespace osu.Game.Beatmaps.Drawable
namespace osu.Game.Beatmaps.Drawables
{
class BeatmapPanel : Panel
{

17
osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs → osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -2,21 +2,19 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites;
using osu.Game.Database;
using osu.Game.Configuration;
using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Game.Configuration;
using osu.Framework.Graphics.Colour;
using osu.Framework;
namespace osu.Game.Beatmaps.Drawable
namespace osu.Game.Beatmaps.Drawables
{
class BeatmapSetHeader : Panel
{
@ -31,7 +29,7 @@ namespace osu.Game.Beatmaps.Drawable
this.beatmap = beatmap;
Hidden = false;
Children = new Framework.Graphics.Drawable[]
Children = new Drawable[]
{
new PanelBackground(beatmap)
{
@ -158,7 +156,6 @@ namespace osu.Game.Beatmaps.Drawable
[BackgroundDependencyLoader]
private void load(OsuGameBase game)
{
//todo: masking check
new BeatmapBackground(working)
{
Anchor = Anchor.Centre,

14
osu.Game/Beatmaps/Drawable/DifficultyIcon.cs → osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -1,13 +1,13 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Beatmaps.Drawable
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Beatmaps.Drawables
{
class DifficultyIcon : Container
{

6
osu.Game/Beatmaps/Drawable/Panel.cs → osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Input;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Beatmaps.Drawable
namespace osu.Game.Beatmaps.Drawables
{
class Panel : Container, IStateful<PanelSelectedState>
{
@ -17,9 +17,9 @@ namespace osu.Game.Beatmaps.Drawable
public bool Hidden = true;
private Container nestedContainer;
protected override Container<Framework.Graphics.Drawable> Content => nestedContainer;
protected override Container<Drawable> Content => nestedContainer;
public Panel()
protected Panel()
{
Height = MAX_HEIGHT;
RelativeSizeAxes = Axes.X;

11
osu.Game/Graphics/Background/Background.cs → osu.Game/Graphics/Backgrounds/Background.cs
View File

@ -2,18 +2,15 @@
//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.Game.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework;
using System.Threading.Tasks;
using osu.Framework.Graphics.Textures;
using osu.Framework.Allocation;
namespace osu.Game.Graphics.Background
namespace osu.Game.Graphics.Backgrounds
{
public class Background : BufferedContainer
{

2
osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Allocation;
using OpenTK;
using osu.Framework.Graphics.Transformations;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Background;
using osu.Game.Graphics.Backgrounds;
namespace osu.Game.Screens.Backgrounds
{

2
osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs
View File

@ -1,7 +1,7 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics.Background;
using osu.Game.Graphics.Backgrounds;
namespace osu.Game.Screens.Backgrounds
{

2
osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs
View File

@ -3,7 +3,7 @@
using osu.Framework;
using osu.Framework.Allocation;
using osu.Game.Graphics.Background;
using osu.Game.Graphics.Backgrounds;
namespace osu.Game.Screens.Backgrounds
{

26
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -1,17 +1,17 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Caching;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Game.Beatmaps.Drawable;
using osu.Game.Database;
using System;
using System.Collections.Generic;
using System.Linq;
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Caching;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Game.Database;
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Game.Beatmaps.Drawables;
namespace osu.Game.Screens.Select
{
class CarouselContainer : ScrollContainer

2
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -16,7 +16,6 @@ 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.Modes;
using osu.Game.Screens.Backgrounds;
@ -24,6 +23,7 @@ using OpenTK;
using OpenTK.Graphics;
using osu.Game.Screens.Play;
using osu.Framework;
using osu.Game.Beatmaps.Drawables;
namespace osu.Game.Screens.Select
{

12
osu.Game/osu.Game.csproj
View File

@ -70,9 +70,9 @@
<Compile Include="Beatmaps\Beatmap.cs" />
<Compile Include="Beatmaps\Formats\ConstructableBeatmapDecoder.cs" />
<Compile Include="Beatmaps\WorkingBeatmap.cs" />
<Compile Include="Beatmaps\Drawable\BeatmapSetHeader.cs" />
<Compile Include="Beatmaps\Drawable\DifficultyIcon.cs" />
<Compile Include="Beatmaps\Drawable\Panel.cs" />
<Compile Include="Beatmaps\Drawables\BeatmapSetHeader.cs" />
<Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />
<Compile Include="Beatmaps\Drawables\Panel.cs" />
<Compile Include="Modes\Objects\Drawables\DrawableHitObject.cs" />
<Compile Include="Modes\Objects\HitObject.cs" />
<Compile Include="Modes\Objects\HitObjectConverter.cs" />
@ -107,8 +107,8 @@
<Compile Include="Screens\Select\MatchSongSelect.cs" />
<Compile Include="Screens\OsuGameMode.cs" />
<Compile Include="Screens\Play\ModSelect.cs" />
<Compile Include="Beatmaps\Drawable\BeatmapGroup.cs" />
<Compile Include="Beatmaps\Drawable\BeatmapPanel.cs" />
<Compile Include="Beatmaps\Drawables\BeatmapGroup.cs" />
<Compile Include="Beatmaps\Drawables\BeatmapPanel.cs" />
<Compile Include="Screens\Play\Player.cs" />
<Compile Include="Screens\Charts\ChartListing.cs" />
<Compile Include="Modes\PlayMode.cs" />
@ -125,7 +125,7 @@
<Compile Include="Graphics\UserInterface\RollingCounter.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
<Compile Include="Input\GlobalHotkeys.cs" />
<Compile Include="Graphics\Background\Background.cs" />
<Compile Include="Graphics\Backgrounds\Background.cs" />
<Compile Include="Graphics\Containers\ParallaxContainer.cs" />
<Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
<Compile Include="Graphics\Processing\RatioAdjust.cs" />