amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-15 15:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves ArgmentNulLException When Loading BitmapFont From Disk. (#924)

Browse Source 
* Correctly swap rayNear and rayFar distance

* Retrieve bmfFile.Path when reading from stream
This closes #923

* Return null if character not found.
This is used for line feed characters.S
This commit is contained in:
Christopher Whitley
2024-07-11 22:24:34 -04:00
committed by GitHub
parent f1fbf9c4b8
commit 3ca0a3ef2a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/MonoGame.Extended/BitmapFonts/BitmapFont.cs
+2 -2
View File
@@ -38,7 +38,7 @@ public sealed class BitmapFont
}
}
public BitmapFontCharacter GetCharacter(int character) => _characters[character];
public BitmapFontCharacter GetCharacter(int character) => _characters.TryGetValue(character, out BitmapFontCharacter fontCharacter) ? fontCharacter : null;/* _characters[character];*/
public bool TryGetCharacter(int character, out BitmapFontCharacter value) => _characters.TryGetValue(character, out value);
public SizeF MeasureString(string text)
@@ -378,7 +378,7 @@ public sealed class BitmapFont
{
if (!pages.ContainsKey(bmfFile.Pages[i]))
{
string texturePath = Path.Combine(bmfFile.Path, bmfFile.Pages[i]);
string texturePath = Path.Combine(Path.GetDirectoryName(bmfFile.Path), bmfFile.Pages[i]);
using (Stream textureStream = File.OpenRead(texturePath))
{
Texture2D texture = Texture2D.FromStream(graphicsDevice, textureStream);
source/MonoGame.Extended/Content/BitmapFonts/BitmapFontFileReader.cs
+2
View File
@@ -60,6 +60,8 @@ public static class BitmapFontFileReader
_ => throw new InvalidOperationException("This does not appear to be a valid BMFont file!")
};
bmfFile.Path = stream.Name;
return bmfFile;
}