RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix legacy font glyphs being mistaken for animation and getting "extrapolated"

This commit is contained in:
Salman Ahmed 2020-08-03 21:43:03 +03:00
parent f5af81d775
commit d6f36457a8
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using JetBrains.Annotations;
using osu.Framework.Allocation;
@ -152,25 +153,38 @@ private class TestLegacySkin : LegacySkin
{
private readonly bool extrapolateAnimations;
private readonly HashSet<string> legacyFontPrefixes = new HashSet<string>();
public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
: base(skin, storage, audioManager, "skin.ini")
{
this.extrapolateAnimations = extrapolateAnimations;
legacyFontPrefixes.Add(GetConfig<string, string>("HitCirclePrefix")?.Value ?? "default");
legacyFontPrefixes.Add(GetConfig<string, string>("ScorePrefix")?.Value ?? "score");
legacyFontPrefixes.Add(GetConfig<string, string>("ComboPrefix")?.Value ?? "score");
}
public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
{
// extrapolate frames to test longer animations
if (extrapolateAnimations)
{
var match = Regex.Match(componentName, "-([0-9]*)");
if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out var number) && number < 60)
return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
}
if (extrapolateAnimations && isAnimationComponent(componentName, out var number) && number < 60)
return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
return base.GetTexture(componentName, wrapModeS, wrapModeT);
}
private bool isAnimationComponent(string componentName, out int number)
{
number = 0;
// legacy font glyph textures have the pattern "{fontPrefix}-{character}", which could be mistaken for an animation frame.
if (legacyFontPrefixes.Any(p => componentName.StartsWith($"{p}-")))
return false;
var match = Regex.Match(componentName, "-([0-9]*)");
return match.Length > 0 && int.TryParse(match.Groups[1].Value, out number);
}
}
}
}