h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 06:52:55 +08:00
Code Issues Releases Wiki Activity

Mask -> Piece for non-mask components

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

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

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

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

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
public HitCirclePlacementMask()
: base(new Objects.HitCircle())
{
InternalChild = new HitCircleMask(HitObject);
InternalChild = new HitCirclePiece(HitObject);
}
protected override void LoadComplete()

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

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
public HitCircleSelectionMask(DrawableHitCircle hitCircle)
: base(hitCircle)
{
InternalChild = new HitCircleMask((Objects.HitCircle)hitCircle.HitObject);
InternalChild = new HitCirclePiece((Objects.HitCircle)hitCircle.HitObject);
}
}
}

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

@ -9,12 +9,12 @@ using OpenTK.Graphics;
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
{
public class SliderBodyMask : CompositeDrawable
public class BodyPiece : CompositeDrawable
{
private readonly Objects.Slider slider;
private readonly SliderBody body;
public SliderBodyMask(Objects.Slider slider)
public BodyPiece(Objects.Slider slider)
{
this.slider = slider;
InternalChild = body = new SliderBody(slider)

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

@ -5,12 +5,12 @@ using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
{
public class SliderCircleMask : HitCircleMask
public class SliderCirclePiece : HitCirclePiece
{
private readonly Objects.Slider slider;
private readonly SliderPosition position;
public SliderCircleMask(Objects.Slider slider, SliderPosition position)
public SliderCirclePiece(Objects.Slider slider, SliderPosition position)
: base(slider.HeadCircle)
{
this.slider = slider;

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

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Objects.Slider slider, SliderPosition position)
: base(hitObject)
{
InternalChild = new SliderCircleMask(slider, position);
InternalChild = new SliderCirclePiece(slider, position);
Select();
}

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

@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
InternalChildren = new Drawable[]
{
new SliderBodyMask(sliderObject),
new BodyPiece(sliderObject),
headMask = new SliderCircleSelectionMask(slider.HeadCircle, sliderObject, SliderPosition.Start),
new SliderCircleSelectionMask(slider.TailCircle, sliderObject, SliderPosition.End),
};

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

@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual
typeof(OsuHitObjectComposer),
typeof(HitObjectMaskLayer),
typeof(NotNullAttribute),
typeof(HitCircleMask),
typeof(HitCirclePiece),
typeof(HitCircleSelectionMask),
typeof(HitCirclePlacementMask),
};