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

fix some font loading bugs in LegacyUnicodeFontProvider

Browse Source
This commit is contained in:
Bixilon 2021-09-13 15:07:23 +02:00
parent f79acb31bc
commit c3c2490540
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/gui/rendering/font/provider/LegacyUnicodeFontProvider.kt
View File

@ -38,6 +38,7 @@ class LegacyUnicodeFontProvider(
// This page somehow does not exist, but we are fine with it // This page somehow does not exist, but we are fine with it
// ToDo: Check if it really exist // ToDo: Check if it really exist
sizes.skip(UNICODE_PAGE_SIZE.toLong()) // skip the sizes to not mess up sizes.skip(UNICODE_PAGE_SIZE.toLong()) // skip the sizes to not mess up
char += UNICODE_PAGE_SIZE
continue continue
} }
val texture = renderWindow.textureManager.staticTextures.createTexture(template.format("%02x".format(page)).toResourceLocation().texture()) val texture = renderWindow.textureManager.staticTextures.createTexture(template.format("%02x".format(page)).toResourceLocation().texture())
@ -46,8 +47,8 @@ class LegacyUnicodeFontProvider(
val yEnd = PIXEL.y * (y + 1) * CHAR_SIZE val yEnd = PIXEL.y * (y + 1) * CHAR_SIZE
for (x in 0 until UNICODE_PAGE_SIZE / CHAR_SIZE) { for (x in 0 until UNICODE_PAGE_SIZE / CHAR_SIZE) {
val widthByte = sizes.read() val widthByte = sizes.read()
val charXStart = (widthByte shr 4) and 0x0F val charXStart = ((widthByte shr 4) and 0x0F) - 1
val charXEnd = widthByte and 0x0F val charXEnd = (widthByte and 0x0F) + 1
val xOffset = PIXEL.x * CHAR_SIZE * x val xOffset = PIXEL.x * CHAR_SIZE * x
@ -74,7 +75,8 @@ class LegacyUnicodeFontProvider(
uvEnd = uvEnd, uvEnd = uvEnd,
) )
chars[(char++).code] = charData chars[char.code] = charData
char++
} }
} }
} }