diff --git a/FontTestGDX/src/TypewriterGDX.kt b/FontTestGDX/src/TypewriterGDX.kt index f417ae1..035d166 100644 --- a/FontTestGDX/src/TypewriterGDX.kt +++ b/FontTestGDX/src/TypewriterGDX.kt @@ -30,7 +30,9 @@ class TypewriterGDX(val width: Int, val height: Int) : Game() { override fun create() { font = TerrarumTypewriterBitmap( "./assets/typewriter", - StringReader("ko_kr_3set-390_typewriter,typewriter_ko_3set-390.tga,16"), + StringReader("""ko_kr_3set-390_typewriter,typewriter_ko_3set-390.tga,16 + |en_intl_qwerty_typewriter,typewriter_intl_qwerty.tga,0 + """.trimMargin()), true, false, 256, true ) @@ -53,7 +55,7 @@ class TypewriterGDX(val width: Int, val height: Int) : Game() { 42,31, // nc (HANG_SE) 74,48,51, // ;tw (HANG_BEOL) 62, // space - 184,69,171,170, // >-ON (ASC_3-90) + 184,164,171,170, // >HON (ASC_3-90) 62, // space 75,34, // 'f (HANG_TA) 40,34, // lf (HANG_JA) @@ -62,14 +64,16 @@ class TypewriterGDX(val width: Int, val height: Int) : Game() { CodepointSequence(/* new line */) ) + private val printableKeys = ((Input.Keys.NUM_0..Input.Keys.NUM_9) + (Input.Keys.A..Input.Keys.PERIOD) + 62 + (Input.Keys.BACKSPACE..Input.Keys.SLASH)).toHashSet() + fun acceptKey(keycode: Int) { // println("[TypewriterGDX] Accepting key: $keycode") if (keycode == Input.Keys.ENTER) { textbuf.add(CodepointSequence()) } - else { - textbuf.last().add(keycode + 0xF3000) + else if (printableKeys.contains(keycode and 127)) { + textbuf.last().add(keycode + 0xF2000) } } @@ -125,7 +129,7 @@ fun main(args: Array) { appConfig.useVsync(false) appConfig.setResizable(false) appConfig.setWindowedMode(600, 800) - appConfig.setTitle("Terrarum Sans Bitmap Test") + appConfig.setTitle("Terrarum Typewriter Bitmap Test") Lwjgl3Application(TypewriterGDX(600, 800), appConfig) } diff --git a/assets/typewriter/typewriter_intl_qwerty.tga b/assets/typewriter/typewriter_intl_qwerty.tga new file mode 100644 index 0000000..9ee0be8 Binary files /dev/null and b/assets/typewriter/typewriter_intl_qwerty.tga differ diff --git a/assets/typewriter/typewriter_ko_3set-390.tga b/assets/typewriter/typewriter_ko_3set-390.tga index c6cf6d0..325230c 100644 Binary files a/assets/typewriter/typewriter_ko_3set-390.tga and b/assets/typewriter/typewriter_ko_3set-390.tga differ diff --git a/work_files/typewriter_input/alphnum_glyphs_master.kra b/work_files/typewriter_input/alphnum_glyphs_master.kra index 3ed69be..a975822 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/typewriter_intl_qwerty.psd b/work_files/typewriter_input/typewriter_intl_qwerty.psd new file mode 100644 index 0000000..191fec5 Binary files /dev/null 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 f6dccaa..fa0c523 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