diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs index ecfb58608..eab5138d9 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Shapes; using osu.Game.Rulesets.Sentakki.Objects; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.Sentakki.UI; using osu.Game.Rulesets.Sentakki.UI.Components; using osu.Game.Tests.Visual; diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs index 30760bcbb..956a5768c 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using osu.Framework.Allocation; using osu.Framework.Graphics; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.Sentakki.UI; using osu.Game.Rulesets.Sentakki.UI.Components; using osu.Game.Tests.Visual; diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs index 8c45c0ea2..7a03f22c4 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Shapes; using osu.Game.Rulesets.Sentakki.Objects; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.Sentakki.UI; using osu.Game.Rulesets.Sentakki.UI.Components; using osu.Game.Tests.Visual; diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs index 87f912ce6..d4175f6ee 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs @@ -8,7 +8,7 @@ using osu.Game.Beatmaps.ControlPoints; using osu.Game.Rulesets.Sentakki.Objects; using osu.Game.Rulesets.Sentakki.Objects.Drawables; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Tests.Visual; namespace osu.Game.Rulesets.Sentakki.Tests.Objects diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs index 9d341f537..26a4f3754 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs @@ -9,7 +9,7 @@ using osu.Game.Beatmaps.ControlPoints; using osu.Game.Rulesets.Sentakki.Objects; using osu.Game.Rulesets.Sentakki.Objects.Drawables; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Tests.Visual; namespace osu.Game.Rulesets.Sentakki.Tests.Objects diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHold.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHold.cs index 4242c625b..377eec25d 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHold.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableHold.cs @@ -8,7 +8,7 @@ using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces; +using osu.Game.Rulesets.Sentakki.Skinning.Default; using osu.Game.Rulesets.Sentakki.UI; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideBody.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideBody.cs index a8d68f971..ef607e6c0 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideBody.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideBody.cs @@ -9,7 +9,7 @@ using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideFan.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideFan.cs index 6d0f035a1..4dce962ef 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideFan.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideFan.cs @@ -1,4 +1,4 @@ -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.Sentakki.UI; using osuTK; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideTap.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideTap.cs index 8bd912e11..d0b2f1af3 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideTap.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideTap.cs @@ -1,6 +1,6 @@ using System.Linq; using osu.Framework.Graphics; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; namespace osu.Game.Rulesets.Sentakki.Objects.Drawables { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs index ce790f68e..f0e2ef0af 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTap.cs @@ -5,7 +5,7 @@ using osu.Framework.Input.Events; using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces; +using osu.Game.Rulesets.Sentakki.Skinning.Default; using osu.Game.Rulesets.Sentakki.UI; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs index 2ecdf0c1c..9963fa540 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs @@ -5,7 +5,7 @@ using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Sentakki.Configuration; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Touches; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs index e61e65cc0..18255ebcd 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs +++ b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs @@ -12,7 +12,7 @@ using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Sentakki.Configuration; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.TouchHolds; +using osu.Game.Rulesets.Sentakki.Skinning.Default.TouchHolds; using osu.Game.Skinning; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBlobs.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBlobs.cs deleted file mode 100644 index 2c7784153..000000000 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBlobs.cs +++ /dev/null @@ -1,122 +0,0 @@ -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Effects; -using osu.Framework.Graphics.Shapes; -using osu.Game.Rulesets.Objects.Drawables; -using osuTK; -using osuTK.Graphics; - -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches -{ - public class TouchBlob : CircularContainer - { - public TouchBlob() - { - Size = new Vector2(80); - Scale = new Vector2(.5f); - Anchor = Anchor.Centre; - Origin = Anchor.Centre; - Children = new Drawable[] - { - new Container - { - RelativeSizeAxes = Axes.Both, - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Padding = new MarginPadding(1), - Child = new Container - { - Alpha = .5f, - Masking = true, - RelativeSizeAxes = Axes.Both, - CornerRadius = 20, - CornerExponent = 2.5f, - EdgeEffect = new EdgeEffectParameters - { - Hollow = true, - Type = EdgeEffectType.Shadow, - Radius = 15, - Colour = Color4.Black, - } - } - }, - new Container - { - CornerRadius = 20, - CornerExponent = 2.5f, - RelativeSizeAxes = Axes.Both, - Masking = true, - BorderThickness = 16.35f, - BorderColour = Color4.Gray, - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Child = new Box - { - RelativeSizeAxes = Axes.Both, - Alpha= 0, - AlwaysPresent = true - } - }, - new Container - { - Masking = true, - RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding(1), - Child = new Container - { - CornerRadius = 20, - CornerExponent = 2.5f, - RelativeSizeAxes = Axes.Both, - Masking = true, - BorderThickness = 15, - BorderColour = Color4.White, - Child = new Box - { - RelativeSizeAxes = Axes.Both, - Alpha = 0, - AlwaysPresent = true, - } - } - }, - new Container - { - CornerRadius = 20, - CornerExponent = 2.5f, - RelativeSizeAxes = Axes.Both, - Masking = true, - BorderThickness = 2, - BorderColour = Color4.Gray, - Child = new Box - { - RelativeSizeAxes = Axes.Both, - Alpha = 0, - AlwaysPresent = true - } - }, - }; - } - - [BackgroundDependencyLoader] - private void load(DrawableHitObject drawableObject) - { - drawableObject.ApplyCustomUpdateState += updateState; - } - - private void updateState(DrawableHitObject drawableObject, ArmedState state) - { - using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true)) - { - switch (state) - { - case ArmedState.Hit: - const double flash_in = 40; - - this.Delay(flash_in).FadeOut(); - - break; - } - } - } - } -} diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TrianglesPiece.cs deleted file mode 100644 index 81f73b8f4..000000000 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TrianglesPiece.cs +++ /dev/null @@ -1,21 +0,0 @@ -using osu.Game.Graphics.Backgrounds; - -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces -{ - public class TrianglesPiece : Triangles - { - protected override float SpawnRatio => 1f; - - public TrianglesPiece() - { - TriangleScale = 1.2f; - HideAlphaDiscrepancies = false; - } - - protected override void Update() - { - if (IsPresent) - base.Update(); - } - } -} diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/DotPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/DotPiece.cs similarity index 96% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/DotPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/DotPiece.cs index 6f4e8996c..6fe6a030e 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/DotPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/DotPiece.cs @@ -6,7 +6,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { public class DotPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/HoldBody.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/HoldBody.cs similarity index 95% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/HoldBody.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/HoldBody.cs index 1bfe7b6fc..8d6e7a03a 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/HoldBody.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/HoldBody.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { public class HoldBody : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/NoteRingPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/NoteRingPiece.cs similarity index 92% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/NoteRingPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/NoteRingPiece.cs index 8e20b6c0e..ce257f6a3 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/NoteRingPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/NoteRingPiece.cs @@ -1,7 +1,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { // This piece is used for laned notes, which share consistent elements // Each half is extends beyond the area of this drawable diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/RingPiece.cs similarity index 96% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/RingPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/RingPiece.cs index 15b54190f..9e93bfaa3 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/RingPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/RingPiece.cs @@ -3,7 +3,7 @@ using osu.Framework.Graphics.Shapes; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { public class RingPiece : CircularContainer { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/ShadowPiece.cs similarity index 93% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/ShadowPiece.cs index 9098948e6..56d871db2 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/ShadowPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/ShadowPiece.cs @@ -3,7 +3,7 @@ using osu.Framework.Graphics.Effects; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { public class ShadowPiece : Container { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideChevron.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideChevron.cs similarity index 81% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideChevron.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideChevron.cs index e9d409843..9b8dfb082 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideChevron.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideChevron.cs @@ -1,4 +1,4 @@ -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public interface ISlideChevron { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideVisual.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideVisual.cs similarity index 77% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideVisual.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideVisual.cs index f83aa3dd3..35a26007a 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/ISlideVisual.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/ISlideVisual.cs @@ -1,4 +1,4 @@ -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public interface ISlideVisual { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanChevrons.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanChevrons.cs similarity index 98% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanChevrons.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanChevrons.cs index 80cf7644a..2ccfa051e 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanChevrons.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanChevrons.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { /// /// This drawable holds a set of all chevron buffered drawables, and is used to preload all/draw of them outside of playfield. (To avoid Playfield transforms re-rendering the chevrons) diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanVisual.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanVisual.cs similarity index 95% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanVisual.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanVisual.cs index 94a6e7b4d..5707436a1 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideFanVisual.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideFanVisual.cs @@ -6,7 +6,7 @@ using osu.Game.Rulesets.Sentakki.UI; using osuTK; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public class SlideFanVisual : SlideVisualBase { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideTapPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideTapPiece.cs similarity index 95% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideTapPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideTapPiece.cs index 92717bcb4..179fb29f3 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideTapPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideTapPiece.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public class SlideTapPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisual.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisual.cs similarity index 97% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisual.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisual.cs index ad2d5eeaa..b0556ace0 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisual.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisual.cs @@ -5,8 +5,9 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Game.Rulesets.Objects; +using osu.Game.Rulesets.Sentakki.Objects; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public class SlideVisual : SlideVisualBase { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisualBase.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisualBase.cs similarity index 97% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisualBase.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisualBase.cs index 019136385..c8e242dba 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisualBase.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/SlideVisualBase.cs @@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers; using osu.Game.Rulesets.Sentakki.Configuration; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public abstract class SlideVisualBase : CompositeDrawable, ISlideVisual where T : Drawable, ISlideChevron { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/StarPiece.cs similarity index 90% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/StarPiece.cs index 2a979089d..749e87b21 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/StarPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Slides/StarPiece.cs @@ -4,7 +4,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Slides { public class StarPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TapPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/TapPiece.cs similarity index 94% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TapPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/TapPiece.cs index 6783d8a27..ceb76333a 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TapPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/TapPiece.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces +namespace osu.Game.Rulesets.Sentakki.Skinning.Default { public class TapPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldBody.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldBody.cs similarity index 95% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldBody.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldBody.cs index 54a8824e0..e000dd22e 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldBody.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldBody.cs @@ -6,7 +6,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.TouchHolds +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.TouchHolds { public class TouchHoldBody : CircularContainer { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldCentrePiece.cs similarity index 97% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldCentrePiece.cs index 1de9d0c80..dc54d3158 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldCentrePiece.cs @@ -6,7 +6,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.TouchHolds +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.TouchHolds { public class TouchHoldCentrePiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldProgressPiece.cs similarity index 97% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldProgressPiece.cs index 6e2026ad1..ad6669828 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/TouchHolds/TouchHoldProgressPiece.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.TouchHolds +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.TouchHolds { public class TouchHoldProgressPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBody.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchBody.cs similarity index 97% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBody.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchBody.cs index a1b4704da..fdcf3b845 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchBody.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchBody.cs @@ -7,7 +7,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Touches { public class TouchBody : Container { diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchPiece.cs b/osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchPiece.cs similarity index 93% rename from osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchPiece.cs rename to osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchPiece.cs index 2f2b9daca..c1a3a938e 100644 --- a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Touches/TouchPiece.cs +++ b/osu.Game.Rulesets.Sentakki/Skinning/Default/Touches/TouchPiece.cs @@ -5,7 +5,7 @@ using osu.Framework.Graphics.Textures; using osuTK; -namespace osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Touches +namespace osu.Game.Rulesets.Sentakki.Skinning.Default.Touches { public class TouchPiece : CompositeDrawable { diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/SentakkiRing.cs b/osu.Game.Rulesets.Sentakki/UI/Components/SentakkiRing.cs index bf7e582d1..d002a1a6c 100644 --- a/osu.Game.Rulesets.Sentakki/UI/Components/SentakkiRing.cs +++ b/osu.Game.Rulesets.Sentakki/UI/Components/SentakkiRing.cs @@ -4,7 +4,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Rulesets.Sentakki.Configuration; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces; +using osu.Game.Rulesets.Sentakki.Skinning.Default; using osuTK; namespace osu.Game.Rulesets.Sentakki.UI.Components diff --git a/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs b/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs index a32b61650..8992a9196 100644 --- a/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs +++ b/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs @@ -10,8 +10,8 @@ using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Sentakki.Configuration; using osu.Game.Rulesets.Sentakki.Objects; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; using osu.Game.Rulesets.Sentakki.Replays; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.UI; using osu.Game.Scoring; using osu.Game.Screens.Play; diff --git a/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs b/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs index 14c187efa..1b8046e92 100644 --- a/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs +++ b/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs @@ -6,7 +6,7 @@ using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Sentakki.Objects; using osu.Game.Rulesets.Sentakki.Objects.Drawables; -using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides; +using osu.Game.Rulesets.Sentakki.Skinning.Default.Slides; using osu.Game.Rulesets.Sentakki.UI.Components.HitObjectLine; using osu.Game.Rulesets.UI;