RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-14 01:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change implementation of "show speed changes" to require explicit ruleset support

Browse Source
This commit is contained in:
Dean Herbert 2023-09-20 15:27:30 +09:00
parent c5397bdbb3
commit c6cc858967
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
@ -28,34 +27,24 @@ namespace osu.Game.Rulesets.Edit
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
if (DrawableRuleset is DrawableScrollingRuleset<TObject> drawableScrollingRuleset) if (DrawableRuleset is ISupportConstantAlgorithmToggle toggleRuleset)
{ {
var originalVisualisationMethod = drawableScrollingRuleset.VisualisationMethod; LeftToolbox.Add(new EditorToolboxGroup("playfield")
if (originalVisualisationMethod != ScrollVisualisationMethod.Constant)
{ {
LeftToolbox.Add(new EditorToolboxGroup("playfield") Child = new FillFlowContainer
{ {
Child = new FillFlowContainer RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0, 5),
Children = new[]
{ {
RelativeSizeAxes = Axes.X, new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
AutoSizeAxes = Axes.Y, }
Direction = FillDirection.Vertical, },
Spacing = new Vector2(0, 5), });
Children = new[]
{
new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
}
},
});
showSpeedChanges.BindValueChanged(state => showSpeedChanges.BindValueChanged(state => toggleRuleset.ShowSpeedChanges.Value = state.NewValue == TernaryState.True, true);
{
drawableScrollingRuleset.VisualisationMethod = state.NewValue == TernaryState.True
? originalVisualisationMethod
: ScrollVisualisationMethod.Constant;
}, true);
}
} }
} }
} }

15
osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs Normal file
View File

@ -0,0 +1,15 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
namespace osu.Game.Rulesets.UI.Scrolling
{
/// <summary>
/// Denotes a <see cref="IDrawableScrollingRuleset"/> which supports toggling constant algorithm for better display in the editor.
/// </summary>
public interface ISupportConstantAlgorithmToggle : IDrawableScrollingRuleset
{
public BindableBool ShowSpeedChanges { get; }
}
}