maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix generation of env map, closes #18880

Browse source
This commit is contained in:
Juan Linietsky 2018-08-24 13:31:02 -03:00
parent c6b340ea98
commit 62233423c7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gles2/shaders/cubemap_filter.glsl
View file

@ -170,10 +170,10 @@ void main() {
if (NdotL > 0.0) {
#ifdef USE_SOURCE_PANORAMA
sum.rgb += texturePanorama(source_panorama, H).rgb * NdotL;
sum.rgb += texturePanorama(source_panorama, L).rgb * NdotL;
#else
H.y = -H.y;
sum.rgb += textureCubeLod(source_cube, H, 0.0).rgb * NdotL;
L.y = -L.y;
sum.rgb += textureCubeLod(source_cube, L, 0.0).rgb * NdotL;
#endif
sum.a += NdotL;

10
drivers/gles3/shaders/cubemap_filter.glsl
View file

@ -244,23 +244,23 @@ void main() {
vec3 H = ImportanceSampleGGX(xi, roughness, N);
vec3 V = N;
vec3 L = normalize(2.0 * dot(V, H) * H - V);
vec3 L = (2.0 * dot(V, H) * H - V);
float ndotl = clamp(dot(N, L), 0.0, 1.0);
if (ndotl > 0.0) {
#ifdef USE_SOURCE_PANORAMA
sum.rgb += texturePanorama(H, source_panorama).rgb * ndotl;
sum.rgb += texturePanorama(L, source_panorama).rgb * ndotl;
#endif
#ifdef USE_SOURCE_DUAL_PARABOLOID_ARRAY
sum.rgb += textureDualParaboloidArray(H).rgb * ndotl;
sum.rgb += textureDualParaboloidArray(L).rgb * ndotl;
#endif
#if !defined(USE_SOURCE_DUAL_PARABOLOID_ARRAY) && !defined(USE_SOURCE_PANORAMA)
H.y = -H.y;
sum.rgb += textureLod(source_cube, H, 0.0).rgb * ndotl;
L.y = -L.y;
sum.rgb += textureLod(source_cube, L, 0.0).rgb * ndotl;
#endif
sum.a += ndotl;
}