LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.5b: added additional handling for missing characters

Browse Source
This commit is contained in:
Evan Debenham 2019-10-12 19:12:29 -04:00
parent 1dd4f66acd
commit 84fa9daa5f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
View File

@ -93,7 +93,8 @@ public class RenderedText extends Image {
GlyphLayout glyphs = new GlyphLayout( font, text);
for (char c : text.toCharArray()) {
if (font.getData().getGlyph(c) == null){
BitmapFont.Glyph g = font.getData().getGlyph(c);
if (g == null || (g.id != c)){
Game.reportException(new Throwable("font file " + font.toString() + " could not render " + c));
}
}
@ -101,7 +102,7 @@ public class RenderedText extends Image {
//We use the xadvance of the last glyph in some cases to fix issues
// with fullwidth punctuation marks in some asian scripts
BitmapFont.Glyph lastGlyph = font.getData().getGlyph(text.charAt(text.length()-1));
if (lastGlyph.xadvance > lastGlyph.width*1.5f){
if (lastGlyph != null && lastGlyph.xadvance > lastGlyph.width*1.5f){
width = glyphs.width - lastGlyph.width + lastGlyph.xadvance;
} else {
width = glyphs.width;

4
android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
View File

@ -316,7 +316,9 @@ public class AndroidPlatformSupport extends PlatformSupport {
parameters.characters = "";
parameters.packer = packer;
fonts.get(generator).put(size, generator.generateFont(parameters));
BitmapFont font = generator.generateFont(parameters);
font.getData().missingGlyph = font.getData().getGlyph('<27>');
fonts.get(generator).put(size, font);
}
return fonts.get(generator).get(size);