diff --git a/.idea/artifacts/TerrarumSansBitmap.xml b/.idea/artifacts/TerrarumSansBitmap.xml
index b94e179..f6e98a8 100755
--- a/.idea/artifacts/TerrarumSansBitmap.xml
+++ b/.idea/artifacts/TerrarumSansBitmap.xml
@@ -1,12 +1,12 @@
-
+
$PROJECT_DIR$/lib
-
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
old mode 100755
new mode 100644
index 57f05c9..e6b0e38
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,7 +1,13 @@
+
+
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
index 1a7265d..2712b1f 100644
--- a/.idea/libraries/KotlinJavaRuntime.xml
+++ b/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,19 +1,33 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9c0199b..6f29fee 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bddf969..43e0a43 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,24 +9,77 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -43,13 +96,31 @@
+
+
+
+
+
+
@@ -60,9 +131,20 @@
+
+
+
+
+
+
+
+ {
+ "customColor": "",
+ "associatedIndex": 2
+}
@@ -70,13 +152,31 @@
{
"keyToString": {
+ "Kotlin.FontTestGDXKt.executor": "Debug",
+ "Kotlin.TypewriterGDXKt.executor": "Debug",
+ "RunOnceActivity.CodyAccountHistoryMigration": "true",
+ "RunOnceActivity.CodyAccountsIdsRefresh": "true",
+ "RunOnceActivity.CodyAssignOrphanedChatsToActiveAccount": "true",
+ "RunOnceActivity.CodyConvertUrlToCodebaseName": "true",
+ "RunOnceActivity.CodyHistoryLlmMigration": "true",
+ "RunOnceActivity.CodyMigrateChatHistory-v2": "true",
+ "RunOnceActivity.CodyProjectSettingsMigration": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ToggleCodyToolWindowAfterMigration": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "git-widget-placeholder": "master",
+ "kotlin-language-version-configured": "true",
"last_opened_file_path": "/home/torvald/Documents/Terrarum-sans-bitmap",
- "project.structure.last.edited": "Artifacts",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.0"
+ "project.structure.last.edited": "Modules",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.20724516",
+ "settings.editor.selected.configurable": "project.kotlinCompiler"
}
}
+
+
+
@@ -90,6 +190,15 @@
+
+
+
+
+
+
+
+
+
@@ -133,6 +242,12 @@
+
+
+
+
+
+
@@ -148,15 +263,6 @@
-
-
-
-
-
-
-
-
-
@@ -198,6 +321,11 @@
+
+
+
+
+
diff --git a/BuildJAR_TerrarumSansBitmap.iml b/BuildJAR_TerrarumSansBitmap.iml
index 4a11a15..15f4e25 100644
--- a/BuildJAR_TerrarumSansBitmap.iml
+++ b/BuildJAR_TerrarumSansBitmap.iml
@@ -1,13 +1,15 @@
-
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/FontTestGDX/FontTestGDX.iml b/FontTestGDX/FontTestGDX.iml
index a9a0ded..0a25d35 100644
--- a/FontTestGDX/FontTestGDX.iml
+++ b/FontTestGDX/FontTestGDX.iml
@@ -5,9 +5,9 @@
-
+
-
+
diff --git a/FontTestGDX/src/FontTestGDX.kt b/FontTestGDX/src/FontTestGDX.kt
index 645d53b..d9b4d4d 100755
--- a/FontTestGDX/src/FontTestGDX.kt
+++ b/FontTestGDX/src/FontTestGDX.kt
@@ -45,7 +45,7 @@ class FontTestGDX : Game() {
private lateinit var testtex: TextureRegion
override fun create() {
- font = TerrarumSansBitmap("./assets", debug = true, flipY = false, errorOnUnknownChar = false, shadowAlpha = 0.5f) // must test for two flipY cases
+ font = TerrarumSansBitmap(debug = true, flipY = false, errorOnUnknownChar = false, shadowAlpha = 0.5f) // must test for two flipY cases
// font.scale = 2
// font.interchar = 1
diff --git a/FontTestGDX/src/TypewriterGDX.kt b/FontTestGDX/src/TypewriterGDX.kt
index a72d71a..49529a3 100644
--- a/FontTestGDX/src/TypewriterGDX.kt
+++ b/FontTestGDX/src/TypewriterGDX.kt
@@ -39,7 +39,6 @@ class TypewriterGDX(val width: Int, val height: Int, val cols: Int, val hmargin:
override fun create() {
font = TerrarumTypewriterBitmap(
- "./assets/typewriter",
StringReader(
"""ko_kr_3set-390_typewriter,typewriter_ko_3set-390.tga,16
|en_intl_qwerty_typewriter,typewriter_intl_qwerty.tga,0
@@ -61,17 +60,17 @@ class TypewriterGDX(val width: Int, val height: Int, val cols: Int, val hmargin:
inputStrober = InputStrober(this)
try {
- sndMovingkey = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/movingkey.wav"))
- sndDeadkey = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/deadkey.wav"))
- sndShiftin = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/shiftin.wav"))
- sndShiftout = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/shiftout.wav"))
- sndSpace = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/space.wav"))
+ sndMovingkey = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/movingkey.wav"))
+ sndDeadkey = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/deadkey.wav"))
+ sndShiftin = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/shiftin.wav"))
+ sndShiftout = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/shiftout.wav"))
+ sndSpace = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/space.wav"))
sndCRs = Array(6) {
- Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/cr$it.wav"))
+ Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/cr$it.wav"))
}
- sndLF = Gdx.audio.newSound(Gdx.files.internal("assets/typewriter/audio/crlf.wav"))
+ sndLF = Gdx.audio.newSound(Gdx.files.classpath("assets/typewriter/audio/crlf.wav"))
}
catch (e: GdxRuntimeException) {
e.printStackTrace()
diff --git a/LICENSE.md b/LICENSE.md
index 0c62778..d6ad03c 100755
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024 CuriousTorvald (minjaesong)
+Copyright (c) 2017-2026 CuriousTorvald (minjaesong)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/assets/typewriter/typewriter_intl_qwerty.tga b/assets/typewriter/typewriter_intl_qwerty.tga
deleted file mode 100644
index 747db2e..0000000
Binary files a/assets/typewriter/typewriter_intl_qwerty.tga and /dev/null differ
diff --git a/assets/typewriter/typewriter_ko_3set-390.tga b/assets/typewriter/typewriter_ko_3set-390.tga
deleted file mode 100644
index 81f4729..0000000
Binary files a/assets/typewriter/typewriter_ko_3set-390.tga and /dev/null differ
diff --git a/assets/wenquanyi.tga.gz b/assets/wenquanyi.tga.gz
deleted file mode 100755
index b5b3fa0..0000000
Binary files a/assets/wenquanyi.tga.gz and /dev/null differ
diff --git a/samples/wikipedia_x86.png b/samples/wikipedia_x86.png
index 30f4b51..7bb3f53 100755
Binary files a/samples/wikipedia_x86.png and b/samples/wikipedia_x86.png differ
diff --git a/assets/alphabetic_presentation_forms_extrawide_variable.tga b/src/assets/alphabetic_presentation_forms_extrawide_variable.tga
similarity index 100%
rename from assets/alphabetic_presentation_forms_extrawide_variable.tga
rename to src/assets/alphabetic_presentation_forms_extrawide_variable.tga
diff --git a/assets/ascii_variable.tga b/src/assets/ascii_variable.tga
similarity index 100%
rename from assets/ascii_variable.tga
rename to src/assets/ascii_variable.tga
diff --git a/assets/bengali_variable.tga b/src/assets/bengali_variable.tga
similarity index 100%
rename from assets/bengali_variable.tga
rename to src/assets/bengali_variable.tga
diff --git a/assets/braille_variable.tga b/src/assets/braille_variable.tga
similarity index 100%
rename from assets/braille_variable.tga
rename to src/assets/braille_variable.tga
diff --git a/assets/cjkpunct_variable.tga b/src/assets/cjkpunct_variable.tga
similarity index 100%
rename from assets/cjkpunct_variable.tga
rename to src/assets/cjkpunct_variable.tga
diff --git a/assets/control_pictures_variable.tga b/src/assets/control_pictures_variable.tga
similarity index 100%
rename from assets/control_pictures_variable.tga
rename to src/assets/control_pictures_variable.tga
diff --git a/assets/currencies_variable.tga b/src/assets/currencies_variable.tga
similarity index 100%
rename from assets/currencies_variable.tga
rename to src/assets/currencies_variable.tga
diff --git a/assets/cyrilic_bulgarian_variable.tga b/src/assets/cyrilic_bulgarian_variable.tga
similarity index 100%
rename from assets/cyrilic_bulgarian_variable.tga
rename to src/assets/cyrilic_bulgarian_variable.tga
diff --git a/assets/cyrilic_serbian_variable.tga b/src/assets/cyrilic_serbian_variable.tga
similarity index 100%
rename from assets/cyrilic_serbian_variable.tga
rename to src/assets/cyrilic_serbian_variable.tga
diff --git a/assets/cyrilic_variable.tga b/src/assets/cyrilic_variable.tga
similarity index 100%
rename from assets/cyrilic_variable.tga
rename to src/assets/cyrilic_variable.tga
diff --git a/assets/devanagari_internal_extrawide_variable.tga b/src/assets/devanagari_internal_extrawide_variable.tga
similarity index 100%
rename from assets/devanagari_internal_extrawide_variable.tga
rename to src/assets/devanagari_internal_extrawide_variable.tga
diff --git a/assets/devanagari_variable.tga b/src/assets/devanagari_variable.tga
similarity index 100%
rename from assets/devanagari_variable.tga
rename to src/assets/devanagari_variable.tga
diff --git a/assets/diacritical_marks_variable.tga b/src/assets/diacritical_marks_variable.tga
similarity index 100%
rename from assets/diacritical_marks_variable.tga
rename to src/assets/diacritical_marks_variable.tga
diff --git a/assets/enclosed_alphanumeric_supplement_variable.tga b/src/assets/enclosed_alphanumeric_supplement_variable.tga
similarity index 100%
rename from assets/enclosed_alphanumeric_supplement_variable.tga
rename to src/assets/enclosed_alphanumeric_supplement_variable.tga
diff --git a/assets/futhark.tga b/src/assets/futhark.tga
similarity index 100%
rename from assets/futhark.tga
rename to src/assets/futhark.tga
diff --git a/assets/greek_polytonic_xyswap_variable.tga b/src/assets/greek_polytonic_xyswap_variable.tga
similarity index 100%
rename from assets/greek_polytonic_xyswap_variable.tga
rename to src/assets/greek_polytonic_xyswap_variable.tga
diff --git a/assets/greek_variable.tga b/src/assets/greek_variable.tga
similarity index 100%
rename from assets/greek_variable.tga
rename to src/assets/greek_variable.tga
diff --git a/assets/halfwidth_fullwidth_variable.tga b/src/assets/halfwidth_fullwidth_variable.tga
similarity index 100%
rename from assets/halfwidth_fullwidth_variable.tga
rename to src/assets/halfwidth_fullwidth_variable.tga
diff --git a/assets/hangul_johab.tga b/src/assets/hangul_johab.tga
similarity index 100%
rename from assets/hangul_johab.tga
rename to src/assets/hangul_johab.tga
diff --git a/assets/hayeren_variable.tga b/src/assets/hayeren_variable.tga
similarity index 100%
rename from assets/hayeren_variable.tga
rename to src/assets/hayeren_variable.tga
diff --git a/assets/hentaigana_variable.tga b/src/assets/hentaigana_variable.tga
similarity index 100%
rename from assets/hentaigana_variable.tga
rename to src/assets/hentaigana_variable.tga
diff --git a/assets/internal_variable.tga b/src/assets/internal_variable.tga
similarity index 100%
rename from assets/internal_variable.tga
rename to src/assets/internal_variable.tga
diff --git a/assets/ipa_ext_variable.tga b/src/assets/ipa_ext_variable.tga
similarity index 100%
rename from assets/ipa_ext_variable.tga
rename to src/assets/ipa_ext_variable.tga
diff --git a/assets/kana_variable.tga b/src/assets/kana_variable.tga
similarity index 100%
rename from assets/kana_variable.tga
rename to src/assets/kana_variable.tga
diff --git a/assets/kartuli_allcaps_variable.tga b/src/assets/kartuli_allcaps_variable.tga
similarity index 100%
rename from assets/kartuli_allcaps_variable.tga
rename to src/assets/kartuli_allcaps_variable.tga
diff --git a/assets/kartuli_variable.tga b/src/assets/kartuli_variable.tga
similarity index 100%
rename from assets/kartuli_variable.tga
rename to src/assets/kartuli_variable.tga
diff --git a/assets/latinExtA_variable.tga b/src/assets/latinExtA_variable.tga
similarity index 100%
rename from assets/latinExtA_variable.tga
rename to src/assets/latinExtA_variable.tga
diff --git a/assets/latinExtB_variable.tga b/src/assets/latinExtB_variable.tga
similarity index 100%
rename from assets/latinExtB_variable.tga
rename to src/assets/latinExtB_variable.tga
diff --git a/assets/latinExtC_variable.tga b/src/assets/latinExtC_variable.tga
similarity index 100%
rename from assets/latinExtC_variable.tga
rename to src/assets/latinExtC_variable.tga
diff --git a/assets/latinExtD_variable.tga b/src/assets/latinExtD_variable.tga
similarity index 100%
rename from assets/latinExtD_variable.tga
rename to src/assets/latinExtD_variable.tga
diff --git a/assets/latinExt_additional_variable.tga b/src/assets/latinExt_additional_variable.tga
similarity index 100%
rename from assets/latinExt_additional_variable.tga
rename to src/assets/latinExt_additional_variable.tga
diff --git a/assets/letterlike_symbols_variable.tga b/src/assets/letterlike_symbols_variable.tga
similarity index 100%
rename from assets/letterlike_symbols_variable.tga
rename to src/assets/letterlike_symbols_variable.tga
diff --git a/assets/phonetic_extensions_variable.tga b/src/assets/phonetic_extensions_variable.tga
similarity index 100%
rename from assets/phonetic_extensions_variable.tga
rename to src/assets/phonetic_extensions_variable.tga
diff --git a/assets/pua_codestyle_ascii_variable.tga b/src/assets/pua_codestyle_ascii_variable.tga
similarity index 100%
rename from assets/pua_codestyle_ascii_variable.tga
rename to src/assets/pua_codestyle_ascii_variable.tga
diff --git a/assets/puae000-e0ff.tga b/src/assets/puae000-e0ff.tga
similarity index 100%
rename from assets/puae000-e0ff.tga
rename to src/assets/puae000-e0ff.tga
diff --git a/assets/richtext_furigana.tga b/src/assets/richtext_furigana.tga
similarity index 100%
rename from assets/richtext_furigana.tga
rename to src/assets/richtext_furigana.tga
diff --git a/assets/sundanese_variable.tga b/src/assets/sundanese_variable.tga
similarity index 100%
rename from assets/sundanese_variable.tga
rename to src/assets/sundanese_variable.tga
diff --git a/assets/tamil_extrawide_variable.tga b/src/assets/tamil_extrawide_variable.tga
similarity index 100%
rename from assets/tamil_extrawide_variable.tga
rename to src/assets/tamil_extrawide_variable.tga
diff --git a/assets/thai_variable.tga b/src/assets/thai_variable.tga
similarity index 100%
rename from assets/thai_variable.tga
rename to src/assets/thai_variable.tga
diff --git a/assets/tsalagi_variable.tga b/src/assets/tsalagi_variable.tga
similarity index 100%
rename from assets/tsalagi_variable.tga
rename to src/assets/tsalagi_variable.tga
diff --git a/assets/typewriter/audio/cr0.wav b/src/assets/typewriter/audio/cr0.wav
similarity index 100%
rename from assets/typewriter/audio/cr0.wav
rename to src/assets/typewriter/audio/cr0.wav
diff --git a/assets/typewriter/audio/cr1.wav b/src/assets/typewriter/audio/cr1.wav
similarity index 100%
rename from assets/typewriter/audio/cr1.wav
rename to src/assets/typewriter/audio/cr1.wav
diff --git a/assets/typewriter/audio/cr2.wav b/src/assets/typewriter/audio/cr2.wav
similarity index 100%
rename from assets/typewriter/audio/cr2.wav
rename to src/assets/typewriter/audio/cr2.wav
diff --git a/assets/typewriter/audio/cr3.wav b/src/assets/typewriter/audio/cr3.wav
similarity index 100%
rename from assets/typewriter/audio/cr3.wav
rename to src/assets/typewriter/audio/cr3.wav
diff --git a/assets/typewriter/audio/cr4.wav b/src/assets/typewriter/audio/cr4.wav
similarity index 100%
rename from assets/typewriter/audio/cr4.wav
rename to src/assets/typewriter/audio/cr4.wav
diff --git a/assets/typewriter/audio/cr5.wav b/src/assets/typewriter/audio/cr5.wav
similarity index 100%
rename from assets/typewriter/audio/cr5.wav
rename to src/assets/typewriter/audio/cr5.wav
diff --git a/assets/typewriter/audio/crlf.wav b/src/assets/typewriter/audio/crlf.wav
similarity index 100%
rename from assets/typewriter/audio/crlf.wav
rename to src/assets/typewriter/audio/crlf.wav
diff --git a/assets/typewriter/audio/deadkey.wav b/src/assets/typewriter/audio/deadkey.wav
similarity index 100%
rename from assets/typewriter/audio/deadkey.wav
rename to src/assets/typewriter/audio/deadkey.wav
diff --git a/assets/typewriter/audio/movingkey.wav b/src/assets/typewriter/audio/movingkey.wav
similarity index 100%
rename from assets/typewriter/audio/movingkey.wav
rename to src/assets/typewriter/audio/movingkey.wav
diff --git a/assets/typewriter/audio/shiftin.wav b/src/assets/typewriter/audio/shiftin.wav
similarity index 100%
rename from assets/typewriter/audio/shiftin.wav
rename to src/assets/typewriter/audio/shiftin.wav
diff --git a/assets/typewriter/audio/shiftout.wav b/src/assets/typewriter/audio/shiftout.wav
similarity index 100%
rename from assets/typewriter/audio/shiftout.wav
rename to src/assets/typewriter/audio/shiftout.wav
diff --git a/assets/typewriter/audio/space.wav b/src/assets/typewriter/audio/space.wav
similarity index 100%
rename from assets/typewriter/audio/space.wav
rename to src/assets/typewriter/audio/space.wav
diff --git a/src/assets/typewriter/typewriter_intl_qwerty.tga b/src/assets/typewriter/typewriter_intl_qwerty.tga
new file mode 100644
index 0000000..f25878c
--- /dev/null
+++ b/src/assets/typewriter/typewriter_intl_qwerty.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a687bc5962b83bfd960193e456d2ad8858ce74dfa7fe51d64686f680cba12df
+size 327698
diff --git a/src/assets/typewriter/typewriter_ko_3set-390.tga b/src/assets/typewriter/typewriter_ko_3set-390.tga
new file mode 100644
index 0000000..6ebe6f7
--- /dev/null
+++ b/src/assets/typewriter/typewriter_ko_3set-390.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:158944ae7f9a4e061ed09810682daf1c929df00ca8e2324a6e47b51a2dc1e4ab
+size 327698
diff --git a/assets/unipunct_variable.tga b/src/assets/unipunct_variable.tga
similarity index 100%
rename from assets/unipunct_variable.tga
rename to src/assets/unipunct_variable.tga
diff --git a/src/assets/wenquanyi.tga b/src/assets/wenquanyi.tga
new file mode 100644
index 0000000..eece48a
--- /dev/null
+++ b/src/assets/wenquanyi.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf27e854dd3c311e5eaded800a4e157eada963ebafb75dc95a53c14c57359c8e
+size 28311596
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 3e96019..4780e99 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -1,7 +1,7 @@
/*
* Terrarum Sans Bitmap
*
- * Copyright (c) 2017-2024 see CONTRIBUTORS.txt
+ * Copyright (c) 2017-2026 see CONTRIBUTORS.txt
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -227,7 +227,6 @@ internal typealias Hash = Long
* Created by minjaesong on 2017-06-15.
*/
class TerrarumSansBitmap(
- fontDir: String,
val noShadow: Boolean = false,
val flipY: Boolean = false,
val invertShadow: Boolean = false,
@@ -240,7 +239,7 @@ class TerrarumSansBitmap(
private fun dbgprn(i: Any) { if (debug) println("[${this.javaClass.simpleName}] $i") }
- constructor(fontDir: String, noShadow: Boolean, flipY: Boolean, invertShadow: Boolean) : this(fontDir, noShadow, flipY, invertShadow, false, 256, false)
+ constructor(noShadow: Boolean, flipY: Boolean, invertShadow: Boolean) : this(noShadow, flipY, invertShadow, false, 256, false)
/* This font is a collection of various subsystems, and thus contains copious amount of quick-and-dirty codes.
*
@@ -318,7 +317,7 @@ class TerrarumSansBitmap(
private val colourBuffer = HashMap()
- private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
+// private val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
/** Props of all printable Unicode points. */
@@ -354,11 +353,11 @@ class TerrarumSansBitmap(
// unpack gz if applicable
- if (it.endsWith(".gz")) {
+ /*if (it.endsWith(".gz")) {
val tmpFilePath = tempDir + "/tmp_${it.dropLast(7)}.tga"
try {
- val gzi = GZIPInputStream(Gdx.files.internal(fontParentDir + it).read(8192))
+ val gzi = GZIPInputStream(Gdx.files.classpath(fontParentDir + it).read(8192))
val wholeFile = gzi.readBytes()
gzi.close()
val fos = BufferedOutputStream(FileOutputStream(tmpFilePath))
@@ -377,12 +376,12 @@ class TerrarumSansBitmap(
}
//File(tmpFileName).delete()
}
- else {
+ else {*/
try {
- pixmap = Pixmap(Gdx.files.internal(fontParentDir + it))
+ pixmap = Pixmap(Gdx.files.classpath("assets/$it"))
}
- catch (e: GdxRuntimeException) {
- //e.printStackTrace()
+ catch (e: Throwable) {
+ e.printStackTrace()
dbgprn("said texture not found, skipping...")
// if non-ascii chart is missing, replace it with null sheet
@@ -393,7 +392,7 @@ class TerrarumSansBitmap(
System.exit(1)
}
}
- }
+ //}
if (isVariable) buildWidthTable(pixmap, codeRange[index], if (isExtraWide) 32 else 16)
buildWidthTableFixed()
diff --git a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
index 42218d9..5733671 100644
--- a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
+++ b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
@@ -35,7 +35,6 @@ import kotlin.math.roundToInt
* Created by minjaesong on 2021-11-04.
*/
class TerrarumTypewriterBitmap(
- fontDir: String,
configFile: Reader,
val flipY: Boolean = false,
var errorOnUnknownChar: Boolean = false,
@@ -108,8 +107,6 @@ class TerrarumTypewriterBitmap(
}
init {
- val fontParentDir = if (fontDir.endsWith('/') || fontDir.endsWith('\\')) fontDir else "$fontDir/"
-
configFile.forEachLine {
if (!it.startsWith("#")) {
val csv = it.split(',')
@@ -133,11 +130,11 @@ class TerrarumTypewriterBitmap(
println("[TerrarumTypewriterBitmap] loading texture $filename [VARIABLE]")
// unpack gz if applicable
- if (filename.endsWith(".gz")) {
+ /*if (filename.endsWith(".gz")) {
val tmpFileName = "tmp_${filename.dropLast(7)}.tga"
try {
- val gzi = GZIPInputStream(Gdx.files.internal(fontParentDir + filename).read(8192))
+ val gzi = GZIPInputStream(Gdx.files.classpath(filename).read(8192))
val wholeFile = gzi.readBytes()
gzi.close()
val fos = BufferedOutputStream(FileOutputStream(tmpFileName))
@@ -145,7 +142,7 @@ class TerrarumTypewriterBitmap(
fos.flush()
fos.close()
- pixmap = Pixmap(Gdx.files.internal(tmpFileName))
+ pixmap = Pixmap(Gdx.files.classpath(tmpFileName))
}
catch (e: GdxRuntimeException) {
//e.printStackTrace()
@@ -155,16 +152,16 @@ class TerrarumTypewriterBitmap(
}
//File(tmpFileName).delete()
}
- else {
+ else {*/
pixmap = try {
- Pixmap(Gdx.files.internal(fontParentDir + filename))
+ Pixmap(Gdx.files.classpath(filename))
} catch (e: GdxRuntimeException) {
//e.printStackTrace()
System.err.println("[TerrarumTypewriterBitmap] said texture not found, skipping...")
Pixmap(1, 1, Pixmap.Format.RGBA8888)
}
- }
+ //}
val cpstart = codepointStart[key]!!
buildWidthTable(pixmap, cpstart until cpstart + 256, 16)
diff --git a/terrarum_sans_cyrillic_2.png b/terrarum_sans_cyrillic_2.png
index 4954502..00970ef 100755
Binary files a/terrarum_sans_cyrillic_2.png and b/terrarum_sans_cyrillic_2.png differ
diff --git a/work_files/typewriter_input/alphnum_glyphs_master.kra b/work_files/typewriter_input/alphnum_glyphs_master.kra
index dee8011..309662d 100644
Binary files a/work_files/typewriter_input/alphnum_glyphs_master.kra and b/work_files/typewriter_input/alphnum_glyphs_master.kra differ
diff --git a/work_files/typewriter_input/alphnum_glyphs_resized.kra b/work_files/typewriter_input/alphnum_glyphs_resized.kra
index 9021b8f..61b85f8 100644
Binary files a/work_files/typewriter_input/alphnum_glyphs_resized.kra and b/work_files/typewriter_input/alphnum_glyphs_resized.kra differ
diff --git a/work_files/typewriter_input/hangul_3set_glyphs_master.kra b/work_files/typewriter_input/hangul_3set_glyphs_master.kra
index 8d3ad56..0449f89 100644
Binary files a/work_files/typewriter_input/hangul_3set_glyphs_master.kra and b/work_files/typewriter_input/hangul_3set_glyphs_master.kra differ
diff --git a/work_files/typewriter_input/typewriter_input_template.psd b/work_files/typewriter_input/typewriter_input_template.psd
index fdcb3fe..991b115 100644
Binary files a/work_files/typewriter_input/typewriter_input_template.psd and b/work_files/typewriter_input/typewriter_input_template.psd differ
diff --git a/work_files/typewriter_input/typewriter_intl_qwerty.psd b/work_files/typewriter_input/typewriter_intl_qwerty.psd
index 32780c3..25325ef 100644
Binary files a/work_files/typewriter_input/typewriter_intl_qwerty.psd and b/work_files/typewriter_input/typewriter_intl_qwerty.psd differ
diff --git a/work_files/typewriter_input/typewriter_ko_3set-390.psd b/work_files/typewriter_input/typewriter_ko_3set-390.psd
index 56dc9bc..2a99997 100644
Binary files a/work_files/typewriter_input/typewriter_ko_3set-390.psd and b/work_files/typewriter_input/typewriter_ko_3set-390.psd differ
diff --git a/work_files/typewriter_input/typewriter_ko_3set_glyphs_resized.kra b/work_files/typewriter_input/typewriter_ko_3set_glyphs_resized.kra
index c845858..5fa289b 100644
Binary files a/work_files/typewriter_input/typewriter_ko_3set_glyphs_resized.kra and b/work_files/typewriter_input/typewriter_ko_3set_glyphs_resized.kra differ