AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when rendering new line without enough space

Browse Source
This commit is contained in:
Bixilon 2023-06-13 22:34:59 +02:00
parent e346f06c67
commit c4c726fbbb
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/renderer/component/ChatComponentRendererTest.kt
View File

@ -10,6 +10,7 @@ import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextOffset
import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderInfo import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderInfo
import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties import de.bixilon.minosoft.gui.rendering.font.renderer.element.TextRenderProperties
import de.bixilon.minosoft.gui.rendering.font.types.dummy.DummyFontType import de.bixilon.minosoft.gui.rendering.font.types.dummy.DummyFontType
import de.bixilon.minosoft.gui.rendering.font.types.font.EmptyFont
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.MAX import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.MAX
import org.testng.Assert.assertEquals import org.testng.Assert.assertEquals
@ -252,5 +253,38 @@ class ChatComponentRendererTest {
) )
} }
// TODO: shadow, cutoff, underline, strikethrough, using with consumer, formatting (just basic, that is code point renderer's job) fun `newline, no space`() {
val info = render(TextComponent("\n"), maxSize = Vec2(0.0f, 0.0f))
info.assert(
lineIndex = 0,
lines = listOf(),
size = Vec2(0.0f, 0.0f),
cutOff = true,
)
}
fun `no font`() {
val info = TextRenderInfo(Vec2(Float.MAX_VALUE))
ChatComponentRenderer.render(TextOffset(Vec2(10, 10)), FontManager(EmptyFont), TextRenderProperties(), info, null, null, TextComponent("abc\ndef"))
info.assert(
lineIndex = 1,
lines = listOf(TextLineInfo()),
size = Vec2(0.0f, 11.0f),
)
}
fun `no font, no size`() {
val info = TextRenderInfo(Vec2(0.0f, 0.0f))
ChatComponentRenderer.render(TextOffset(Vec2(10, 10)), FontManager(EmptyFont), TextRenderProperties(), info, null, null, TextComponent("abc\ndef"))
info.assert(
lineIndex = 0,
lines = listOf(),
size = Vec2(0.0f, 0.0f),
cutOff = true,
)
}
// TODO: shadow, underline, strikethrough, using with consumer, formatting (just basic, that is code point renderer's job)
} }

4
src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/component/TextComponentRenderer.kt
View File

@ -81,7 +81,9 @@ object TextComponentRenderer : ChatComponentRenderer<TextComponent> {
if (codePoint == '\n'.code) { if (codePoint == '\n'.code) {
val lineIndex = info.lineIndex val lineIndex = info.lineIndex
filled = renderNewline(properties, offset, info, consumer == null) filled = renderNewline(properties, offset, info, consumer == null)
info.lines[lineIndex].push(text, line) if (line.isNotEmpty()) {
info.lines[lineIndex].push(text, line)
}
skipWhitespaces = true skipWhitespaces = true
if (filled) break else continue if (filled) break else continue
} }