Support drawing fonts without culture involved.

isadorasophia · Jan 14, 2025 · 4ab928e · 4ab928e
1 parent 45bf454
commit 4ab928e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/Murder/Core/Graphics/DrawInfo.cs b/src/Murder/Core/Graphics/DrawInfo.cs
@@ -59,6 +59,11 @@ public readonly struct DrawInfo
 
     public Rectangle Clip { get; init; } = Rectangle.Empty;
 
+    /// <summary>
+    /// Whether this should bypass localization fonts.
+    /// </summary>
+    public bool CultureInvariant { get; init; } = false;
+
     public DrawInfo()
     {
     }

diff --git a/src/Murder/Data/GameDataManager.cs b/src/Murder/Data/GameDataManager.cs
@@ -866,9 +866,9 @@ public ImmutableDictionary<Guid, GameAsset> FilterOutAssets(params Type[] types)
             return builder.ToImmutableDictionary();
         }
 
-        public PixelFont GetFont(int index)
+        public PixelFont GetFont(int index, bool cultureInvariant = false)
         {
-            if (_game is not null)
+            if (_game is not null && !cultureInvariant)
             {
                 index = _game.GetLocalizedFont(index);
             }

diff --git a/src/Murder/Services/MurderFonts.cs b/src/Murder/Services/MurderFonts.cs
@@ -30,4 +30,10 @@ public static float GetLineWidth(this MurderFonts font, string text)
     {
         return GetLineWidth((int)font, text);
     }
+
+    public static int GetFontHeight(this MurderFonts font)
+    {
+        PixelFont f = Game.Data.GetFont((int)font);
+        return f.LineHeight;
+    }
 }
diff --git a/src/Murder/Services/RenderServices.cs b/src/Murder/Services/RenderServices.cs
@@ -987,9 +987,10 @@ public static Point DrawText(this Batch2D uiBatch, MurderFonts font, string text
         => DrawText(uiBatch, (int)font, text, position, maxWidth, -1, drawInfo ?? DrawInfo.Default);
     public static Point DrawText(this Batch2D uiBatch, MurderFonts font, string text, Vector2 position, int maxWidth, int visibleCharacters, DrawInfo? drawInfo = default)
         => DrawText(uiBatch, (int)font, text, position, maxWidth, visibleCharacters, drawInfo ?? DrawInfo.Default);
+
     public static Point DrawText(this Batch2D uiBatch, int pixelFont, string text, Vector2 position, int maxWidth, int visibleCharacters, DrawInfo drawInfo)
     {
-        var font = Game.Data.GetFont(pixelFont);
+        var font = Game.Data.GetFont(pixelFont, cultureInvariant: drawInfo.CultureInvariant);
         return font.Draw(uiBatch, text, position + drawInfo.Offset, drawInfo.Origin, drawInfo.Scale, drawInfo.Sort, drawInfo.Color, drawInfo.Outline, drawInfo.Shadow, maxWidth, visibleCharacters, drawInfo.Debug);
     }