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

v0.7.5b: fixed various errors with android font setup/splitting

Browse Source
This commit is contained in:
Evan Debenham 2019-10-12 15:01:39 -04:00
parent 18349b146e
commit ccd5a108e9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,9 +315,7 @@ public class AndroidPlatformSupport extends PlatformSupport {
parameters.characters = ""; parameters.characters = "";
parameters.packer = packer; parameters.packer = packer;
BitmapFont font = generator.generateFont(parameters); fonts.get(generator).put(size, generator.generateFont(parameters));
font.getData().missingGlyph = font.getData().getGlyph('<27>');
fonts.get(generator).put(size, font);
} }
return fonts.get(generator).get(size); return fonts.get(generator).get(size);
@ -329,7 +327,7 @@ public class AndroidPlatformSupport extends PlatformSupport {
"(?<=\\p{InHiragana})|(?=\\p{InHiragana})|" + "(?<=\\p{InHiragana})|(?=\\p{InHiragana})|" +
"(?<=\\p{InKatakana})|(?=\\p{InKatakana})|" + "(?<=\\p{InKatakana})|(?=\\p{InKatakana})|" +
"(?<=\\p{InCJK_Unified_Ideographs})|(?=\\p{InCJK_Unified_Ideographs})|" + "(?<=\\p{InCJK_Unified_Ideographs})|(?=\\p{InCJK_Unified_Ideographs})|" +
"(?<=\\p{InCJK_Symbols_and_Punctuation})|(?=\\p{InCJK_Symbols_and_Punctuation})|"); "(?<=\\p{InCJK_Symbols_and_Punctuation})|(?=\\p{InCJK_Symbols_and_Punctuation})");
//additionally splits on words, so that each word can be arranged individually //additionally splits on words, so that each word can be arranged individually
private Pattern regularsplitterMultiline = Pattern.compile( private Pattern regularsplitterMultiline = Pattern.compile(
@ -337,7 +335,7 @@ public class AndroidPlatformSupport extends PlatformSupport {
"(?<=\\p{InHiragana})|(?=\\p{InHiragana})|" + "(?<=\\p{InHiragana})|(?=\\p{InHiragana})|" +
"(?<=\\p{InKatakana})|(?=\\p{InKatakana})|" + "(?<=\\p{InKatakana})|(?=\\p{InKatakana})|" +
"(?<=\\p{InCJK_Unified_Ideographs})|(?=\\p{InCJK_Unified_Ideographs})|" + "(?<=\\p{InCJK_Unified_Ideographs})|(?=\\p{InCJK_Unified_Ideographs})|" +
"(?<=\\p{InCJK_Symbols_and_Punctuation})|(?=\\p{InCJK_Symbols_and_Punctuation})|"); "(?<=\\p{InCJK_Symbols_and_Punctuation})|(?=\\p{InCJK_Symbols_and_Punctuation})");
//splits on each group of hangul syllables. Needed for weird android 6.0 font files //splits on each group of hangul syllables. Needed for weird android 6.0 font files
private Pattern android6KRSplitter = Pattern.compile( private Pattern android6KRSplitter = Pattern.compile(