neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

refactor(gui): fill background outside of grid

Browse source
This commit is contained in:
CJ van den Berg 2026-04-10 13:50:19 +02:00
parent 8190380e79
commit be4f939b26
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/gpu/builtin.glsl.zig
View file

@ -23,6 +23,8 @@ pub const FsParams = extern struct {
cursor_color: [4]f32, // RGBA normalized [0,1] cursor_color: [4]f32, // RGBA normalized [0,1]
// Secondary cursor colour (positions encoded in ShaderCell._pad) // Secondary cursor colour (positions encoded in ShaderCell._pad)
sec_cursor_color: [4]f32, // RGBA normalized [0,1] sec_cursor_color: [4]f32, // RGBA normalized [0,1]
// Background fill for border area outside the cell grid
bg_color: [4]f32, // RGBA normalized [0,1]
}; };
const vs_src = const vs_src =
@ -48,6 +50,7 @@ const fs_src =
\\uniform int cursor_vis; \\uniform int cursor_vis;
\\uniform vec4 cursor_color; \\uniform vec4 cursor_color;
\\uniform vec4 sec_cursor_color; \\uniform vec4 sec_cursor_color;
\\uniform vec4 bg_color;
\\uniform sampler2D glyph_tex_glyph_smp; \\uniform sampler2D glyph_tex_glyph_smp;
\\uniform usampler2D cell_tex_cell_smp; \\uniform usampler2D cell_tex_cell_smp;
\\out vec4 frag_color; \\out vec4 frag_color;
@ -69,7 +72,7 @@ const fs_src =
\\ int row = py / cell_size_y; \\ int row = py / cell_size_y;
\\ \\
\\ if (col >= col_count || row >= row_count || row < 0 || col < 0) { \\ if (col >= col_count || row >= row_count || row < 0 || col < 0) {
\\ frag_color = vec4(0.0, 0.0, 0.0, 1.0); \\ frag_color = vec4(bg_color.rgb, 1.0);
\\ return; \\ return;
\\ } \\ }
\\ \\
@ -142,6 +145,7 @@ pub fn shaderDesc(backend: sg.Backend) sg.ShaderDesc {
desc.uniform_blocks[0].glsl_uniforms[8] = .{ .type = .INT, .glsl_name = "cursor_vis" }; desc.uniform_blocks[0].glsl_uniforms[8] = .{ .type = .INT, .glsl_name = "cursor_vis" };
desc.uniform_blocks[0].glsl_uniforms[9] = .{ .type = .FLOAT4, .glsl_name = "cursor_color" }; desc.uniform_blocks[0].glsl_uniforms[9] = .{ .type = .FLOAT4, .glsl_name = "cursor_color" };
desc.uniform_blocks[0].glsl_uniforms[10] = .{ .type = .FLOAT4, .glsl_name = "sec_cursor_color" }; desc.uniform_blocks[0].glsl_uniforms[10] = .{ .type = .FLOAT4, .glsl_name = "sec_cursor_color" };
desc.uniform_blocks[0].glsl_uniforms[11] = .{ .type = .FLOAT4, .glsl_name = "bg_color" };
// Glyph atlas texture: R8 → sample_type = FLOAT // Glyph atlas texture: R8 → sample_type = FLOAT
desc.views[0].texture = .{ desc.views[0].texture = .{

1
src/gui/gpu/gpu.zig
View file

@ -463,6 +463,7 @@ pub fn paint(
.cursor_vis = if (cursor.vis) 1 else 0, .cursor_vis = if (cursor.vis) 1 else 0,
.cursor_color = cursor.color.to_vec4(), .cursor_color = cursor.color.to_vec4(),
.sec_cursor_color = sec_color.to_vec4(), .sec_cursor_color = sec_color.to_vec4(),
.bg_color = global.background.to_vec4(),
}; };
sg.applyUniforms(0, .{ sg.applyUniforms(0, .{
.ptr = &fs_params, .ptr = &fs_params,