diff options
Diffstat (limited to 'src/render/shaders/osd.h')
| -rw-r--r-- | src/render/shaders/osd.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/shaders/osd.h b/src/render/shaders/osd.h index 1109a50..8a5fd6c 100644 --- a/src/render/shaders/osd.h +++ b/src/render/shaders/osd.h @@ -5,32 +5,32 @@ static char osd_shader[] = \ " if (connecting != 0u) {\n" " float t = mod(time,1.8);\n" " for (int i = 0; i < 3; i++) {\n" -" col += char(ch_per,uv)*float(t >= float(i)*0.6);\n" +" col += ch(ch_per,uv)*float(t >= float(i)*0.6);\n" " }\n" " } else if (paused != 0u) {\n" -" col = char(ch_p,uv)+char(ch_a,uv)+char(ch_u,uv)+char(ch_s,uv)+char(ch_e,uv)+char(ch_d,uv);\n" +" col = ch(ch_p,uv)+ch(ch_a,uv)+ch(ch_u,uv)+ch(ch_s,uv)+ch(ch_e,uv)+ch(ch_d,uv);\n" " }\n" " pp = pos2;\n" " if (negative != 0u) {\n" -" col += char(ch_dsh,uv);\n" +" col += ch(ch_dsh,uv);\n" " }\n" " if (show_hour != 0u) {\n" -" col += integer(num1,uv)+char(ch_col,uv);\n" +" col += integer(num1,uv)+ch(ch_col,uv);\n" " }\n" -" col += integer(num2,uv)+char(ch_col,uv)+integer(num3,uv)+char(ch_lsl,uv);\n" +" col += integer(num2,uv)+ch(ch_col,uv)+integer(num3,uv)+ch(ch_lsl,uv);\n" " if (show_hour != 0u) {\n" -" col += integer(num4,uv)+char(ch_col,uv);\n" +" col += integer(num4,uv)+ch(ch_col,uv);\n" " }\n" -" col += integer(num5,uv)+char(ch_col,uv)+integer(num6,uv);\n" +" col += integer(num5,uv)+ch(ch_col,uv)+integer(num6,uv);\n" " return col;\n" "}\n" "float text_over(vec2 uv, vec2 pos3) {\n" " float col = 0.;\n" " pp = pos3;\n" " if (show_hour != 0u && bar_mode == 1u) {\n" -" col = integer(num7,uv)+char(ch_col,uv);\n" +" col = integer(num7,uv)+ch(ch_col,uv);\n" " }\n" -" col += integer(num8,uv)+((bar_mode == 2u) ? char(ch_per,uv) : char(ch_col,uv))+integer(num9,uv);\n" +" col += integer(num8,uv)+((bar_mode == 2u) ? ch(ch_per,uv) : ch(ch_col,uv))+integer(num9,uv);\n" " return col;\n" "}\n" "vec4 draw_osd() {\n" @@ -45,7 +45,7 @@ static char osd_shader[] = \ " pos2.x -= STRW(0.5) * float(negative);\n" " float ov = fract(bar);\n" " ov = (-1.+(bar-ov)+float(c.x < ov))/1.5;\n" -" vec4 color = mix(bcolor,mix(tcolor,vec4(0.7,0.45,0.,1.),ov),float(c.x < bar));\n" +" vec4 color = mix(bcolor,mix(tcolor-0.075,vec4(0.7,0.45,0.,1.),ov),float(c.x < bar));\n" " float alpha = (c.x >= bar) ? 0.7 : 1.;\n" " color = mix(color,vec4(tcolor.xyz,alpha)+float(bar > dbar)*0.15,float(c.x < dbar));\n" " color = mix(color,vec4(tcolor.xyz,alpha-0.1)+float(bar > bbar)*0.15,float(c.x < bbar)*0.5);\n" @@ -62,7 +62,7 @@ static char osd_shader[] = \ " uv = c*ss;\n" " float width2 = (show_hour != 0u && bar_mode == 1u) ? 8. : 5.;\n" " vec2 pos3 = floor(vec2(ss.x/2.-STRW(width2)/2.,11.));\n" -" float box = in_box(uv,pos3-vec2(2.,2.),pos3+vec2(STRW(width2)+1.,STRH(1.)+3.));\n" +" float box = in_box(uv,pos3-vec2(4.,2.),pos3+vec2(STRW(width2)+3.,STRH(1.)+3.));\n" " color.xyz = mix(color.xyz,bcolor.xyz,box);\n" " color.w = color.w+(bcolor.w*box);\n" " pixel = text_over(uv,pos3);\n" |