From c6260bb35530edc80e598df3168d85cb172ba878 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 15 Nov 2020 23:59:07 +0900 Subject: [PATCH] graphicsadapter: allowing font rom to be greyscale instead of clear B/W --- src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt b/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt index b973d35..b997482 100644 --- a/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt +++ b/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt @@ -932,13 +932,8 @@ void main() { vec4 tileCol = texture2D(tilesAtlas, finalUVCoordForTile); - // apply colour - if (tileCol.r > 0) { - gl_FragColor = foreColFromMap; - } - else { - gl_FragColor = backColFromMap; - } + // apply colour. I'm expecting FONT ROM IMAGE to be greyscale + gl_FragColor = mix(backColFromMap, foreColFromMap, tileCol.r); } """.trimIndent()