DRYer
This commit is contained in:
parent
f44c3a4606
commit
76a93b6cd6
@ -201,11 +201,11 @@ void main() {
|
|||||||
|
|
||||||
// Background {{{
|
// Background {{{
|
||||||
#ifdef NEEDS_BACKROUND
|
#ifdef NEEDS_BACKROUND
|
||||||
|
float cell_has_default_bg = 1 - step(ONE, colors[bg_index] & BYTE_MASK);
|
||||||
|
float cell_has_non_default_bg = 1 - cell_has_default_bg;
|
||||||
|
|
||||||
#if defined(BACKGROUND)
|
#if defined(BACKGROUND)
|
||||||
background = bg;
|
background = bg;
|
||||||
uint defaultbg = resolve_color(colors[2], default_colors[bg_index]);
|
|
||||||
float cell_has_non_default_bg = abs(defaultbg - bg_as_uint);
|
|
||||||
// draw background only if it is either non-default or the draw_default_bg
|
// draw background only if it is either non-default or the draw_default_bg
|
||||||
// uniform is set
|
// uniform is set
|
||||||
draw_bg = step(ONE, draw_default_bg + cell_has_non_default_bg);
|
draw_bg = step(ONE, draw_default_bg + cell_has_non_default_bg);
|
||||||
@ -218,7 +218,7 @@ void main() {
|
|||||||
// selections/block cursor and 0 everywhere else.
|
// selections/block cursor and 0 everywhere else.
|
||||||
float is_special_cell = cell_has_block_cursor + float(is_selected & ONE);
|
float is_special_cell = cell_has_block_cursor + float(is_selected & ONE);
|
||||||
#ifndef SPECIAL
|
#ifndef SPECIAL
|
||||||
is_special_cell += float(colors[bg_index] & BYTE_MASK) + float(is_reversed);
|
is_special_cell += cell_has_non_default_bg + float(is_reversed);
|
||||||
#endif
|
#endif
|
||||||
bg_alpha = step(0.5, is_special_cell);
|
bg_alpha = step(0.5, is_special_cell);
|
||||||
#ifndef SPECIAL
|
#ifndef SPECIAL
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user