curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-06-10 16:04:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

vietnamese: it was horn, not comma...

Browse Source
This commit is contained in:
minjaesong
2017-07-12 22:24:34 +09:00
parent cf1ac67cb0
commit 73c4e96359
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/latinExt_additional_variable.tga
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 320 KiB

After

Width:  |  Height:  |  Size: 320 KiB

22
src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
View File

@@ -122,6 +122,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
private fun isIPA(c: Char) = c.toInt() in codeRange[SHEET_IPA_VARW] private fun isIPA(c: Char) = c.toInt() in codeRange[SHEET_IPA_VARW]
private fun isColourCodeHigh(c: Char) = c.toInt() in 0b110110_1111000000..0b110110_1111111111 private fun isColourCodeHigh(c: Char) = c.toInt() in 0b110110_1111000000..0b110110_1111111111
private fun isColourCodeLow(c: Char) = c.toInt() in 0b110111_0000000000..0b110111_1111111111 private fun isColourCodeLow(c: Char) = c.toInt() in 0b110111_0000000000..0b110111_1111111111
private fun isLatinExtAdd(c: Char) = c.toInt() in 0x1E00..0x1EFF
@@ -170,6 +171,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
private fun ipaIndexX(c: Char) = (c.toInt() - 0x250) % 16 private fun ipaIndexX(c: Char) = (c.toInt() - 0x250) % 16
private fun ipaIndexY(c: Char) = (c.toInt() - 0x250) / 16 private fun ipaIndexY(c: Char) = (c.toInt() - 0x250) / 16
private fun latinExtAddX(c: Char) = (c.toInt() - 0x1E00) % 16
private fun latinExtAddY(c: Char) = (c.toInt() - 0x1E00) / 16
private fun getColour(charHigh: Char, charLow: Char): Color { // input: 0x10ARGB, out: RGBA8888 private fun getColour(charHigh: Char, charLow: Char): Color { // input: 0x10ARGB, out: RGBA8888
val codePoint = Character.toCodePoint(charHigh, charLow) val codePoint = Character.toCodePoint(charHigh, charLow)
@@ -204,15 +208,16 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
SHEET_THAI_VARW, SHEET_THAI_VARW,
SHEET_HAYEREN_VARW, SHEET_HAYEREN_VARW,
SHEET_KARTULI_VARW, SHEET_KARTULI_VARW,
SHEET_IPA_VARW SHEET_IPA_VARW,
SHEET_LATIN_EXT_ADD
) )
private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/" private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
private val fileList = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!! private val fileList = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!!
"ascii_variable.tga", "ascii_variable.tga",
"hangul_johab.tga", "hangul_johab.tga",
"LatinExtA_variable.tga", "latinExtA_variable.tga",
"LatinExtB_variable.tga", "latinExtB_variable.tga",
"kana.tga", "kana.tga",
"cjkpunct.tga", "cjkpunct.tga",
"wenquanyi.tga.gz", "wenquanyi.tga.gz",
@@ -225,6 +230,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
"kartuli_variable.tga", "kartuli_variable.tga",
"ipa_ext_variable.tga", "ipa_ext_variable.tga",
"futhark.tga", "futhark.tga",
"latinExt_additional_variable.tga",
"puae000-e0ff.tga" "puae000-e0ff.tga"
) )
private val cyrilic_bg = "cyrilic_bulgarian_variable.tga" private val cyrilic_bg = "cyrilic_bulgarian_variable.tga"
@@ -246,6 +252,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
0x10D0..0x10FF, 0x10D0..0x10FF,
0x250..0x2AF, 0x250..0x2AF,
0x16A0..0x16FF, 0x16A0..0x16FF,
0x1E00..0x1EFF,
0xE000..0xE0FF 0xE000..0xE0FF
) )
private val glyphWidths: HashMap<Int, Int> = HashMap() // if the value is negative, it's diacritics private val glyphWidths: HashMap<Int, Int> = HashMap() // if the value is negative, it's diacritics
@@ -628,6 +635,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
return SHEET_IPA_VARW return SHEET_IPA_VARW
else if (isRunic(c)) else if (isRunic(c))
return SHEET_RUNIC return SHEET_RUNIC
else if (isLatinExtAdd(c))
return SHEET_LATIN_EXT_ADD
else else
return SHEET_UNKNOWN return SHEET_UNKNOWN
// fixed width // fixed width
@@ -697,6 +706,10 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
sheetX = runicIndexX(ch) sheetX = runicIndexX(ch)
sheetY = runicIndexY(ch) sheetY = runicIndexY(ch)
} }
SHEET_LATIN_EXT_ADD -> {
sheetX = latinExtAddX(ch)
sheetY = latinExtAddY(ch)
}
else -> { else -> {
sheetX = ch.toInt() % 16 sheetX = ch.toInt() % 16
sheetY = ch.toInt() / 16 sheetY = ch.toInt() / 16
@@ -789,7 +802,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
internal val SHEET_KARTULI_VARW = 13 internal val SHEET_KARTULI_VARW = 13
internal val SHEET_IPA_VARW = 14 internal val SHEET_IPA_VARW = 14
internal val SHEET_RUNIC = 15 internal val SHEET_RUNIC = 15
internal val SHEET_CUSTOM_SYM = 16 internal val SHEET_LATIN_EXT_ADD = 16
internal val SHEET_CUSTOM_SYM = 17
internal val SHEET_UNKNOWN = 254 internal val SHEET_UNKNOWN = 254

22
src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt
View File

@@ -55,6 +55,7 @@ import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_IPA_VARW
import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_CUSTOM_SYM import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_CUSTOM_SYM
import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_UNKNOWN import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_UNKNOWN
import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_RUNIC import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_RUNIC
import net.torvald.terrarumsansbitmap.gdx.GameFontBase.Companion.SHEET_LATIN_EXT_ADD
import org.newdawn.slick.Color import org.newdawn.slick.Color
import org.newdawn.slick.Font import org.newdawn.slick.Font
import org.newdawn.slick.Image import org.newdawn.slick.Image
@@ -68,7 +69,7 @@ import java.util.*
import java.util.zip.GZIPInputStream import java.util.zip.GZIPInputStream
/** /**
* LibGDX port of Terrarum Sans Bitmap implementation * LibGDX->Slick2D back-port of Terrarum Sans Bitmap implementation
* *
* Filename and Extension for the spritesheet is hard-coded, which are: * Filename and Extension for the spritesheet is hard-coded, which are:
* *
@@ -155,6 +156,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
private fun isIPA(c: Char) = c.toInt() in codeRange[SHEET_IPA_VARW] private fun isIPA(c: Char) = c.toInt() in codeRange[SHEET_IPA_VARW]
private fun isColourCodeHigh(c: Char) = c.toInt() in 0b110110_1111000000..0b110110_1111111111 private fun isColourCodeHigh(c: Char) = c.toInt() in 0b110110_1111000000..0b110110_1111111111
private fun isColourCodeLow(c: Char) = c.toInt() in 0b110111_0000000000..0b110111_1111111111 private fun isColourCodeLow(c: Char) = c.toInt() in 0b110111_0000000000..0b110111_1111111111
private fun isLatinExtAdd(c: Char) = c.toInt() in 0x1E00..0x1EFF
@@ -204,6 +206,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
private fun ipaIndexX(c: Char) = (c.toInt() - 0x250) % 16 private fun ipaIndexX(c: Char) = (c.toInt() - 0x250) % 16
private fun ipaIndexY(c: Char) = (c.toInt() - 0x250) / 16 private fun ipaIndexY(c: Char) = (c.toInt() - 0x250) / 16
private fun latinExtAddX(c: Char) = (c.toInt() - 0x1E00) % 16
private fun latinExtAddY(c: Char) = (c.toInt() - 0x1E00) / 16
private fun getColour(charHigh: Char, charLow: Char): Color { // input: 0x10ARGB, out: RGBA8888 private fun getColour(charHigh: Char, charLow: Char): Color { // input: 0x10ARGB, out: RGBA8888
val codePoint = Character.toCodePoint(charHigh, charLow) val codePoint = Character.toCodePoint(charHigh, charLow)
@@ -238,15 +243,16 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
SHEET_THAI_VARW, SHEET_THAI_VARW,
SHEET_HAYEREN_VARW, SHEET_HAYEREN_VARW,
SHEET_KARTULI_VARW, SHEET_KARTULI_VARW,
SHEET_IPA_VARW SHEET_IPA_VARW,
SHEET_LATIN_EXT_ADD
) )
private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/" private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
private val fileList = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!! private val fileList = arrayOf( // MUST BE MATCHING WITH SHEET INDICES!!
"ascii_variable.tga", "ascii_variable.tga",
"hangul_johab.tga", "hangul_johab.tga",
"LatinExtA_variable.tga", "latinExtA_variable.tga",
"LatinExtB_variable.tga", "latinExtB_variable.tga",
"kana.tga", "kana.tga",
"cjkpunct.tga", "cjkpunct.tga",
"wenquanyi.tga.gz", "wenquanyi.tga.gz",
@@ -259,6 +265,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
"kartuli_variable.tga", "kartuli_variable.tga",
"ipa_ext_variable.tga", "ipa_ext_variable.tga",
"futhark.tga", "futhark.tga",
"latinExt_additional_variable.tga",
"puae000-e0ff.tga" "puae000-e0ff.tga"
) )
private val cyrilic_bg = "cyrilic_bulgarian_variable.tga" private val cyrilic_bg = "cyrilic_bulgarian_variable.tga"
@@ -280,6 +287,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
0x10D0..0x10FF, 0x10D0..0x10FF,
0x250..0x2AF, 0x250..0x2AF,
0x16A0..0x16FF, 0x16A0..0x16FF,
0x1E00..0x1EFF,
0xE000..0xE0FF 0xE000..0xE0FF
) )
private val glyphWidths: HashMap<Int, Int> = HashMap() // if the value is negative, it's diacritics private val glyphWidths: HashMap<Int, Int> = HashMap() // if the value is negative, it's diacritics
@@ -634,6 +642,8 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
return SHEET_IPA_VARW return SHEET_IPA_VARW
else if (isRunic(c)) else if (isRunic(c))
return SHEET_RUNIC return SHEET_RUNIC
else if (isLatinExtAdd(c))
return SHEET_LATIN_EXT_ADD
else else
return SHEET_UNKNOWN return SHEET_UNKNOWN
// fixed width // fixed width
@@ -703,6 +713,10 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false) : Font {
sheetX = runicIndexX(ch) sheetX = runicIndexX(ch)
sheetY = runicIndexY(ch) sheetY = runicIndexY(ch)
} }
SHEET_LATIN_EXT_ADD -> {
sheetX = latinExtAddX(ch)
sheetY = latinExtAddY(ch)
}
else -> { else -> {
sheetX = ch.toInt() % 16 sheetX = ch.toInt() % 16
sheetY = ch.toInt() / 16 sheetY = ch.toInt() / 16