forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust specular_multiscatter to not take LightingInput (#20068)

Browse Source 
Small refactor for a future bevy_solari PR.

Suggest reviewing while hiding the whitespace diff.
This commit is contained in:
JMS55 2025-07-10 21:54:53 -07:00 committed by GitHub
parent 6792cebfd0
commit 0d6c591491
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/bevy_pbr/src/render/pbr_lighting.wgsl
View File

@ -235,16 +235,13 @@ fn fresnel(f0: vec3<f32>, LdotH: f32) -> vec3<f32> {
// Multiscattering approximation: // Multiscattering approximation:
// <https://google.github.io/filament/Filament.html#listing_energycompensationimpl> // <https://google.github.io/filament/Filament.html#listing_energycompensationimpl>
fn specular_multiscatter( fn specular_multiscatter(
input: ptr<function, LightingInput>,
D: f32, D: f32,
V: f32, V: f32,
F: vec3<f32>, F: vec3<f32>,
F0: vec3<f32>,
F_ab: vec2<f32>,
specular_intensity: f32, specular_intensity: f32,
) -> vec3<f32> { ) -> vec3<f32> {
// Unpack.
let F0 = (*input).F0_;
let F_ab = (*input).F_ab;
var Fr = (specular_intensity * D * V) * F; var Fr = (specular_intensity * D * V) * F;
Fr *= 1.0 + F0 * (1.0 / F_ab.x - 1.0); Fr *= 1.0 + F0 * (1.0 / F_ab.x - 1.0);
return Fr; return Fr;
@ -329,7 +326,7 @@ fn specular(
let F = fresnel(F0, LdotH); let F = fresnel(F0, LdotH);
// Calculate the specular light. // Calculate the specular light.
let Fr = specular_multiscatter(input, D, V, F, specular_intensity); let Fr = specular_multiscatter(D, V, F, F0, (*input).F_ab, specular_intensity);
return Fr; return Fr;
} }
@ -397,7 +394,7 @@ fn specular_anisotropy(
let Fa = fresnel(F0, LdotH); let Fa = fresnel(F0, LdotH);
// Calculate the specular light. // Calculate the specular light.
let Fr = specular_multiscatter(input, Da, Va, Fa, specular_intensity); let Fr = specular_multiscatter(Da, Va, Fa, F0, (*input).F_ab, specular_intensity);
return Fr; return Fr;
} }
@ -482,7 +479,7 @@ fn cubemap_uv(direction: vec3<f32>, cubemap_type: u32) -> vec2<f32> {
), ),
max_axis != abs_direction.x max_axis != abs_direction.x
); );
var face_uv: vec2<f32>; var face_uv: vec2<f32>;
var divisor: f32; var divisor: f32;
var corner_uv: vec2<u32> = vec2(0, 0); var corner_uv: vec2<u32> = vec2(0, 0);
@ -500,12 +497,12 @@ fn cubemap_uv(direction: vec3<f32>, cubemap_type: u32) -> vec2<f32> {
face_uv = (face_uv / divisor) * 0.5 + 0.5; face_uv = (face_uv / divisor) * 0.5 + 0.5;
switch cubemap_type { switch cubemap_type {
case CUBEMAP_TYPE_CROSS_VERTICAL: { case CUBEMAP_TYPE_CROSS_VERTICAL: {
face_size = vec2(1.0/3.0, 1.0/4.0); face_size = vec2(1.0/3.0, 1.0/4.0);
corner_uv = vec2<u32>((0x111102u >> (4 * face_index)) & 0xFu, (0x132011u >> (4 * face_index)) & 0xFu); corner_uv = vec2<u32>((0x111102u >> (4 * face_index)) & 0xFu, (0x132011u >> (4 * face_index)) & 0xFu);
} }
case CUBEMAP_TYPE_CROSS_HORIZONTAL: { case CUBEMAP_TYPE_CROSS_HORIZONTAL: {
face_size = vec2(1.0/4.0, 1.0/3.0); face_size = vec2(1.0/4.0, 1.0/3.0);
corner_uv = vec2<u32>((0x131102u >> (4 * face_index)) & 0xFu, (0x112011u >> (4 * face_index)) & 0xFu); corner_uv = vec2<u32>((0x131102u >> (4 * face_index)) & 0xFu, (0x112011u >> (4 * face_index)) & 0xFu);
} }
case CUBEMAP_TYPE_SEQUENCE_HORIZONTAL: { case CUBEMAP_TYPE_SEQUENCE_HORIZONTAL: {
@ -765,7 +762,7 @@ fn directional_light(
view_bindings::clustered_decal_sampler, view_bindings::clustered_decal_sampler,
decal_uv - floor(decal_uv), decal_uv - floor(decal_uv),
0.0 0.0
).r; ).r;
} else { } else {
texture_sample = 0f; texture_sample = 0f;
} }