AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 01:16:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix default ascent

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-06 16:39:30 +01:00
parent 4eb33f282f
commit 5eecbe89b7
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/code/RasterizedCodePointRendererTest.kt
View File

@ -74,8 +74,8 @@ class RasterizedCodePointRendererTest {
fun `12px height`() { fun `12px height`() {
val consumer = object : DummyGUIVertexConsumer() { val consumer = object : DummyGUIVertexConsumer() {
override fun addChar(start: Vec2, end: Vec2, index: Int) { override fun addChar(start: Vec2, end: Vec2, index: Int) {
assertEquals(start, Vec2(10.0f, 11.0f)) // -2 for ascent height difference, +1 for normal spacing assertEquals(start, Vec2(10.0f, 12.0f)) // -2 for ascent height difference, +1 for normal spacing, +1 for ascent fixing?
assertEquals(end, Vec2(15.0f, 23.0f)) assertEquals(end, Vec2(15.0f, 24.0f))
} }
} }
val char = DummyCodePointRenderer(ascent = 10.0f, height = 12.0f) val char = DummyCodePointRenderer(ascent = 10.0f, height = 12.0f)

2
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt
View File

@ -65,7 +65,7 @@ class BitmapFontTypeTest {
return texture return texture
} }
private fun load(start: IntArray, end: IntArray, width: Int = 8, height: Int = 8, ascent: Int = 8, chars: Array<IntArray>): BitmapFontType { private fun load(start: IntArray, end: IntArray, width: Int = 8, height: Int = 8, ascent: Int = 7, chars: Array<IntArray>): BitmapFontType {
val texture = createTexture(start, end, width, height, chars.size) val texture = createTexture(start, end, width, height, chars.size)
val fontType = LOAD(BitmapFontType, texture, height, ascent, chars.map { IntStream.of(*it) }.toTypedArray()) as BitmapFontType val fontType = LOAD(BitmapFontType, texture, height, ascent, chars.map { IntStream.of(*it) }.toTypedArray()) as BitmapFontType

2
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/dummy/DummyCodePointRenderer.kt
View File

@ -21,7 +21,7 @@ class DummyCodePointRenderer(
override val uvStart: Vec2 = Vec2(0.1f, 0.2f), override val uvStart: Vec2 = Vec2(0.1f, 0.2f),
override val uvEnd: Vec2 = Vec2(0.6f, 0.7f), override val uvEnd: Vec2 = Vec2(0.6f, 0.7f),
override val width: Float = 5.0f, override val width: Float = 5.0f,
override val ascent: Float = 8.0f, override val ascent: Float = 7.0f,
override val height: Float = 8.0f, override val height: Float = 8.0f,
) : AscentedCodePointRenderer { ) : AscentedCodePointRenderer {
override val texture = DummyTexture() override val texture = DummyTexture()

2
src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt
View File

@ -65,7 +65,7 @@ class BitmapFontType(
override fun build(context: RenderContext, manager: FontManager, data: JsonObject): BitmapFontType? { override fun build(context: RenderContext, manager: FontManager, data: JsonObject): BitmapFontType? {
val file = data["file"]?.toString()?.let { it.toResourceLocation().texture() } ?: throw IllegalArgumentException("Missing file!") val file = data["file"]?.toString()?.let { it.toResourceLocation().texture() } ?: throw IllegalArgumentException("Missing file!")
val height = data["height"]?.toInt() ?: 8 val height = data["height"]?.toInt() ?: 8
val ascent = data["ascent"]?.toInt() ?: 8 val ascent = data["ascent"]?.toInt() ?: 7
val chars = data["chars"]?.listCast<String>() ?: throw IllegalArgumentException("Missing chars!") val chars = data["chars"]?.listCast<String>() ?: throw IllegalArgumentException("Missing chars!")
return load(file, height, ascent, chars, context) return load(file, height, ascent, chars, context)
} }