From cefc7860b3e643d7b524601d3efeba9afe8d13e2 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 9 Sep 2018 19:51:43 +0900
Subject: [PATCH] new armenian (#10)

- Redesigned glyphs
- Update to Unicode 11 (2 chrs added)
---
 FontTestGDX/src/FontTestGDX.kt                |   2 +-
 assets/hayeren_variable.tga                   | Bin 122924 -> 122924 bytes
 .../terrarumsansbitmap/gdx/GameFontBase.kt    |  18 +++----
 .../gdx/TextureRegionPack.kt                  |  45 ++++++++++++------
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/FontTestGDX/src/FontTestGDX.kt b/FontTestGDX/src/FontTestGDX.kt
index 87a7c57..17e1f08 100644
--- a/FontTestGDX/src/FontTestGDX.kt
+++ b/FontTestGDX/src/FontTestGDX.kt
@@ -27,7 +27,7 @@ class FontTestGDX : Game() {
     private val outimageName = "demo.png"
 
     override fun create() {
-        font = GameFontBase("./assets", flipY = false, errorOnUnknownChar = false) // must test for two flipY cases
+        font = GameFontBase("./assets", flipY = false, errorOnUnknownChar = true) // must test for two flipY cases
 
         val inTextFile = Gdx.files.internal("./$demotextName")
         val reader = inTextFile.reader("UTF-8")
diff --git a/assets/hayeren_variable.tga b/assets/hayeren_variable.tga
index 9764076783ea3a5a24d41e52532e28fbbce68e44..cf346898e206d47be4cd166f2779d3d284e4638e 100644
GIT binary patch
delta 3980
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
EU*n)5W&i*H

delta 3711
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

diff --git a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
index ea2d756..81eb6bd 100644
--- a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
@@ -386,6 +386,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
             val isVariable1 = it.endsWith("_variable.tga")
             val isVariable2 = variableWidthSheets.contains(index)
             val isVariable = isVariable1 && isVariable2
+            val isXYSwapped = it.contains("xyswap", true)
 
             // idiocity check
             if (isVariable1 && !isVariable2)
@@ -442,7 +443,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
 
             val texture = Texture(pixmap)
             val texRegPack = if (isVariable) {
-                TextureRegionPack(texture, W_VAR_INIT, H, HGAP_VAR, 0)
+                TextureRegionPack(texture, W_VAR_INIT, H, HGAP_VAR, 0, xySwapped = isXYSwapped)
             }
             else if (index == SHEET_UNIHAN) {
                 TextureRegionPack(texture, W_UNIHAN, H_UNIHAN) // the only exception that is height is 16
@@ -592,8 +593,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
                         charsetOverride = c - CHARSET_OVERRIDE_DEFAULT
                     }
                     else if (sheetID == SHEET_HANGUL) {
-                        // FIXME input text is normalised as Initial-Peak-Final
-                        // requires lookahead for {I, P, F}
+                        // Flookahead for {I, P, F}
 
                         val cNext = if (index + 1 <= textBuffer.size) textBuffer[index + 1] else 0
                         val cNextNext = if (index + 2 <= textBuffer.size) textBuffer[index + 2] else 0
@@ -607,12 +607,12 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
                         val hangulSheet = sheets[SHEET_HANGUL]
 
 
-                        println("${c.toHex()} ${cNext.toHex()} ${cNextNext.toHex()}")
-                        println("I: $indexCho,\t$choRow")
-                        println("P: $indexJung,\t$jungRow")
-                        println("F: $indexJong,\t$jongRow")
-                        println("skip: $hangulLength")
-                        println("====")
+                        //println("${c.toHex()} ${cNext.toHex()} ${cNextNext.toHex()}")
+                        //println("I: $indexCho,\t$choRow")
+                        //println("P: $indexJung,\t$jungRow")
+                        //println("F: $indexJong,\t$jongRow")
+                        //println("skip: $hangulLength")
+                        //println("====")
 
 
                         when (run) {
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt b/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt
index f7675a9..3713636 100644
--- a/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt
@@ -38,13 +38,14 @@ class TextureRegionPack(
         val hGap: Int = 0,
         val vGap: Int = 0,
         val hFrame: Int = 0,
-        val vFrame: Int = 0
+        val vFrame: Int = 0,
+        val xySwapped: Boolean = false // because Unicode chart does, duh
 ) {
 
-    constructor(ref: String, tileW: Int, tileH: Int, hGap: Int = 0, vGap: Int = 0, hFrame: Int = 0, vFrame: Int = 0) :
-            this(Texture(ref), tileW, tileH, hGap, vGap, hFrame, vFrame)
-    constructor(fileHandle: FileHandle, tileW: Int, tileH: Int, hGap: Int = 0, vGap: Int = 0, hFrame: Int = 0, vFrame: Int = 0) :
-            this(Texture(fileHandle), tileW, tileH, hGap, vGap, hFrame, vFrame)
+    constructor(ref: String, tileW: Int, tileH: Int, hGap: Int = 0, vGap: Int = 0, hFrame: Int = 0, vFrame: Int = 0, xySwapped: Boolean = false) :
+            this(Texture(ref), tileW, tileH, hGap, vGap, hFrame, vFrame, xySwapped)
+    constructor(fileHandle: FileHandle, tileW: Int, tileH: Int, hGap: Int = 0, vGap: Int = 0, hFrame: Int = 0, vFrame: Int = 0, xySwapped: Boolean = false) :
+            this(Texture(fileHandle), tileW, tileH, hGap, vGap, hFrame, vFrame, xySwapped)
 
     companion object {
         /** Intented for Y-down coord system, typically fon Non-GDX codebase */
@@ -59,18 +60,34 @@ class TextureRegionPack(
     init {
         //println("texture: $texture, dim: ${texture.width} x ${texture.height}, grid: $horizontalCount x $verticalCount, cellDim: $tileW x $tileH")
 
-        regions = Array<TextureRegion>(horizontalCount * verticalCount, {
-            val region = TextureRegion()
-            val rx = (it % horizontalCount * (tileW + hGap)) + hFrame
-            val ry = (it / horizontalCount * (tileH + vGap)) + vFrame
+        if (!xySwapped) {
+            regions = Array<TextureRegion>(horizontalCount * verticalCount, {
+                val region = TextureRegion()
+                val rx = (it % horizontalCount * (tileW + hGap)) + hFrame
+                val ry = (it / horizontalCount * (tileH + vGap)) + vFrame
 
-            region.setRegion(texture)
-            region.setRegion(rx, ry, tileW, tileH)
+                region.setRegion(texture)
+                region.setRegion(rx, ry, tileW, tileH)
 
-            region.flip(false, globalFlipY)
+                region.flip(false, globalFlipY)
 
-            /*return*/region
-        })
+                /*return*/region
+            })
+        }
+        else {
+            regions = Array<TextureRegion>(horizontalCount * verticalCount, {
+                val region = TextureRegion()
+                val rx = (it % verticalCount * (tileW + hGap)) + hFrame
+                val ry = (it / verticalCount * (tileH + vGap)) + vFrame
+
+                region.setRegion(texture)
+                region.setRegion(ry, rx, tileW, tileH)
+
+                region.flip(false, globalFlipY)
+
+                /*return*/region
+            })
+        }
     }
 
     fun get(x: Int, y: Int) = regions[y * horizontalCount + x]