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

making use of the long-neglected scale variable

Browse Source
This commit is contained in:
minjaesong
2021-11-28 12:42:34 +09:00
parent 14ea4d8d84
commit ce31a5a6ef
2 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,21 +494,14 @@ 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())
(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
}

11
src/net/torvald/terrarumtypewriterbitmap/gdx/TerrarumTypewriterBitmap.kt
View File

@@ -384,21 +384,14 @@ 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(),
(y - pixmapOffsetY).toFloat() + (if (flipY) (tempLinotype.height) else 0),
(tempLinotype.width.toFloat()),
-(tempLinotype.height.toFloat())
(tempLinotype.height.toFloat()) * (if (flipY) -1 else 1)
)
}
}
return null
}