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

v0.7.5b: overhauled font selection to be significantly more flexible

Browse Source
This commit is contained in:
Evan Debenham 2019-10-13 20:50:57 -04:00
parent dd78fe74a0
commit adaca2531e
3 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,42 +90,51 @@ public class RenderedText extends Image {
font = Game.platform.getFont(size, text); font = Game.platform.getFont(size, text);
GlyphLayout glyphs = new GlyphLayout( font, text); if (font != null){
GlyphLayout glyphs = new GlyphLayout( font, text);
for (char c : text.toCharArray()) { for (char c : text.toCharArray()) {
BitmapFont.Glyph g = font.getData().getGlyph(c); BitmapFont.Glyph g = font.getData().getGlyph(c);
if (g == null || (g.id != c)){ if (g == null || (g.id != c)){
Game.reportException(new Throwable("font file " + font.toString() + " could not render " + c)); Game.reportException(new Throwable("font file " + font.toString() + " could not render " + c));
}
} }
}
//We use the xadvance of the last glyph in some cases to fix issues //We use the xadvance of the last glyph in some cases to fix issues
// with fullwidth punctuation marks in some asian scripts // with fullwidth punctuation marks in some asian scripts
BitmapFont.Glyph lastGlyph = font.getData().getGlyph(text.charAt(text.length()-1)); BitmapFont.Glyph lastGlyph = font.getData().getGlyph(text.charAt(text.length()-1));
if (lastGlyph != null && lastGlyph.xadvance > lastGlyph.width*1.5f){ if (lastGlyph != null && lastGlyph.xadvance > lastGlyph.width*1.5f){
width = glyphs.width - lastGlyph.width + lastGlyph.xadvance; width = glyphs.width - lastGlyph.width + lastGlyph.xadvance;
} else { } else {
width = glyphs.width; width = glyphs.width;
} }
//this is identical to l.height in most cases, but we force this for consistency. //this is identical to l.height in most cases, but we force this for consistency.
height = Math.round(size*0.75f); height = Math.round(size*0.75f);
renderedHeight = glyphs.height;
}
} }
private float renderedHeight = 0;
@Override @Override
protected void updateMatrix() { protected void updateMatrix() {
super.updateMatrix(); super.updateMatrix();
//the y value is set at the top of the character, not at the top of accents. //sometimes the font is rendered oddly, so we offset here to put it in the correct spot
Matrix.translate( matrix, 0, Math.round(size*Game.platform.getFontHeightOffset(font))); if (renderedHeight != height) {
Matrix.translate(matrix, 0, Math.round(height - renderedHeight));
}
} }
private static TextRenderBatch textRenderer = new TextRenderBatch(); private static TextRenderBatch textRenderer = new TextRenderBatch();
@Override @Override
public synchronized void draw() { public synchronized void draw() {
updateMatrix(); if (font != null) {
TextRenderBatch.textBeingRendered = this; updateMatrix();
font.draw(textRenderer, text, 0, 0); TextRenderBatch.textBeingRendered = this;
font.draw(textRenderer, text, 0, 0);
}
} }
//implements regular PD rendering within a LibGDX batch so that our rendering logic //implements regular PD rendering within a LibGDX batch so that our rendering logic

2
SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java
View File

@ -48,6 +48,4 @@ public abstract class PlatformSupport {
public abstract String[] splitforTextBlock( String text, boolean multiline ); public abstract String[] splitforTextBlock( String text, boolean multiline );
public abstract float getFontHeightOffset( BitmapFont font );
} }

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

