From 69c70dd319532f7860f211f4a527a902b0386e49 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 8 May 2021 20:18:29 +0200 Subject: Fix swapped vertex colors on GLES2 --- client/shaders/nodes_shader/opengl_vertex.glsl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'client/shaders/nodes_shader/opengl_vertex.glsl') diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index c68df4a8e..1a4840d35 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -146,10 +146,14 @@ void main(void) // the brightness, so now we have to multiply these // colors with the color of the incoming light. // The pre-baked colors are halved to prevent overflow. - vec4 color; +#ifdef GL_ES + vec4 color = inVertexColor.bgra; +#else + vec4 color = inVertexColor; +#endif // The alpha gives the ratio of sunlight in the incoming light. - float nightRatio = 1.0 - inVertexColor.a; - color.rgb = inVertexColor.rgb * (inVertexColor.a * dayLight.rgb + + float nightRatio = 1.0 - color.a; + color.rgb = color.rgb * (color.a * dayLight.rgb + nightRatio * artificialLight.rgb) * 2.0; color.a = 1.0; -- cgit v1.2.3