Fix osu! hitcircle font textures being incorrectly sized

This commit is contained in:
Dean Herbert 2019-09-11 13:39:21 +09:00
parent c27eed0195
commit 6760e239a1
2 changed files with 4 additions and 9 deletions

View File

@ -86,9 +86,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
? null ? null
: new LegacySpriteText(source, font) : new LegacySpriteText(source, font)
{ {
// Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size // stable applies a blanket 0.8x scale to hitcircle fonts
Scale = new Vector2(0.96f), Scale = new Vector2(0.8f),
Spacing = new Vector2(-overlap * 0.89f, 0) Spacing = new Vector2(-overlap, 0)
}; };
} }

View File

@ -4,7 +4,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Text; using osu.Framework.Text;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
namespace osu.Game.Skinning namespace osu.Game.Skinning
@ -18,7 +17,7 @@ namespace osu.Game.Skinning
Shadow = false; Shadow = false;
UseFullGlyphHeight = false; UseFullGlyphHeight = false;
Font = new FontUsage(font, OsuFont.DEFAULT_FONT_SIZE); Font = new FontUsage(font, 1);
glyphStore = new LegacyGlyphStore(skin); glyphStore = new LegacyGlyphStore(skin);
} }
@ -37,10 +36,6 @@ namespace osu.Game.Skinning
{ {
var texture = skin.GetTexture($"{fontName}-{character}"); var texture = skin.GetTexture($"{fontName}-{character}");
if (texture != null)
// Approximate value that brings character sizing roughly in-line with stable
texture.ScaleAdjust *= 18;
if (texture == null) if (texture == null)
return null; return null;