@ -180,7 +180,8 @@ public class AndroidPlatformSupport extends PlatformSupport {
private static HashMap<FreeTypeFontGenerator, HashMap<Integer, BitmapFont>> fonts; private static HashMap<FreeTypeFontGenerator, HashMap<Integer, BitmapFont>> fonts;
private boolean android6OTFPresent = false; //special logic for handling korean android 6.0 font oddities
private static boolean koreanAndroid6OTF = false;
@Override @Override
public void setupFontGenerators(int pageSize, boolean systemfont) { public void setupFontGenerators(int pageSize, boolean systemfont) {
@ -208,8 +209,9 @@ public class AndroidPlatformSupport extends PlatformSupport {
} }
} }
fonts = new HashMap<>(); fonts = new HashMap<>();
basicFontGenerator = KRFontGenerator = SCFontGenerator = JPFontGenerator = null;
if (systemfont){ if (systemfont && Gdx.files.absolute("/system/fonts/DroidSans.ttf").exists()){
basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSans.ttf")); basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSans.ttf"));
} else { } else {
//FIXME should probably add more latin/cyrillic glyphs to this //FIXME should probably add more latin/cyrillic glyphs to this
@ -217,48 +219,62 @@ public class AndroidPlatformSupport extends PlatformSupport {
basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf"));
} }
//android 7.0+. Finally back to normalcy, everything nicely in one .ttc //android 7.0+. all asian fonts are nicely contained in one spot
if (Gdx.files.absolute("/system/fonts/NotoSansCJK-Regular.ttc").exists()) { if (Gdx.files.absolute("/system/fonts/NotoSansCJK-Regular.ttc").exists()) {
//typefaces are 0-JP, 1-KR, 2-SC, 3-TC. //typefaces are 0-JP, 1-KR, 2-SC, 3-TC.
int typeFace; int typeFace;
switch (SPDSettings.language()){ switch (SPDSettings.language()) {
case JAPANESE: case JAPANESE:
typeFace = 0; typeFace = 0;
break; break;
case KOREAN: case KOREAN:
typeFace = 1; typeFace = 1;
break; break;
case CHINESE: default: case CHINESE:
default:
typeFace = 2; typeFace = 2;
} }
KRFontGenerator = SCFontGenerator = JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansCJK-Regular.ttc"), typeFace); KRFontGenerator = SCFontGenerator = JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansCJK-Regular.ttc"), typeFace);
//android 6.0. Fonts are split over multiple .otf files, very awkward //otherwise we have to go over a few possibilities.
} else if (Gdx.files.absolute("/system/fonts/NotoSansKR-Regular.otf").exists()) {
KRFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansKR-Regular.otf"));
SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf"));
JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansJP-Regular.otf"));
android6OTFPresent = true;
//android 4.4-5.1. Korean no longer broken with the addition of NanumGothic.
} else if (Gdx.files.absolute("/system/fonts/NanumGothic.ttf").exists()){
KRFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NanumGothic.ttf"));
SCFontGenerator = JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSansFallback.ttf"));
//android 4.3-. Note that korean isn't in DroidSandFallback and is therefore unfixably broken on 4.2 and 4.3
} else if (Gdx.files.absolute("/system/fonts/DroidSansFallback.ttf").exists()) {
//TODO consider setting KRFontGenerator to null here on android 4.3 to 4.2 to communicate that the font is broken.
KRFontGenerator = SCFontGenerator = JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSansFallback.ttf"));
//shouldn't ever trigger, but just in case
} else { } else {
KRFontGenerator = SCFontGenerator = JPFontGenerator = basicFontGenerator;
//Korean font generators
if (Gdx.files.absolute("/system/fonts/NanumGothic.ttf").exists()){
KRFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NanumGothic.ttf"));
} else if (Gdx.files.absolute("/system/fonts/NotoSansKR-Regular.otf").exists()){
KRFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansKR-Regular.otf"));
}
//Chinese font generators
if (Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf").exists()){
SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf"));
}
//Japaneses font generators
if (Gdx.files.absolute("/system/fonts/NotoSansJP-Regular.otf").exists()){
JPFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansJP-Regular.otf"));
}
//set up a fallback generator for any remaining fonts
FreeTypeFontGenerator fallbackGenerator;
if (Gdx.files.absolute("/system/fonts/DroidSansFallback.ttf").exists()){
fallbackGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSansFallback.ttf"));
} else {
//no fallback font, just set to null =/
fallbackGenerator = null;
}
if (KRFontGenerator == null) KRFontGenerator = fallbackGenerator;
if (SCFontGenerator == null) SCFontGenerator = fallbackGenerator;
if (JPFontGenerator == null) JPFontGenerator = fallbackGenerator;
} }
fonts.put(basicFontGenerator, basicFonts); if (basicFontGenerator != null) fonts.put(basicFontGenerator, basicFonts);
fonts.put(KRFontGenerator, KRFonts); if (KRFontGenerator != null) fonts.put(KRFontGenerator, KRFonts);
fonts.put(SCFontGenerator, SCFonts); if (SCFontGenerator != null) fonts.put(SCFontGenerator, SCFonts);
fonts.put(JPFontGenerator, JPFonts); if (JPFontGenerator != null) fonts.put(JPFontGenerator, JPFonts);
//use RGBA4444 to save memory. Extra precision isn't needed here. //use RGBA4444 to save memory. Extra precision isn't needed here.
packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA4444, 1, false); packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA4444, 1, false);
@ -304,6 +320,10 @@ public class AndroidPlatformSupport extends PlatformSupport {
public BitmapFont getFont(int size, String text) { public BitmapFont getFont(int size, String text) {
FreeTypeFontGenerator generator = getGeneratorForString(text); FreeTypeFontGenerator generator = getGeneratorForString(text);
if (generator == null){
return null;
}
if (!fonts.get(generator).containsKey(size)) { if (!fonts.get(generator).containsKey(size)) {
FreeTypeFontGenerator.FreeTypeFontParameter parameters = new FreeTypeFontGenerator.FreeTypeFontParameter(); FreeTypeFontGenerator.FreeTypeFontParameter parameters = new FreeTypeFontGenerator.FreeTypeFontParameter();
parameters.size = size; parameters.size = size;
@ -349,7 +369,7 @@ public class AndroidPlatformSupport extends PlatformSupport {
@Override @Override
public String[] splitforTextBlock(String text, boolean multiline) { public String[] splitforTextBlock(String text, boolean multiline) {
if (android6OTFPresent && getGeneratorForString(text) == KRFontGenerator){ if (koreanAndroid6OTF && getGeneratorForString(text) == KRFontGenerator){
return android6KRSplitter.split(text); return android6KRSplitter.split(text);
} else if (multiline) { } else if (multiline) {
return regularsplitterMultiline.split(text); return regularsplitterMultiline.split(text);
@ -358,12 +378,4 @@ public class AndroidPlatformSupport extends PlatformSupport {
} }
} }
public float getFontHeightOffset( BitmapFont font ){
//more weirdness with android 6 OTF fonts
if (android6OTFPresent && !basicFonts.containsValue(font)){
return -0.25f;
} else {
return 0.0f;
}
}
} }