mirror of
https://github.com/osukey/osukey.git
synced 2025-05-30 01:47:30 +09:00
Implement small mod switch
This commit is contained in:
parent
5186693dad
commit
cfc41a0a36
@ -0,0 +1,85 @@
|
|||||||
|
// 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 System;
|
||||||
|
using System.Linq;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using osu.Framework.Extensions.IEnumerableExtensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Testing;
|
||||||
|
using osu.Game.Overlays;
|
||||||
|
using osu.Game.Rulesets;
|
||||||
|
using osu.Game.Rulesets.Catch;
|
||||||
|
using osu.Game.Rulesets.Mania;
|
||||||
|
using osu.Game.Rulesets.Osu;
|
||||||
|
using osu.Game.Rulesets.Taiko;
|
||||||
|
using osu.Game.Rulesets.UI;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Visual.UserInterface
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class TestSceneModSwitchSmall : OsuTestScene
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void TestOsu() => createSwitchTestFor(new OsuRuleset());
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestTaiko() => createSwitchTestFor(new TaikoRuleset());
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestCatch() => createSwitchTestFor(new CatchRuleset());
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestMania() => createSwitchTestFor(new ManiaRuleset());
|
||||||
|
|
||||||
|
private void createSwitchTestFor(Ruleset ruleset)
|
||||||
|
{
|
||||||
|
AddStep("no colour scheme", () => Child = createContent(ruleset, null));
|
||||||
|
|
||||||
|
foreach (var scheme in Enum.GetValues(typeof(OverlayColourScheme)).Cast<OverlayColourScheme>())
|
||||||
|
{
|
||||||
|
AddStep($"{scheme} colour scheme", () => Child = createContent(ruleset, scheme));
|
||||||
|
}
|
||||||
|
|
||||||
|
AddToggleStep("toggle active", active => this.ChildrenOfType<ModSwitchTiny>().ForEach(s => s.Active.Value = active));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Drawable createContent(Ruleset ruleset, OverlayColourScheme? colourScheme)
|
||||||
|
{
|
||||||
|
var switchFlow = new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Spacing = new Vector2(10),
|
||||||
|
Padding = new MarginPadding(20),
|
||||||
|
ChildrenEnumerable = ruleset.CreateAllMods()
|
||||||
|
.GroupBy(mod => mod.Type)
|
||||||
|
.Select(group => new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Direction = FillDirection.Full,
|
||||||
|
Spacing = new Vector2(5),
|
||||||
|
ChildrenEnumerable = group.Select(mod => new ModSwitchSmall(mod))
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
if (colourScheme != null)
|
||||||
|
{
|
||||||
|
return new DependencyProvidingContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
CachedDependencies = new (Type, object)[]
|
||||||
|
{
|
||||||
|
(typeof(OverlayColourProvider), new OverlayColourProvider(colourScheme.Value))
|
||||||
|
},
|
||||||
|
Child = switchFlow
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return switchFlow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
109
osu.Game/Rulesets/UI/ModSwitchSmall.cs
Normal file
109
osu.Game/Rulesets/UI/ModSwitchSmall.cs
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
// 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.Allocation;
|
||||||
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Framework.Utils;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Overlays;
|
||||||
|
using osu.Game.Rulesets.Mods;
|
||||||
|
using osuTK;
|
||||||
|
using osuTK.Graphics;
|
||||||
|
|
||||||
|
#nullable enable
|
||||||
|
|
||||||
|
namespace osu.Game.Rulesets.UI
|
||||||
|
{
|
||||||
|
public class ModSwitchSmall : CompositeDrawable
|
||||||
|
{
|
||||||
|
public BindableBool Active { get; } = new BindableBool();
|
||||||
|
|
||||||
|
private readonly IMod mod;
|
||||||
|
|
||||||
|
private const float size = 60;
|
||||||
|
|
||||||
|
private readonly SpriteIcon background;
|
||||||
|
private readonly SpriteIcon? modIcon;
|
||||||
|
|
||||||
|
private Color4 activeForegroundColour;
|
||||||
|
private Color4 inactiveForegroundColour;
|
||||||
|
|
||||||
|
private Color4 activeBackgroundColour;
|
||||||
|
private Color4 inactiveBackgroundColour;
|
||||||
|
|
||||||
|
public ModSwitchSmall(IMod mod)
|
||||||
|
{
|
||||||
|
this.mod = mod;
|
||||||
|
|
||||||
|
AutoSizeAxes = Axes.Both;
|
||||||
|
|
||||||
|
FillFlowContainer contentFlow;
|
||||||
|
ModSwitchTiny tinySwitch;
|
||||||
|
|
||||||
|
InternalChildren = new Drawable[]
|
||||||
|
{
|
||||||
|
background = new SpriteIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Size = new Vector2(size),
|
||||||
|
Icon = OsuIcon.ModBg
|
||||||
|
},
|
||||||
|
contentFlow = new FillFlowContainer
|
||||||
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Spacing = new Vector2(0, 4),
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Child = tinySwitch = new ModSwitchTiny(mod)
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopCentre,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
Scale = new Vector2(0.6f),
|
||||||
|
Active = { BindTarget = Active }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (mod.Icon != null)
|
||||||
|
{
|
||||||
|
contentFlow.Insert(-1, modIcon = new SpriteIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopCentre,
|
||||||
|
Origin = Anchor.TopCentre,
|
||||||
|
Size = new Vector2(21),
|
||||||
|
Icon = mod.Icon.Value
|
||||||
|
});
|
||||||
|
tinySwitch.Scale = new Vector2(0.3f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader(true)]
|
||||||
|
private void load(OsuColour colours, OverlayColourProvider? colourProvider)
|
||||||
|
{
|
||||||
|
inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
|
||||||
|
activeForegroundColour = colours.ForModType(mod.Type);
|
||||||
|
|
||||||
|
inactiveBackgroundColour = colourProvider?.Background2 ?? colours.Gray5;
|
||||||
|
activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void LoadComplete()
|
||||||
|
{
|
||||||
|
base.LoadComplete();
|
||||||
|
|
||||||
|
Active.BindValueChanged(_ => updateState(), true);
|
||||||
|
FinishTransforms(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateState()
|
||||||
|
{
|
||||||
|
modIcon?.FadeColour(Active.Value ? activeForegroundColour : inactiveForegroundColour, 200, Easing.OutQuint);
|
||||||
|
background.FadeColour(Active.Value ? activeBackgroundColour : inactiveBackgroundColour, 200, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user