Revert "fix specular?"

This reverts commit 8670786.

Author: aevyrie

crates/bevy_pbr/src/render/pbr_lighting.wgsl

@@ -348,14 +348,13 @@ fn derive_lighting_input(N: vec3<f32>, V: vec3<f32>, L: vec3<f32>) -> DerivedLig
     return input;
 }
 
-// Returns L in the `xyz` components and the modified roughness in the `w` component.
+// Returns L in the `xyz` components and the specular intensity in the `w` component.
 fn compute_specular_layer_values_for_point_light(
     input: ptr<function, LightingInput>,
     layer: u32,
     V: vec3<f32>,
     light_to_frag: vec3<f32>,
     light_position_radius: f32,
-    distance: f32,
 ) -> vec4<f32> {
     // Unpack.
     let R = (*input).layers[layer].R;
@@ -383,24 +382,22 @@ fn compute_specular_layer_values_for_point_light(
     let closestPoint = light_to_frag + centerToRay * saturate(
         light_position_radius * inverseSqrt(dot(centerToRay, centerToRay)));
     let LspecLengthInverse = inverseSqrt(dot(closestPoint, closestPoint));
-
-    // a' = saturate( a + sourceRadius / (2 * distance) )
-    // see Karis 2013
-    let a_prime = saturate(a + light_position_radius / (2.0 * distance));
+    let normalizationFactor = a / saturate(a + (light_position_radius * 0.5 * LspecLengthInverse));
+    let intensity = normalizationFactor * normalizationFactor;
 
     let L: vec3<f32> = closestPoint * LspecLengthInverse; // normalize() equivalent?
-    return vec4(L, a_prime);
+    return vec4(L, intensity);
 }
 
 // Cook-Torrance approximation of the microfacet model integration using Fresnel law F to model f_m
 // f_r(v,l) = { D(h,α) G(v,l,α) F(v,h,f0) } / { 4 (n⋅v) (n⋅l) }
 fn specular(
     input: ptr<function, LightingInput>,
     derived_input: ptr<function, DerivedLightingInput>,
-    roughness: f32,
     specular_intensity: f32,
 ) -> vec3<f32> {
     // Unpack.
+    let roughness = (*input).layers[LAYER_BASE].roughness;
     let NdotV = (*input).layers[LAYER_BASE].NdotV;
     let F0 = (*input).F0_;
     let NdotL = (*derived_input).NdotL;
@@ -428,10 +425,10 @@ fn specular_clearcoat(
     input: ptr<function, LightingInput>,
     derived_input: ptr<function, DerivedLightingInput>,
     clearcoat_strength: f32,
-    roughness: f32,
     specular_intensity: f32,
 ) -> vec2<f32> {
     // Unpack.
+    let roughness = (*input).layers[LAYER_CLEARCOAT].roughness;
     let NdotH = (*derived_input).NdotH;
     let LdotH = (*derived_input).LdotH;
 
@@ -452,10 +449,10 @@ fn specular_anisotropy(
     input: ptr<function, LightingInput>,
     derived_input: ptr<function, DerivedLightingInput>,
     L: vec3<f32>,
-    roughness: f32,
     specular_intensity: f32,
 ) -> vec3<f32> {
     // Unpack.
+    let roughness = (*input).layers[LAYER_BASE].roughness;
     let NdotV = (*input).layers[LAYER_BASE].NdotV;
     let V = (*input).V;
     let F0 = (*input).F0_;
@@ -623,31 +620,25 @@ fn point_light(
     let light_to_frag = (*light).position_radius.xyz - P;
     let L = normalize(light_to_frag);
     let distance_square = dot(light_to_frag, light_to_frag);
-    let distance = sqrt(distance_square);
     let rangeAttenuation = getDistanceAttenuation(distance_square, (*light).color_inverse_square_range.w);
 
     // Base layer
 
-    let a = (*input).layers[LAYER_BASE].roughness;
-    let specular_L_a_prime = compute_specular_layer_values_for_point_light(
+    let specular_L_intensity = compute_specular_layer_values_for_point_light(
         input,
         LAYER_BASE,
         V,
         light_to_frag,
         (*light).position_radius.w,
-        distance,
     );
-    let L_spec = specular_L_a_prime.xyz;
-    let a_prime = specular_L_a_prime.w;
-    var specular_derived_input = derive_lighting_input(N, V, L_spec);
+    var specular_derived_input = derive_lighting_input(N, V, specular_L_intensity.xyz);
 
-    let normalizationFactor = a / a_prime;
-    let specular_intensity = normalizationFactor * normalizationFactor;
+    let specular_intensity = specular_L_intensity.w;
 
 #ifdef STANDARD_MATERIAL_ANISOTROPY
-    let specular_light = specular_anisotropy(input, &specular_derived_input, L, a_prime, specular_intensity);
+    let specular_light = specular_anisotropy(input, &specular_derived_input, L, specular_intensity);
 #else   // STANDARD_MATERIAL_ANISOTROPY
-    let specular_light = specular(input, &specular_derived_input, a_prime, specular_intensity);
+    let specular_light = specular(input, &specular_derived_input, specular_intensity);
 #endif  // STANDARD_MATERIAL_ANISOTROPY
 
     // Clearcoat
@@ -656,32 +647,26 @@ fn point_light(
     // Unpack.
     let clearcoat_N = (*input).layers[LAYER_CLEARCOAT].N;
     let clearcoat_strength = (*input).clearcoat_strength;
-    let clearcoat_a = (*input).layers[LAYER_CLEARCOAT].roughness;
 
     // Perform specular input calculations again for the clearcoat layer. We
     // can't reuse the above because the clearcoat normal might be different
     // from the main layer normal.
-    let clearcoat_specular_L_a_prime = compute_specular_layer_values_for_point_light(
+    let clearcoat_specular_L_intensity = compute_specular_layer_values_for_point_light(
         input,
         LAYER_CLEARCOAT,
         V,
         light_to_frag,
         (*light).position_radius.w,
-        distance,
     );
-    let L_clearcoat_spec = clearcoat_specular_L_a_prime.xyz;
-    let clearcoat_a_prime = clearcoat_specular_L_a_prime.w;
     var clearcoat_specular_derived_input =
-        derive_lighting_input(clearcoat_N, V, L_clearcoat_spec);
+        derive_lighting_input(clearcoat_N, V, clearcoat_specular_L_intensity.xyz);
 
     // Calculate the specular light.
-    let clearcoat_normalizationFactor = clearcoat_a / clearcoat_a_prime;
-    let clearcoat_specular_intensity = clearcoat_normalizationFactor * clearcoat_normalizationFactor;
+    let clearcoat_specular_intensity = clearcoat_specular_L_intensity.w;
     let Fc_Frc = specular_clearcoat(
         input,
         &clearcoat_specular_derived_input,
         clearcoat_strength,
-        clearcoat_a_prime,
         clearcoat_specular_intensity
     );
     let inv_Fc = 1.0 - Fc_Frc.r;    // Inverse Fresnel term.
@@ -709,14 +694,14 @@ fn point_light(
 
     // NOTE: (*light).color.rgb is premultiplied with (*light).intensity / 4 π (which would be the luminous intensity) on the CPU
 
-    var color_times_NdotL: vec3<f32>;
+    var color: vec3<f32>;
 #ifdef STANDARD_MATERIAL_CLEARCOAT
     // Account for the Fresnel term from the clearcoat darkening the main layer.
     //
     // <https://google.github.io/filament/Filament.html#materialsystem/clearcoatmodel/integrationinthesurfaceresponse>
-    color_times_NdotL = (diffuse * derived_input.NdotL + specular_light * specular_derived_input.NdotL * inv_Fc) * inv_Fc + Frc * clearcoat_specular_derived_input.NdotL;
+    color = (diffuse + specular_light * inv_Fc) * inv_Fc + Frc;
 #else   // STANDARD_MATERIAL_CLEARCOAT
-    color_times_NdotL = diffuse * derived_input.NdotL + specular_light * specular_derived_input.NdotL;
+    color = diffuse + specular_light;
 #endif  // STANDARD_MATERIAL_CLEARCOAT
 
     var texture_sample = 1f;
@@ -737,8 +722,8 @@ fn point_light(
     }
 #endif
 
-    return color_times_NdotL * (*light).color_inverse_square_range.rgb *
-        rangeAttenuation * texture_sample;
+    return color * (*light).color_inverse_square_range.rgb *
+        (rangeAttenuation * derived_input.NdotL) * texture_sample;
 }
 
 fn spot_light(
@@ -812,23 +797,22 @@ fn directional_light(
     }
 
 #ifdef STANDARD_MATERIAL_ANISOTROPY
-    let specular_light = specular_anisotropy(input, &derived_input, L, roughness, 1.0);
+    let specular_light = specular_anisotropy(input, &derived_input, L, 1.0);
 #else   // STANDARD_MATERIAL_ANISOTROPY
-    let specular_light = specular(input, &derived_input, roughness, 1.0);
+    let specular_light = specular(input, &derived_input, 1.0);
 #endif  // STANDARD_MATERIAL_ANISOTROPY
 
 #ifdef STANDARD_MATERIAL_CLEARCOAT
     let clearcoat_N = (*input).layers[LAYER_CLEARCOAT].N;
     let clearcoat_strength = (*input).clearcoat_strength;
-    let clearcoat_roughness = (*input).layers[LAYER_CLEARCOAT].roughness;
 
     // Perform specular input calculations again for the clearcoat layer. We
     // can't reuse the above because the clearcoat normal might be different
     // from the main layer normal.
     var derived_clearcoat_input = derive_lighting_input(clearcoat_N, V, L);
 
     let Fc_Frc =
-        specular_clearcoat(input, &derived_clearcoat_input, clearcoat_strength, clearcoat_roughness, 1.0);
+        specular_clearcoat(input, &derived_clearcoat_input, clearcoat_strength, 1.0);
     let inv_Fc = 1.0 - Fc_Frc.r;
     let Frc = Fc_Frc.g;
 #endif  // STANDARD_MATERIAL_CLEARCOAT