From 6513d1337050df8abca0cf08ecf28ab325a5ac5c Mon Sep 17 00:00:00 2001 From: Dominik Piasecki Date: Mon, 14 Oct 2024 22:56:05 +0200 Subject: [PATCH 1/2] [shaders] Make route arrows visible Closes: #2541 Signed-off-by: Dominik Piasecki --- shaders/GL/route_arrow.fsh.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shaders/GL/route_arrow.fsh.glsl b/shaders/GL/route_arrow.fsh.glsl index 1f5d22e4fb..5568bd682d 100644 --- a/shaders/GL/route_arrow.fsh.glsl +++ b/shaders/GL/route_arrow.fsh.glsl @@ -11,9 +11,9 @@ varying vec2 v_colorTexCoords; void main() { vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords); - finalColor.a *= u_opacity; + finalColor=vec4(vec3(u_maskColor.rgb * finalColor.rgb), finalColor.a); if (finalColor.a < 0.01) discard; - finalColor = vec4(mix(finalColor.rgb, u_maskColor.rgb, u_maskColor.a), finalColor.a); + finalColor = finalColor * u_opacity; gl_FragColor = finalColor; } -- 2.45.3 From aef7c6933112e9f211950ff21455f8021f210493 Mon Sep 17 00:00:00 2001 From: Dominik Piasecki Date: Fri, 18 Oct 2024 23:13:13 +0200 Subject: [PATCH 2/2] [shaders] Make route arrows outline white Signed-off-by: Dominik Piasecki --- shaders/GL/route_arrow.fsh.glsl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaders/GL/route_arrow.fsh.glsl b/shaders/GL/route_arrow.fsh.glsl index 5568bd682d..41c33717db 100644 --- a/shaders/GL/route_arrow.fsh.glsl +++ b/shaders/GL/route_arrow.fsh.glsl @@ -11,7 +11,10 @@ varying vec2 v_colorTexCoords; void main() { vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords); - finalColor=vec4(vec3(u_maskColor.rgb * finalColor.rgb), finalColor.a); + if (finalColor.r == 1.0 && finalColor.g == 1.0 && finalColor.b == 1.0) + finalColor=vec4(vec3(u_maskColor.rgb * finalColor.rgb), finalColor.a); + else + finalColor=vec4(1.0,1.0,1.0,finalColor.a); if (finalColor.a < 0.01) discard; finalColor = finalColor * u_opacity; -- 2.45.3