bloeys/nterm
1
0
Fork 0
mirror of https://github.com/bloeys/nterm.git synced 2025-12-29 06:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ability to set cell background colors

Browse Source
This commit is contained in:
bloeys
2022-08-02 05:32:56 +04:00
parent 054eaebe9a
commit 8863a289d7
3 changed files with 151 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
res/shaders/glyph.glsl
View File

@ -13,6 +13,7 @@ layout(location=5) in vec2 aModelScale;
out vec2 v2fUV0;
out vec4 v2fColor;
out vec3 v2fModelPos;
out vec3 v2fFragPos;
uniform mat4 projViewMat;
@ -26,8 +27,9 @@ void main()
aModelPos.x, aModelPos.y, aModelPos.z, 1.0
);
v2fUV0 = aUV0 + aVertPos.xy * aUVSize;
v2fColor = aVertColor;
v2fModelPos = aModelPos;
v2fUV0 = aUV0 + aVertPos.xy * aUVSize;
gl_Position = projViewMat * modelMat * vec4(aVertPos, 1.0);
}
@ -37,22 +39,64 @@ void main()
in vec2 v2fUV0;
in vec4 v2fColor;
in vec3 v2fModelPos;
in vec4 gl_FragCoord;
out vec4 fragColor;
uniform sampler2D diffTex;
uniform int drawBounds;
uniform int drawGlyphBounds;
uniform uint opts1;
// uniform float spaceAdv = 1;
// uniform float lineHeight = 1;
const uint opts1_bgColorMask = 1<<0;
const uint opts1_underlineMask = 1<<1;
bool hasOpts(uint mask)
{
return (opts1&mask) != 0;
}
// vec2 ScreenPosToGridPos(vec2 pos)
// {
// return vec2(floor(pos.x / spaceAdv), floor(pos.y / lineHeight));
// }
// vec4 GridPosToCellStartEnd(vec2 gridPos)
// {
// vec4 startEnd;
// startEnd.x = gridPos.x * spaceAdv;
// startEnd.y = gridPos.y * lineHeight;
// startEnd.z = startEnd.x + spaceAdv;
// startEnd.w = startEnd.y + lineHeight;
// return startEnd;
// }
void main()
{
if (hasOpts(opts1_bgColorMask) && v2fUV0 == vec2(-1,-1))
{
// vec2 gridPos = ScreenPosToGridPos(v2fModelPos.xy);
// vec4 startEnd = GridPosToCellStartEnd(gridPos);
//if (gl_FragCoord.x > startEnd.x && gl_FragCoord.x < startEnd.z)
{
fragColor = v2fColor;
}
return;
}
vec4 texColor = texelFetch(diffTex, ivec2(v2fUV0), 0);
// This part highlights the full region of the char
if (texColor.r == 0 && drawBounds != 0)
if (texColor.r == 0)
{
fragColor = vec4(0,1,0,0.25);
if (drawGlyphBounds != 0)
{
fragColor = vec4(0,1,0,0.25);
}
return;
}
else
{
fragColor = vec4(v2fColor.rgb, texColor.r*v2fColor.a);
}
}
fragColor = vec4(v2fColor.rgb, texColor.r*v2fColor.a);
}