godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28891 from clayjohn/brdf-fix 

Fix lighting bug introduced in clear color changes
This commit is contained in:
Rémi Verschelde 2019-05-15 09:34:13 +02:00 committed by GitHub
parent 15cda53d80 55d11330b0
commit 61b78e7f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gles3/shaders/scene.glsl
View File

@ -1814,25 +1814,6 @@ FRAGMENT_SHADER_CODE
specular_blob_intensity *= specular * 2.0; specular_blob_intensity *= specular * 2.0;
#endif #endif
#ifdef USE_FORWARD_LIGHTING
highp vec4 reflection_accum = vec4(0.0, 0.0, 0.0, 0.0);
highp vec4 ambient_accum = vec4(0.0, 0.0, 0.0, 0.0);
for (int i = 0; i < reflection_count; i++) {
reflection_process(reflection_indices[i], vertex, normal, binormal, tangent, roughness, anisotropy, ambient_light, env_reflection_light, reflection_accum, ambient_accum);
}
if (reflection_accum.a > 0.0) {
specular_light += reflection_accum.rgb / reflection_accum.a;
} else {
specular_light += env_reflection_light;
}
#if !defined(USE_LIGHTMAP) && !defined(USE_LIGHTMAP_CAPTURE)
if (ambient_accum.a > 0.0) {
ambient_light = ambient_accum.rgb / ambient_accum.a;
}
#endif
// scales the specular reflections, needs to be be computed before lighting happens, // scales the specular reflections, needs to be be computed before lighting happens,
// but after environment and reflection probes are added // but after environment and reflection probes are added
// Environment brdf approximation (Lazarov 2013) // Environment brdf approximation (Lazarov 2013)
@ -2038,6 +2019,25 @@ FRAGMENT_SHADER_CODE
} }
#endif #endif
#ifdef USE_FORWARD_LIGHTING
highp vec4 reflection_accum = vec4(0.0, 0.0, 0.0, 0.0);
highp vec4 ambient_accum = vec4(0.0, 0.0, 0.0, 0.0);
for (int i = 0; i < reflection_count; i++) {
reflection_process(reflection_indices[i], vertex, normal, binormal, tangent, roughness, anisotropy, ambient_light, env_reflection_light, reflection_accum, ambient_accum);
}
if (reflection_accum.a > 0.0) {
specular_light += reflection_accum.rgb / reflection_accum.a;
} else {
specular_light += env_reflection_light;
}
#if !defined(USE_LIGHTMAP) && !defined(USE_LIGHTMAP_CAPTURE)
if (ambient_accum.a > 0.0) {
ambient_light = ambient_accum.rgb / ambient_accum.a;
}
#endif
#ifdef USE_VERTEX_LIGHTING #ifdef USE_VERTEX_LIGHTING
diffuse_light *= albedo; diffuse_light *= albedo;