h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 15:02:54 +08:00
Code Issues Releases Wiki Activity

Mask -> Piece for components

Browse Source
This commit is contained in:
smoogipoo 2018-10-26 13:51:03 +09:00
parent 9656186b64
commit ea3c960b5b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

4
osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyMask.cs → osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
View File

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

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

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

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

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

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

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