From 87492c1f0b8fcacb189af85178961db0cd5bf650 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 28 Apr 2024 22:25:00 +0900 Subject: [PATCH] better text scaling support --- src/net/torvald/terrarumsansbitmap/MovableType.kt | 4 ++-- src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/net/torvald/terrarumsansbitmap/MovableType.kt b/src/net/torvald/terrarumsansbitmap/MovableType.kt index 9b32e54..aeda203 100644 --- a/src/net/torvald/terrarumsansbitmap/MovableType.kt +++ b/src/net/torvald/terrarumsansbitmap/MovableType.kt @@ -20,7 +20,7 @@ import kotlin.math.* class MovableType( val font: TerrarumSansBitmap, val inputText: CodepointSequence, - val paperWidth: Int, + paperWidth: Int, internal val isNull: Boolean = false ): Disposable { @@ -285,7 +285,7 @@ class MovableType( font.drawNormalised(batch, it.block.text, x + it.posX, - y + lineNum * lineHeight + y + lineNum * lineHeight * font.scale ) if (it.colour != null) diff --git a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt index 1d75666..59519fb 100755 --- a/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt @@ -766,10 +766,10 @@ class TerrarumSansBitmap( val cacheObj = getCache(s.getHash()) if (cacheObj != null) { - return cacheObj.glyphLayout!!.width + return cacheObj.glyphLayout!!.width * scale } else { - return buildPosMap(s).width + return buildPosMap(s).width * scale } }