griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Eevee: Fix SSS mixing with transparent bsdf

Browse Source
This commit is contained in:
Clément Foucault
2017-11-25 17:40:05 +01:00
parent 5dfeecf47b
commit 0c4740735c
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
View File

@@ -612,14 +612,6 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
{
Closure cl;
#ifdef USE_SSS
cl.sss_data.rgb = mix(cl1.sss_data.rgb, cl2.sss_data.rgb, fac);
cl.sss_data.a = (cl1.sss_data.a > 0.0) ? cl1.sss_data.a : cl2.sss_data.a;
#ifdef USE_SSS_ALBEDO
cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
#endif
#endif
if (cl1.ssr_id == outputSsrId) {
cl.ssr_data = mix(cl1.ssr_data.xyzw, vec4(vec3(0.0), cl1.ssr_data.w), fac); /* do not blend roughness */
cl.ssr_normal = cl1.ssr_normal;
@@ -633,12 +625,34 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
}
if (cl1.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
cl1.radiance = cl2.radiance;
#ifdef USE_SSS
cl1.sss_data = cl2.sss_data;
#ifdef USE_SSS_ALBEDO
cl1.sss_albedo = cl2.sss_albedo;
#endif
#endif
}
if (cl2.ssr_id == TRANSPARENT_CLOSURE_FLAG) {
cl2.radiance = cl1.radiance;
#ifdef USE_SSS
cl2.sss_data = cl1.sss_data;
#ifdef USE_SSS_ALBEDO
cl2.sss_albedo = cl1.sss_albedo;
#endif
#endif
}
cl.radiance = mix(cl1.radiance, cl2.radiance, fac);
cl.opacity = mix(cl1.opacity, cl2.opacity, fac);
#ifdef USE_SSS
cl.sss_data.rgb = mix(cl1.sss_data.rgb, cl2.sss_data.rgb, fac);
cl.sss_data.a = (cl1.sss_data.a > 0.0) ? cl1.sss_data.a : cl2.sss_data.a;
#ifdef USE_SSS_ALBEDO
/* TODO Find a solution to this. Dither? */
cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
#endif
#endif
return cl;
}
@@ -648,6 +662,7 @@ Closure closure_add(Closure cl1, Closure cl2)
#ifdef USE_SSS
cl.sss_data = (cl1.sss_data.a > 0.0) ? cl1.sss_data : cl2.sss_data;
#ifdef USE_SSS_ALBEDO
/* TODO Find a solution to this. Dither? */
cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
#endif
#endif