blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Eevee: Fix refraction materials 

Fix refraction depth not working without ScreenSpace Refraction.
Fix ScreenSpace Refraction masking reflections.
This commit is contained in:
Clément Foucault 2018-11-08 13:07:22 +01:00
parent de8c2336ad
commit 1250ace641
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/engines/eevee/eevee_materials.c
View File

@ -407,10 +407,11 @@ static void add_standard_uniforms(
DRW_shgroup_uniform_texture_ref(shgrp, "probePlanars", &vedata->txl->planar_pool);
DRW_shgroup_uniform_int(shgrp, "outputSsrId", ssr_id, 1);
}
if (use_refract && use_ssrefraction) {
BLI_assert(refract_depth != NULL);
DRW_shgroup_uniform_float(shgrp, "refractionDepth", refract_depth, 1);
DRW_shgroup_uniform_texture_ref(shgrp, "colorBuffer", &vedata->txl->refract_color);
if (use_refract) {
DRW_shgroup_uniform_float_copy(shgrp, "refractionDepth", (refract_depth) ? *refract_depth : 0.0 );
if (use_ssrefraction) {
DRW_shgroup_uniform_texture_ref(shgrp, "colorBuffer", &vedata->txl->refract_color);
}
}
if ((vedata->stl->effects->enabled_effects & EFFECT_VOLUMETRIC) != 0 &&

48
source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
View File

@ -330,37 +330,55 @@ void CLOSURE_NAME(
/* ---------------------------- */
#if defined(CLOSURE_GLOSSY) || defined(CLOSURE_REFRACTION)
#ifdef CLOSURE_REFRACTION
#define ACCUM refr_accum
#if defined(CLOSURE_GLOSSY) && defined(CLOSURE_REFRACTION)
#define GLASS_ACCUM 1
#define ACCUM min(refr_accum.a, spec_accum.a)
#elif defined(CLOSURE_REFRACTION)
#define GLASS_ACCUM 0
#define ACCUM refr_accum.a
#else
#define ACCUM spec_accum
#define GLASS_ACCUM 0
#define ACCUM spec_accum.a
#endif
/* Starts at 1 because 0 is world probe */
for (int i = 1; ACCUM.a < 0.999 && i < prbNumRenderCube && i < MAX_PROBE; ++i) {
for (int i = 1; ACCUM < 0.999 && i < prbNumRenderCube && i < MAX_PROBE; ++i) {
float fade = probe_attenuation_cube(i, worldPosition);
if (fade > 0.0) {
#ifdef CLOSURE_GLOSSY
if (!(ssrToggle && ssr_id == outputSsrId)) {
vec3 spec = probe_evaluate_cube(i, worldPosition, spec_dir, roughness);
accumulate_light(spec, fade, spec_accum);
#if GLASS_ACCUM
if (spec_accum.a < 0.999) {
#endif
#ifdef CLOSURE_GLOSSY
if (!(ssrToggle && ssr_id == outputSsrId)) {
vec3 spec = probe_evaluate_cube(i, worldPosition, spec_dir, roughness);
accumulate_light(spec, fade, spec_accum);
}
#endif
#ifdef CLOSURE_CLEARCOAT
vec3 C_spec = probe_evaluate_cube(i, worldPosition, C_spec_dir, C_roughness);
accumulate_light(C_spec, fade, C_spec_accum);
#endif
#if GLASS_ACCUM
}
#endif
#ifdef CLOSURE_CLEARCOAT
vec3 C_spec = probe_evaluate_cube(i, worldPosition, C_spec_dir, C_roughness);
accumulate_light(C_spec, fade, C_spec_accum);
#if GLASS_ACCUM
if (refr_accum.a < 0.999) {
#endif
#ifdef CLOSURE_REFRACTION
vec3 trans = probe_evaluate_cube(i, refr_pos, refr_dir, roughnessSquared);
accumulate_light(trans, fade, refr_accum);
#ifdef CLOSURE_REFRACTION
vec3 trans = probe_evaluate_cube(i, refr_pos, refr_dir, roughnessSquared);
accumulate_light(trans, fade, refr_accum);
#endif
#if GLASS_ACCUM
}
#endif
}
}
#undef GLASS_ACCUM
#undef ACCUM
/* ---------------------------- */