godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Use correct lightmap coefficients to ensure that the directional lightmap mode looks correct

Browse Source 
Also remove the metallic option from directional lightmap as it is guaranteed to return negative numbers in many cases
This commit is contained in:
clayjohn
2024-08-21 00:30:59 -07:00
parent da5f39889f
commit f4ccba7508
6 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

@@ -1210,17 +1210,10 @@ void main() {
vec3 n = normalize(lightmaps.data[ofs].normal_xform * normal);
float exposure_normalization = lightmaps.data[ofs].exposure_normalization;
ambient_light += lm_light_l0 * 0.282095f;
ambient_light += lm_light_l1n1 * 0.32573 * n.y * exposure_normalization;
ambient_light += lm_light_l1_0 * 0.32573 * n.z * exposure_normalization;
ambient_light += lm_light_l1p1 * 0.32573 * n.x * exposure_normalization;
if (metallic > 0.01) { // since the more direct bounced light is lost, we can kind of fake it with this trick
vec3 r = reflect(normalize(-vertex), normal);
specular_light += lm_light_l1n1 * 0.32573 * r.y * exposure_normalization;
specular_light += lm_light_l1_0 * 0.32573 * r.z * exposure_normalization;
specular_light += lm_light_l1p1 * 0.32573 * r.x * exposure_normalization;
}
ambient_light += lm_light_l0 * exposure_normalization;
ambient_light += lm_light_l1n1 * n.y * exposure_normalization;
ambient_light += lm_light_l1_0 * n.z * exposure_normalization;
ambient_light += lm_light_l1p1 * n.x * exposure_normalization;
} else {
ambient_light += textureLod(sampler2DArray(lightmap_textures[ofs], SAMPLER_LINEAR_CLAMP), uvw, 0.0).rgb * lightmaps.data[ofs].exposure_normalization;
}