RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalise LegacyRollingCounter

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-09-12 22:34:57 +02:00
parent 99a68e880a
commit 3db0e7cd75
2 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
View File

@ -1,13 +1,10 @@
// 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 osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Catch.UI;
using osu.Game.Screens.Play;
using osu.Game.Skinning;
@ -128,35 +125,5 @@ namespace osu.Game.Rulesets.Catch.Skinning
lastExplosion = explosion;
}
private class LegacyRollingCounter : RollingCounter<int>
{
private readonly ISkin skin;
private readonly string fontName;
private readonly float fontOverlap;
protected override bool IsRollingProportional => true;
public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
{
this.skin = skin;
this.fontName = fontName;
this.fontOverlap = fontOverlap;
}
protected override double GetProportionalDuration(int currentValue, int newValue)
{
return Math.Abs(newValue - currentValue) * 75.0;
}
protected override OsuSpriteText CreateSpriteText()
{
return new LegacySpriteText(skin, fontName)
{
Spacing = new Vector2(-fontOverlap, 0f)
};
}
}
}
}

51
osu.Game/Skinning/LegacyRollingCounter.cs Normal file
View File

@ -0,0 +1,51 @@
// 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 osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osuTK;
namespace osu.Game.Skinning
{
/// <summary>
/// An integer <see cref="RollingCounter{T}"/> that uses number sprites from a legacy skin.
/// </summary>
public class LegacyRollingCounter : RollingCounter<int>
{
private readonly ISkin skin;
private readonly string fontName;
private readonly float fontOverlap;
protected override bool IsRollingProportional => true;
/// <summary>
/// Creates a new <see cref="LegacyRollingCounter"/>.
/// </summary>
/// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
/// <param name="fontName">The name of the legacy font to use.</param>
/// <param name="fontOverlap">
/// The numeric overlap of number sprites to use.
/// A positive number will bring the number sprites closer together, while a negative number
/// will split them apart more.
/// </param>
public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
{
this.skin = skin;
this.fontName = fontName;
this.fontOverlap = fontOverlap;
}
protected override double GetProportionalDuration(int currentValue, int newValue)
{
return Math.Abs(newValue - currentValue) * 75.0;
}
protected sealed override OsuSpriteText CreateSpriteText() =>
new LegacySpriteText(skin, fontName)
{
Spacing = new Vector2(-fontOverlap, 0f)
};
}
}