blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

EEVEE-Next: Add horizon scan to raytracing module #114259

Merged
Clément Foucault merged 51 commits from fclem/blender:eevee-next-horizon-gi into main 2023-11-21 16:24:23 +01:00
Conversation 7 Commits 51 Files Changed 26 +10 -12
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 944f0009f8 - Show all commits

22
source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_eval_lib.glsl
View File

@ -153,9 +153,7 @@ float bxdf_eval(ClosureDiffuse closure, vec3 L, vec3 V)
float bxdf_eval(ClosureReflection closure, vec3 L, vec3 V)
{
/* TODO(fclem): Figure out how to make it work properly. Currently losses too much energy. */
return bsdf_ggx(closure.N, L, V, closure.roughness);
// return bsdf_lambert(closure.N, L);
}
float bxdf_eval(ClosureRefraction closure, vec3 L, vec3 V)
@ -171,25 +169,25 @@ void horizon_scan_context_sample_finish(
vec3 sample_normal = horizon_scan_sample_normal(sample_uv);
/* Discard backfacing samples.
* The paper suggests a smooth test which is not physically correct since we
* already consider the sample reflected radiance. */
// sample_radiance *= step(dot(sample_normal, -L), 0.0);
float bxdf = 1.0;
* already consider the sample reflected radiance.
* Set the weight to allow energy conservation. If we modulate the radiance, we loose energy. */
float weight = step(dot(sample_normal, -L), 0.0);
#ifdef HORIZON_OCCLUSION
horizon_scan_context_sample_finish(ctx.occlusion_common, sample_radiance, bxdf, theta, bias);
horizon_scan_context_sample_finish(ctx.occlusion_common, sample_radiance, 1.0, theta, bias);
#endif
#ifdef HORIZON_DIFFUSE
bxdf = bxdf_eval(ctx.diffuse, L, V);
horizon_scan_context_sample_finish(ctx.diffuse_common, sample_radiance, bxdf, theta, bias);
weight = bxdf_eval(ctx.diffuse, L, V);
horizon_scan_context_sample_finish(ctx.diffuse_common, sample_radiance, weight, theta, bias);
#endif
#ifdef HORIZON_REFLECT
bxdf = bxdf_eval(ctx.reflection, L, V);
horizon_scan_context_sample_finish(ctx.reflection_common, sample_radiance, bxdf, theta, bias);
weight = bxdf_eval(ctx.reflection, L, V);
horizon_scan_context_sample_finish(ctx.reflection_common, sample_radiance, weight, theta, bias);
#endif
#ifdef HORIZON_REFRACT
/* TODO(fclem): Broken: Black. */
bxdf = bxdf_eval(ctx.refraction, L, V);
horizon_scan_context_sample_finish(ctx.refraction_common, sample_radiance, bxdf, theta, bias);
weight = bxdf_eval(ctx.refraction, L, V);
horizon_scan_context_sample_finish(ctx.refraction_common, sample_radiance, weight, theta, bias);
#endif
}