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

Merge pull request #51927 from 20kdc/issue-51897-sp1

Browse Source 
Fix issue #51897 (horizon occlusion causing black blob), fix ver. SP1
This commit is contained in:
Rémi Verschelde 2021-09-13 11:44:55 +02:00 committed by GitHub
commit 600f2a8d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles2/shaders/scene.glsl
View File

@ -1688,12 +1688,12 @@ FRAGMENT_SHADER_CODE
#ifdef USE_RADIANCE_MAP #ifdef USE_RADIANCE_MAP
vec3 ref_vec = reflect(-eye_position, N); vec3 ref_vec = reflect(-eye_position, N);
float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
ref_vec = normalize((radiance_inverse_xform * vec4(ref_vec, 0.0)).xyz); ref_vec = normalize((radiance_inverse_xform * vec4(ref_vec, 0.0)).xyz);
ref_vec.z *= -1.0; ref_vec.z *= -1.0;
specular_light = textureCubeLod(radiance_map, ref_vec, roughness * RADIANCE_MAX_LOD).xyz * bg_energy; specular_light = textureCubeLod(radiance_map, ref_vec, roughness * RADIANCE_MAX_LOD).xyz * bg_energy;
float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
specular_light *= horizon * horizon; specular_light *= horizon * horizon;
#ifndef USE_LIGHTMAP #ifndef USE_LIGHTMAP
{ {

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

@ -1884,10 +1884,10 @@ FRAGMENT_SHADER_CODE
{ //read radiance from dual paraboloid { //read radiance from dual paraboloid
vec3 ref_vec = reflect(-eye_vec, normal); vec3 ref_vec = reflect(-eye_vec, normal);
float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
ref_vec = normalize((radiance_inverse_xform * vec4(ref_vec, 0.0)).xyz); ref_vec = normalize((radiance_inverse_xform * vec4(ref_vec, 0.0)).xyz);
vec3 radiance = textureDualParaboloid(radiance_map, ref_vec, roughness) * bg_energy; vec3 radiance = textureDualParaboloid(radiance_map, ref_vec, roughness) * bg_energy;
env_reflection_light = radiance; env_reflection_light = radiance;
float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
env_reflection_light *= horizon * horizon; env_reflection_light *= horizon * horizon;
} }
} }