curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-03-07 20:01:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

control chars for movabletype

Browse Source
This commit is contained in:
minjaesong
2024-04-28 01:18:21 +09:00
parent d87b0dce7c
commit 66c1a1357a
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarumsansbitmap/MovableType.kt
View File

@@ -1,5 +1,6 @@
package net.torvald.terrarumsansbitmap package net.torvald.terrarumsansbitmap
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.graphics.g2d.Batch
import com.badlogic.gdx.utils.Disposable import com.badlogic.gdx.utils.Disposable
import net.torvald.terrarumsansbitmap.gdx.CodePoint import net.torvald.terrarumsansbitmap.gdx.CodePoint
@@ -278,19 +279,29 @@ class MovableType(
val tex = it.block.glyphLayout!!.linotype val tex = it.block.glyphLayout!!.linotype
val linotypeScaleOffsetX = -TerrarumSansBitmap.linotypePaddingX * (font.scale - 1) val linotypeScaleOffsetX = -TerrarumSansBitmap.linotypePaddingX * (font.scale - 1)
val linotypeScaleOffsetY = -TerrarumSansBitmap.linotypePaddingY * (font.scale - 1) * (if (font.flipY) -1 else 1) val linotypeScaleOffsetY = -TerrarumSansBitmap.linotypePaddingY * (font.scale - 1) * (if (font.flipY) -1 else 1)
lateinit var oldColour: Color
if (it.colour != null) {
oldColour = batch.color.cpy()
batch.color = it.colour
}
batch.draw(tex, batch.draw(tex,
x + it.posX * font.scale - 16 + linotypeScaleOffsetX.toFloat(), x + it.posX * font.scale - 16 + linotypeScaleOffsetX.toFloat(),
y + lineNum * (lineHeight * font.scale) - 8 + linotypeScaleOffsetY.toFloat(), y + lineNum * (lineHeight * font.scale) - 8 + linotypeScaleOffsetY.toFloat(),
tex.width * font.scale.toFloat(), tex.width * font.scale.toFloat(),
tex.height * font.scale.toFloat() tex.height * font.scale.toFloat()
) )
if (it.colour != null)
batch.color = oldColour
} }
// font.draw(batch, "I", x, y + lineNum * lineHeight + 14) // font.draw(batch, "I", x, y + lineNum * lineHeight + 14)
} }
} }
data class Block(var posX: Int, val block: TextCacheObj) { // a single word data class Block(var posX: Int, val block: TextCacheObj, var colour: Color? = null) { // a single word
fun getEndPos() = this.posX + this.block.width fun getEndPos() = this.posX + this.block.width
} }

5
src/net/torvald/terrarumsansbitmap/gdx/TerrarumSansBitmap.kt
View File

@@ -749,9 +749,14 @@ class TerrarumSansBitmap(
private fun buildWidthTableInternal() { private fun buildWidthTableInternal() {
for (i in 0 until 16) { for (i in 0 until 16) {
glyphProps[i] = GlyphProps(0)
glyphProps[MOVABLE_BLOCK_1 + i] = GlyphProps(i + 1) glyphProps[MOVABLE_BLOCK_1 + i] = GlyphProps(i + 1)
glyphProps[MOVABLE_BLOCK_M1 + i] = GlyphProps(-i - 1) glyphProps[MOVABLE_BLOCK_M1 + i] = GlyphProps(-i - 1)
} }
for (i in 0 until 256) {
glyphProps[0xF800 + i] = GlyphProps(0)
}
} }
fun getWidth(text: String) = getWidthNormalised(text.toCodePoints()) fun getWidth(text: String) = getWidthNormalised(text.toCodePoints())