RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust namespaces

Browse Source
This commit is contained in:
smoogipoo 2018-10-25 18:26:28 +09:00
parent ea6db8b793
commit d19f80835b
11 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Osu.Edit.Masks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
using osu.Game.Rulesets.Osu.Objects;
namespace osu.Game.Rulesets.Osu.Edit

6
osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
View File

@ -9,13 +9,13 @@ using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
using OpenTK;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components
{
public class HitCircleMask : CompositeDrawable
{
private readonly HitCircle hitCircle;
private readonly Objects.HitCircle hitCircle;
public HitCircleMask(HitCircle hitCircle)
public HitCircleMask(Objects.HitCircle hitCircle)
{
this.hitCircle = hitCircle;

8
osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
View File

@ -3,16 +3,16 @@
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
{
public class HitCirclePlacementMask : PlacementMask
{
public new HitCircle HitObject => (HitCircle)base.HitObject;
public new Objects.HitCircle HitObject => (Objects.HitCircle)base.HitObject;
public HitCirclePlacementMask()
: base(new HitCircle())
: base(new Objects.HitCircle())
{
InternalChild = new HitCircleMask(HitObject);
}

6
osu.Game.Rulesets.Osu/Edit/Masks/HitCircleSelectionMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
View File

@ -2,17 +2,17 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
using osu.Game.Rulesets.Osu.Objects.Drawables;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
{
public class HitCircleSelectionMask : SelectionMask
{
public HitCircleSelectionMask(DrawableHitCircle hitCircle)
: base(hitCircle)
{
InternalChild = new HitCircleMask((HitCircle)hitCircle.HitObject);
InternalChild = new HitCircleMask((Objects.HitCircle)hitCircle.HitObject);
}
}
}

7
osu.Game.Rulesets.Osu/Edit/Masks/SliderBodyMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
View File

@ -4,18 +4,17 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
{
public class SliderBodyMask : CompositeDrawable
{
private readonly Slider slider;
private readonly Objects.Slider slider;
private readonly SliderBody body;
public SliderBodyMask(Slider slider)
public SliderBodyMask(Objects.Slider slider)
{
this.slider = slider;
InternalChild = body = new SliderBody(slider)

8
osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
View File

@ -1,16 +1,16 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
{
public class SliderCircleMask : HitCircleMask
{
private readonly Slider slider;
private readonly Objects.Slider slider;
private readonly SliderPosition position;
public SliderCircleMask(Slider slider, SliderPosition position)
public SliderCircleMask(Objects.Slider slider, SliderPosition position)
: base(slider.HeadCircle)
{
this.slider = slider;

6
osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleSelectionMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
View File

@ -2,14 +2,14 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components;
using osu.Game.Rulesets.Osu.Objects.Drawables;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{
public class SliderCircleSelectionMask : SelectionMask
{
public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Slider slider, SliderPosition position)
public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Objects.Slider slider, SliderPosition position)
: base(hitObject)
{
InternalChild = new SliderCircleMask(slider, position);

2
osu.Game.Rulesets.Osu/Edit/Masks/SliderPosition.cs → osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderPosition.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{
public enum SliderPosition
{

6
osu.Game.Rulesets.Osu/Edit/Masks/SliderSelectionMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
View File

@ -3,11 +3,11 @@
using osu.Framework.Graphics;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using OpenTK;
namespace osu.Game.Rulesets.Osu.Edit.Masks
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{
public class SliderSelectionMask : SelectionMask
{
@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks
public SliderSelectionMask(DrawableSlider slider)
: base(slider)
{
var sliderObject = (Slider)slider.HitObject;
var sliderObject = (Objects.Slider)slider.HitObject;
InternalChildren = new Drawable[]
{

3
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -8,7 +8,8 @@ using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Edit.Masks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
using osu.Game.Rulesets.Osu.Edit.Masks.Slider;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Osu.UI;

3
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -13,7 +13,8 @@ using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Edit;
using osu.Game.Rulesets.Osu.Edit.Masks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Layers;