From ce31a5a6ef49e5d04b663b3217ec471dad1cae58 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 28 Nov 2021 12:42:34 +0900
Subject: [PATCH] making use of the long-neglected scale variable

---
 .../gdx/TerrarumSansBitmap.kt                 | 30 +++++++------------
 .../gdx/TerrarumTypewriterBitmap.kt           | 19 ++++--------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
index 335d769..db4b747 100755
--- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
@@ -306,12 +306,11 @@ class TerrarumSansBitmap(
         glyphProps[0] = GlyphProps(0)
     }
 
-    override fun getLineHeight(): Float = H.toFloat()
-
-    override fun getXHeight() = 8f
-    override fun getCapHeight() = 12f
-    override fun getAscent() = 3f
-    override fun getDescent() = 3f
+    override fun getLineHeight(): Float = H.toFloat() * scale
+    override fun getXHeight() = 8f * scale
+    override fun getCapHeight() = 12f * scale
+    override fun getAscent() = 3f * scale
+    override fun getDescent() = 3f * scale
     override fun isFlipped() = flipY
 
     override fun setFixedWidthGlyphs(glyphs: CharSequence) {
@@ -495,19 +494,12 @@ class TerrarumSansBitmap(
                 tempLinotype = cacheObj.glyphLayout!!.linotype
             }
 
-
-            if (!flipY) {
-                batch.draw(tempLinotype, x.toFloat(), (y - pixmapOffsetY).toFloat())
-            }
-            else {
-                batch.draw(tempLinotype,
-                        x.toFloat(),
-                        (y - pixmapOffsetY + (tempLinotype.height)).toFloat(),
-                        (tempLinotype.width.toFloat()),
-                        -(tempLinotype.height.toFloat())
-                )
-            }
-
+            batch.draw(tempLinotype,
+                    x.toFloat(),
+                    (y - pixmapOffsetY).toFloat() + (if (flipY) (tempLinotype.height) else 0) * scale,
+                    tempLinotype.width.toFloat() * scale,
+                    (tempLinotype.height.toFloat()) * (if (flipY) -1 else 1) * scale
+            )
         }
 
         return null
diff --git a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
index 4d7321b..0a2e8d0 100644
--- a/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
+++ b/src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
@@ -384,19 +384,12 @@ class TerrarumTypewriterBitmap(
                 tempLinotype = cacheObj.glyphLayout!!.linotype
             }
 
-
-            if (!flipY) {
-                batch.draw(tempLinotype, (x - linotypePad).toFloat(), (y - pixmapOffsetY).toFloat())
-            }
-            else {
-                batch.draw(tempLinotype,
-                    (x - linotypePad).toFloat(),
-                    (y - pixmapOffsetY + (tempLinotype.height)).toFloat(),
-                    (tempLinotype.width.toFloat()),
-                    -(tempLinotype.height.toFloat())
-                )
-            }
-
+            batch.draw(tempLinotype,
+                (x - linotypePad).toFloat(),
+                (y - pixmapOffsetY).toFloat() + (if (flipY) (tempLinotype.height) else 0),
+                (tempLinotype.width.toFloat()),
+                (tempLinotype.height.toFloat()) * (if (flipY) -1 else 1)
+            )
         }
 
         return null