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

v0.7.5c: fixed additional errors with font setup

Browse Source
This commit is contained in:
Evan Debenham 2019-10-16 14:11:07 -04:00
parent b4eb0bdb70
commit a46a5abf49
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,11 +211,11 @@ public class AndroidPlatformSupport extends PlatformSupport {
fonts = new HashMap<>(); fonts = new HashMap<>();
basicFontGenerator = KRFontGenerator = SCFontGenerator = JPFontGenerator = null; basicFontGenerator = KRFontGenerator = SCFontGenerator = JPFontGenerator = null;
if (systemfont && Gdx.files.absolute("/system/fonts/DroidSans.ttf").exists()){ if (systemfont && Gdx.files.absolute("/system/fonts/Roboto-Regular.ttf").exists()) {
basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/Roboto-Regular.ttf"));
} else 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
//and go over translations
basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf"));
} }
@ -251,8 +251,6 @@ public class AndroidPlatformSupport extends PlatformSupport {
if (Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf").exists()){ if (Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf").exists()){
SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf")); SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansSC-Regular.otf"));
} else if (Gdx.files.absolute("/system/fonts/NotoSansHans-Regular.otf").exists()){ } else if (Gdx.files.absolute("/system/fonts/NotoSansHans-Regular.otf").exists()){
//TODO this seems to also have a lot of JP characters.
// Might be cases where this font shows up and NotoSansJP is mostly empty =S
SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansHans-Regular.otf")); SCFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/NotoSansHans-Regular.otf"));
} }
@ -281,13 +279,8 @@ public class AndroidPlatformSupport extends PlatformSupport {
if (SCFontGenerator != null) fonts.put(SCFontGenerator, SCFonts); if (SCFontGenerator != null) fonts.put(SCFontGenerator, SCFonts);
if (JPFontGenerator != null) fonts.put(JPFontGenerator, JPFonts); if (JPFontGenerator != null) fonts.put(JPFontGenerator, JPFonts);
String renderer = Gdx.gl.glGetString(Gdx.gl.GL_RENDERER); //would be nice to use RGBA4444 to save memory, but this causes problems on some gpus =S
//want to use RGBA4444 to save memory if we can, but this causes problems on Mali gpus packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA8888, 1, false);
if (renderer.contains("Mali") || renderer.contains("mali")) {
packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA8888, 1, false);
} else {
packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA4444, 1, false);
}
} }
@Override @Override