Move all visual pieces to Skinning namespace

LumpBloom7 · Sep 23, 2022 · fd9b985 · fd9b985
1 parent 394cdc8
commit fd9b985
Show file tree

Hide file tree

Showing 36 changed files with 35 additions and 177 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TrianglesPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TrianglesPiece.cs
diff --git a/...akki/Objects/Drawables/Pieces/DotPiece.cs → ...ets.Sentakki/Skinning/Default/DotPiece.cs b/...akki/Objects/Drawables/Pieces/DotPiece.cs → ...ets.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/...akki/Objects/Drawables/Pieces/HoldBody.cs → ...ets.Sentakki/Skinning/Default/HoldBody.cs b/...akki/Objects/Drawables/Pieces/HoldBody.cs → ...ets.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/...Objects/Drawables/Pieces/NoteRingPiece.cs → ...entakki/Skinning/Default/NoteRingPiece.cs b/...Objects/Drawables/Pieces/NoteRingPiece.cs → ...entakki/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/...kki/Objects/Drawables/Pieces/RingPiece.cs → ...ts.Sentakki/Skinning/Default/RingPiece.cs b/...kki/Objects/Drawables/Pieces/RingPiece.cs → ...ts.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/...i/Objects/Drawables/Pieces/ShadowPiece.cs → ....Sentakki/Skinning/Default/ShadowPiece.cs b/...i/Objects/Drawables/Pieces/ShadowPiece.cs → ....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/.../Drawables/Pieces/Slides/ISlideChevron.cs → .../Skinning/Default/Slides/ISlideChevron.cs b/.../Drawables/Pieces/Slides/ISlideChevron.cs → .../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/...s/Drawables/Pieces/Slides/ISlideVisual.cs → ...i/Skinning/Default/Slides/ISlideVisual.cs b/...s/Drawables/Pieces/Slides/ISlideVisual.cs → ...i/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/...awables/Pieces/Slides/SlideFanChevrons.cs → ...inning/Default/Slides/SlideFanChevrons.cs b/...awables/Pieces/Slides/SlideFanChevrons.cs → ...inning/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
 {
     /// <summary>
     /// 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/...Drawables/Pieces/Slides/SlideFanVisual.cs → ...Skinning/Default/Slides/SlideFanVisual.cs b/...Drawables/Pieces/Slides/SlideFanVisual.cs → ...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<SlideFanVisual.SlideFanChevron>
     {

diff --git a/.../Drawables/Pieces/Slides/SlideTapPiece.cs → .../Skinning/Default/Slides/SlideTapPiece.cs b/.../Drawables/Pieces/Slides/SlideTapPiece.cs → .../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/...ts/Drawables/Pieces/Slides/SlideVisual.cs → ...ki/Skinning/Default/Slides/SlideVisual.cs b/...ts/Drawables/Pieces/Slides/SlideVisual.cs → ...ki/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<SlideVisual.SlideChevron>
     {

diff --git a/...rawables/Pieces/Slides/SlideVisualBase.cs → ...kinning/Default/Slides/SlideVisualBase.cs b/...rawables/Pieces/Slides/SlideVisualBase.cs → ...kinning/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<T> : CompositeDrawable, ISlideVisual where T : Drawable, ISlideChevron
     {

diff --git a/...ects/Drawables/Pieces/Slides/StarPiece.cs → ...akki/Skinning/Default/Slides/StarPiece.cs b/...ects/Drawables/Pieces/Slides/StarPiece.cs → ...akki/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/...akki/Objects/Drawables/Pieces/TapPiece.cs → ...ets.Sentakki/Skinning/Default/TapPiece.cs b/...akki/Objects/Drawables/Pieces/TapPiece.cs → ...ets.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/...wables/Pieces/TouchHolds/TouchHoldBody.cs → ...nning/Default/TouchHolds/TouchHoldBody.cs b/...wables/Pieces/TouchHolds/TouchHoldBody.cs → ...nning/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/...Pieces/TouchHolds/TouchHoldCentrePiece.cs → ...efault/TouchHolds/TouchHoldCentrePiece.cs b/...Pieces/TouchHolds/TouchHoldCentrePiece.cs → ...efault/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/...eces/TouchHolds/TouchHoldProgressPiece.cs → ...ault/TouchHolds/TouchHoldProgressPiece.cs b/...eces/TouchHolds/TouchHoldProgressPiece.cs → ...ault/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
     {