Skip to content

Add skinning support for PlayfieldRing #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LumpBloom7 wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add skinning support for PlayfieldRing #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
221470c
Create legacy skin transformer in SentakkiRuleset
LumpBloom7 Jul 28, 2026
3aff608
Add special-skin to test resources
LumpBloom7 Jul 29, 2026
36aa7b3
Move PlayfieldRing into skinning namespace
LumpBloom7 Jul 30, 2026
78caeca
Move ring related configuration to the Ring drawable
LumpBloom7 Aug 3, 2026
add3a30
Implement simpler kiai effect
LumpBloom7 Aug 3, 2026
001b067
Nuke PlayfieldVisualisation
LumpBloom7 Aug 3, 2026
dd614fa
Remove KiaiEffect option
LumpBloom7 Aug 3, 2026
cbb9fff
Merge branch 'master' into skinning-playfield
LumpBloom7 Aug 4, 2026
6f2835b
Implement LegacyPlayfieldring
LumpBloom7 Aug 4, 2026
558209f
Remove ring opacity option
LumpBloom7 Aug 4, 2026
03d16d7
Fix inconsistent beatmap difficulty colours when upon changing skins
LumpBloom7 Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions osu.Game.Rulesets.Sentakki.Tests/Graphics/TestSceneFanChevronVisuals.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
using osu.Game.Rulesets.Sentakki.Extensions;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;
using osuTK.Graphics;
Expand All @@ -34,7 +34,7 @@ public TestSceneFanChevronVisual()
RelativeSizeAxes = Axes.Both,
Colour = Color4.White
});
Cell(0).Add(new SentakkiRing
Cell(0).Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand All @@ -46,7 +46,7 @@ public TestSceneFanChevronVisual()
Segments = [new SlideSegment(PathShape.Fan, 4, false)]
}
});
Cell(0).Add(new SentakkiRing
Cell(0).Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand All @@ -56,7 +56,7 @@ public TestSceneFanChevronVisual()
RelativeSizeAxes = Axes.Both,
Colour = Color4.White
});
Cell(1).Add(new SentakkiRing
Cell(1).Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
using osu.Framework.Graphics.Shapes;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;
using osuTK.Graphics;
Expand All @@ -32,7 +32,7 @@ public TestSceneAllSlides()
{
Add(chevronPool = new DrawablePool<SlideChevron>(62));

Add(new SentakkiRing
Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
3 changes: 2 additions & 1 deletion osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneCircleChaining.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using osu.Framework.Graphics.Shapes;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
Expand Down Expand Up @@ -34,7 +35,7 @@ public TestSceneCircleChaining()
{
Add(chevronPool = new DrawablePool<SlideChevron>(62));

Add(new SentakkiRing
Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using osu.Framework.Graphics.Pooling;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;

Expand All @@ -25,7 +25,7 @@ public TestSceneFanSlide()
{
Add(chevronPool = new DrawablePool<SlideChevron>(62));

Add(new SentakkiRing
Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
using osu.Game.Rulesets.Sentakki.Extensions;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;
using osuTK.Graphics;
Expand Down Expand Up @@ -39,7 +39,7 @@ protected TestSceneSlide()
{
Add(chevronPool = new DrawablePool<SlideChevron>(62));

Add(new SentakkiRing
Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
using osu.Game.Rulesets.Sentakki.Objects.Drawables;
using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
using osu.Game.Rulesets.Sentakki.Objects.SlidePath;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;
using osuTK.Graphics;
Expand Down Expand Up @@ -45,7 +45,7 @@ public partial class TestSceneSlideFan : OsuTestScene
public TestSceneSlideFan()
{
base.Content.Add(content = new SentakkiInputManager(new SentakkiRuleset().RulesetInfo));
Add(new SentakkiRing
Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE),
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneTouchNote.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
using osu.Game.Rulesets.Sentakki.Beatmaps;
using osu.Game.Rulesets.Sentakki.Objects;
using osu.Game.Rulesets.Sentakki.Objects.Drawables;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osuTK;
using osuTK.Graphics;
Expand All @@ -26,7 +26,7 @@ public partial class TestSceneTouchNote : OsuTestScene
public TestSceneTouchNote()
{
base.Content.Add(content = new SentakkiInputManager(new SentakkiRuleset().RulesetInfo));
base.Content.Add(new SentakkiRing
base.Content.Add(new PlayfieldRing
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Expand Down
Binary file added ...Game.Rulesets.Sentakki.Tests/Resources/special-skin/sentakki/playfield-ring.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 34 additions & 26 deletions osu.Game.Rulesets.Sentakki.Tests/UI/TestSceneSentakkiRing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,49 @@
using NUnit.Framework;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Rulesets.Sentakki.Skinning;
using osu.Game.Rulesets.Sentakki.Skinning.Default;
using osu.Game.Rulesets.Sentakki.Skinning.Legacy;
using osu.Game.Rulesets.Sentakki.UI;
using osu.Game.Rulesets.Sentakki.UI.Components;
using osu.Game.Tests.Visual;
using osu.Game.Skinning;
using osuTK;

namespace osu.Game.Rulesets.Sentakki.Tests.UI;

[TestFixture]
public partial class TestSceneSentakkiRing : OsuTestScene
public partial class TestSceneSentakkiRing : SentakkiSkinnableTestScene
{
private SentakkiRing ring = null!;

public TestSceneSentakkiRing()
[Test]
public void TestPlayfieldRing()
{
AddStep("Clear test", () =>
{
Clear();
Add(new Box
{
RelativeSizeAxes = Axes.Both
});
});

AddStep("Create Ring", () => Add(ring = new SentakkiRing
AddStep("Create Ring", () => SetContents(_ => new SkinnableDrawable(new SentakkiSkinComponentLookup(SentakkiSkinComponents.PlayfieldRing), _ => new PlayfieldRing())
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(SentakkiPlayfield.RINGSIZE)
Size = new Vector2(SentakkiPlayfield.RINGSIZE),
Scale = new Vector2(0.3f),
}));

AddUntilStep("Ring loaded", () => ring.IsLoaded && ring.Alpha == 1);
AddToggleStep("Toggle notestart Indicators", b => ring.NoteStartIndicators.Value = b);
AddRepeatStep("Trigger Kiai Beat", () => ring.KiaiBeat(), 5);
AddSliderStep<float>("Test opacity", 0, 1, 1, f =>
{
if (ring != null) ring.RingOpacity.Value = f;
});
AddUntilStep("Ring loaded", () => CreatedDrawables.All(d => d.IsLoaded));
AddToggleStep("Toggle notestart Indicators", toggleNotestartIndicators);
AddRepeatStep("Trigger Kiai Beat", triggerKiaiBeat, 5);
}

private void toggleNotestartIndicators(bool b)
{
CreatedDrawables.OfType<SkinnableDrawable>().Select(d => d.Drawable).OfType<PlayfieldRing>().ForEach(
r => r.NoteStartIndicators.Value = b
);
}

private void triggerKiaiBeat()
{
CreatedDrawables.OfType<SkinnableDrawable>().Select(d => d.Drawable).OfType<PlayfieldRing>().ForEach(
r => r.Pulse()
);

CreatedDrawables.OfType<SkinnableDrawable>().Select(d => d.Drawable).OfType<LegacyPlayfieldRing>().ForEach(
r => r.Pulse()
);
}
}
4 changes: 0 additions & 4 deletions osu.Game.Rulesets.Sentakki/Configuration/SentakkiRulesetConfigManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ protected override void InitialiseDefaults()
{
base.InitialiseDefaults();

SetDefault(SentakkiRulesetSettings.KiaiEffects, true);
SetDefault(SentakkiRulesetSettings.AnimationSpeed, 2.0f, 1.0f, 10.25f, 0.25f);
SetDefault(SentakkiRulesetSettings.TouchAnimationSpeed, 2.0f, 1.0f, 10.25f, 0.25f);
SetDefault(SentakkiRulesetSettings.ShowNoteStartIndicators, false);
SetDefault(SentakkiRulesetSettings.RingColor, ColorOption.Default);
SetDefault(SentakkiRulesetSettings.RingOpacity, 1f, 0f, 1f, 0.01f);
SetDefault(SentakkiRulesetSettings.SnakingSlideBody, true);
SetDefault(SentakkiRulesetSettings.DetailedJudgements, false);
SetDefault(SentakkiRulesetSettings.PreferPortraitLayout, false);
Expand All @@ -40,9 +38,7 @@ public override TrackedSettings CreateTrackedSettings() =>

public enum SentakkiRulesetSettings
{
KiaiEffects,
AnimationSpeed,
RingOpacity,
ShowNoteStartIndicators,
RingColor,
TouchAnimationSpeed,
Expand Down
5 changes: 0 additions & 5 deletions osu.Game.Rulesets.Sentakki/Localisation/SentakkiSettingsSubsectionStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ public static class SentakkiSettingsSubsectionStrings
{
private const string prefix = @"osu.Game.Rulesets.Sentakki.Resources.Localisation.SentakkiSettingsSubsectionStrings";

/// <summary>
/// "Show kiai effects"
/// </summary>
public static LocalisableString ShowKiaiEffects => new TranslatableString(getKey(@"show_kiai_effects"), @"Show Kiai effects");

/// <summary>
/// "Show note start indicators"
/// </summary>
Expand Down
Loading
Loading