From 6cdef9d49802569bede943961260a46a21de3dae Mon Sep 17 00:00:00 2001 From: Maksim Date: Mon, 23 May 2022 10:31:22 +0300 Subject: [PATCH] Fix RGB order in shaders on GLES --- client/shaders/nodes_shader/opengl_vertex.glsl | 4 +--- client/shaders/object_shader/opengl_vertex.glsl | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index a75d749ef..4d6049790 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -151,9 +151,7 @@ void main(void) color.xyz = color.zyx; // swap RGB order #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 + - nightRatio * artificialLight.rgb) * 2.0; + color.rgb *= 2.0 * mix(artificialLight.rgb, dayLight.rgb, color.a); color.a = 1.0; // Emphase blue a bit in darker places diff --git a/client/shaders/object_shader/opengl_vertex.glsl b/client/shaders/object_shader/opengl_vertex.glsl index 740be7721..58321d92c 100644 --- a/client/shaders/object_shader/opengl_vertex.glsl +++ b/client/shaders/object_shader/opengl_vertex.glsl @@ -51,5 +51,9 @@ void main(void) : directional_ambient(normalize(inVertexNormal)); #endif +#ifdef GL_ES + varColor = inVertexColor.bgra; +#else varColor = inVertexColor; +#endif }