diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7119cde..8d80387 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,6 +7,7 @@ + @@ -31,8 +32,8 @@ - - + + @@ -67,7 +68,7 @@ - + @@ -77,11 +78,11 @@ - + - - + + @@ -97,17 +98,17 @@ - - + + - + - - + + @@ -139,7 +140,6 @@ - xHei not copy getColour .094 @@ -169,6 +169,7 @@ !! ArrayList<Int> appConfig.height + textBuffer .141 @@ -193,8 +194,8 @@ @@ -466,6 +467,7 @@ + @@ -477,7 +479,7 @@ - + @@ -854,13 +856,6 @@ - - - - - - - @@ -868,20 +863,6 @@ - - - - - - - - - - - - - - @@ -907,19 +888,40 @@ + + + + + + + + + + + + + + - - + + + + + + + + + diff --git a/FontTestGDX/demotext.txt b/FontTestGDX/demotext.txt index 4f5417e..9da4a90 100644 --- a/FontTestGDX/demotext.txt +++ b/FontTestGDX/demotext.txt @@ -32,7 +32,7 @@ How multilingual? Real multilingual! 􌿽Příliš žluťoučký kůň úpěl ďábelské ódy􀀀 􌿽Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon􀀀 􌿽Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich􀀀 - 􌿽διαφυλάξτε γενικά τη ζωή σας από βαθειά ψυχικά τραύματα􀀀 + 􌿽ζαφείρι δέξου πάγκαλο, βαθων ψυχης το σημα􀀀 􌿽ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ􀀀 􌿽სწრაფი ყავისფერი მელა გადაახტა ზარმაც ძაღლს􀀀 􌿽Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa􀀀 diff --git a/FontTestGDX/lib/TerrarumSansBitmap.jar b/FontTestGDX/lib/TerrarumSansBitmap.jar index d2d8c0b..113684b 100644 Binary files a/FontTestGDX/lib/TerrarumSansBitmap.jar and b/FontTestGDX/lib/TerrarumSansBitmap.jar differ diff --git a/FontTestGDX/src/FontTestGDX.kt b/FontTestGDX/src/FontTestGDX.kt index 74e8bfd..e50f95f 100644 --- a/FontTestGDX/src/FontTestGDX.kt +++ b/FontTestGDX/src/FontTestGDX.kt @@ -204,6 +204,9 @@ class FontTestGDX : Game() { batch.begin() batch.color = Color.WHITE batch.draw(tex, 0f, (TEXH.toFloat()/appConfig.height)*TEXH - scrollOffsetY, TEXW.toFloat(), -(TEXH.toFloat() / appConfig.height) * TEXH.toFloat()) + + + font.draw(batch, "TESTTESTTEST", 0f, 0f) batch.end() } diff --git a/demo.PNG b/demo.PNG index 55fadd7..d7a7e08 100644 Binary files a/demo.PNG and b/demo.PNG differ diff --git a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt index 3bc7267..da0f309 100644 --- a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt @@ -411,8 +411,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo private var nullProp = GlyphProps(15, 0) - override fun draw(batch: Batch, str: CharSequence, x: Float, y: Float): GlyphLayout? { - val str = str.toCodePoints() + + override fun draw(batch: Batch, charSeq: CharSequence, x: Float, y: Float): GlyphLayout? { + val str = charSeq.toCodePoints() fun Int.flipY() = this * if (flipY) 1 else -1 @@ -424,6 +425,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo if (textBuffer != str) { textBuffer = str + //println(textBuffer) val widths = getWidthOfCharSeq(str) glyphWidthBuffer = widths