blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

EEVEE Next: Volumes #107176

Merged
Miguel Pozo merged 126 commits from pragma37/blender:pull-eevee-next-volumes into main 2023-08-04 16:47:22 +02:00
Conversation 5 Commits 126 Files Changed 35 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d3d3d6b0b3 - Show all commits

9
source/blender/draw/engines/eevee_next/shaders/eevee_volume_material_comp.glsl
View File

@ -69,9 +69,10 @@ void main()
nodetree_volume();
vec3 scattering = g_volume_scatter_data.scattering;
float anisotropy = g_volume_scatter_data.anisotropy;
vec3 absorption = g_volume_absorption_data.absorption;
vec3 emission = g_emission;
float anisotropy = g_volume_scatter_data.anisotropy;
vec2 phase = vec2(anisotropy, 1.0);
#ifdef MAT_GEOM_VOLUME_OBJECT
scattering *= drw_volume.density_scale;
@ -83,7 +84,7 @@ void main()
/* Do not add phase weight if there's no scattering. */
if (all(equal(scattering, vec3(0.0)))) {
anisotropy = 0.0;
phase = vec2(0.0);
}
#ifdef MAT_GEOM_VOLUME_OBJECT
@ -92,11 +93,11 @@ void main()
scattering += imageLoad(out_scattering_img, froxel).rgb;
extinction += imageLoad(out_extinction_img, froxel).rgb;
emission += imageLoad(out_emissive_img, froxel).rgb;
anisotropy += imageLoad(out_phase_img, froxel).r;
phase += imageLoad(out_phase_img, froxel).rg;
#endif
imageStore(out_scattering_img, froxel, vec4(scattering, 1.0));
imageStore(out_extinction_img, froxel, vec4(extinction, 1.0));
imageStore(out_emissive_img, froxel, vec4(emission, 1.0));
imageStore(out_phase_img, froxel, vec4(anisotropy, vec3(1.0)));
imageStore(out_phase_img, froxel, vec4(phase, vec2(1.0)));
}

1
source/blender/draw/engines/eevee_next/shaders/eevee_volume_scatter_comp.glsl
View File

@ -63,6 +63,7 @@ void main()
vec3 V = cameraVec(P);
vec2 phase = imageLoad(in_phase_img, froxel).rg;
/* Divide by phase total weight, to compute the mean anisotropy. */
fclem marked this conversation as resolved Outdated
Clément Foucault commented 2023-04-23 22:43:22 +02:00
Outdated
Review
Copy Link

This need a comment explaining why we divide by 2nd component.

This need a comment explaining why we divide by 2nd component.
Miguel Pozo commented 2023-04-24 16:39:17 +02:00
Outdated
Review
Copy Link

To be honest I have no idea. Currently, only the first channel is ever written to.
It was like this in the current implementation so I left it there.
I assumed the second channel was intended to be used eventually.

To be honest I have no idea. Currently, only the first channel is ever written to. It was like this in the current implementation so I left it there. I assumed the second channel was intended to be used eventually.
Clément Foucault commented 2023-05-10 17:28:41 +02:00
Outdated
Review
Copy Link

It is used to store the number or phase that were written to it. This way we take the mean phase still using addive blending.

It is used to store the number or phase that were written to it. This way we take the mean phase still using addive blending.
Miguel Pozo commented 2023-05-12 12:51:31 +02:00
Outdated
Review
Copy Link

Oops! This should be solved now.

Oops! This should be solved now.
float s_anisotropy = phase.x / max(1.0, phase.y);
fclem marked this conversation as resolved Outdated
Clément Foucault commented 2023-04-23 22:41:01 +02:00
Outdated
Review
Copy Link

This comment is obsolete.

This comment is obsolete.
scattering += irradiance_volumetric(P) * s_scattering * phase_function_isotropic();