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

font texture: properly copy alpha channel to rgb components

Browse Source 
This finally fixes all font rendering issues with compression.

Previously the font textures were in the aaaa format, since 1.20 they seem to be in the 111a format (which is completely valid and reduces file size). the problem is, that the with font compression just the red channel will be used. This one is always 1, so all chars are are quare on screen. Not the alpha channel is force copied to the rgb channels
This commit is contained in:
Moritz Zwerger 2024-01-16 18:13:51 +01:00
parent bb23496b8b
commit 1c0b7c21b6
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLFontTextureArray.kt
View File

@ -24,6 +24,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.array.TextureArrayS
import de.bixilon.minosoft.gui.rendering.system.base.texture.array.font.FontCompressions import de.bixilon.minosoft.gui.rendering.system.base.texture.array.font.FontCompressions
import de.bixilon.minosoft.gui.rendering.system.base.texture.array.font.FontTextureArray import de.bixilon.minosoft.gui.rendering.system.base.texture.array.font.FontTextureArray
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.file.PNGTexture
import de.bixilon.minosoft.gui.rendering.system.opengl.OpenGLRenderSystem import de.bixilon.minosoft.gui.rendering.system.opengl.OpenGLRenderSystem
import de.bixilon.minosoft.gui.rendering.system.opengl.texture.OpenGLTextureUtil.glFormat import de.bixilon.minosoft.gui.rendering.system.opengl.texture.OpenGLTextureUtil.glFormat
import de.bixilon.minosoft.gui.rendering.system.opengl.texture.OpenGLTextureUtil.glType import de.bixilon.minosoft.gui.rendering.system.opengl.texture.OpenGLTextureUtil.glType
@ -62,6 +63,9 @@ class OpenGLFontTextureArray(
val buffer = texture.data.buffer val buffer = texture.data.buffer
buffer.data.position(0) buffer.data.position(0)
buffer.data.limit(buffer.data.capacity()) buffer.data.limit(buffer.data.capacity())
if (compression != FontCompressions.NONE && texture is PNGTexture) {
buffer.data.copyAlphaToRGB()
}
glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, renderData.index, buffer.size.x, buffer.size.y, 1, buffer.glFormat, buffer.glType, buffer.data) glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, renderData.index, buffer.size.x, buffer.size.y, 1, buffer.glFormat, buffer.glType, buffer.data)
} }
@ -108,5 +112,17 @@ class OpenGLFontTextureArray(
private companion object { private companion object {
const val RESOLUTION = 1024 const val RESOLUTION = 1024
private fun ByteBuffer.copyAlphaToRGB() {
val pixels = this.limit() / 4
for (index in 0 until pixels) {
val offset = index * 4
val alpha = this[offset + 3]
this.put(offset + 0, alpha)
this.put(offset + 1, alpha)
this.put(offset + 2, alpha)
}
}
} }
} }