Fix specular visible in shadow [bce08a4 backport]

Delt06 · May 25, 2022 · 650aa14 · 650aa14
1 parent ccea415
commit 650aa14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../com.deltation.toon-shader/Assets/DELTation/ToonShader/Shaders/ToonShaderForwardPass.hlsl b/.../com.deltation.toon-shader/Assets/DELTation/ToonShader/Shaders/ToonShaderForwardPass.hlsl
@@ -180,6 +180,7 @@ half4 frag(const v2f input) : SV_Target
     half3 specular_color = 0;
     #ifdef _SPECULAR
     specular_color = get_specular_color(main_light.color, view_direction_ws, normal_ws, tangent_ws, light_direction_ws);
+    specular_color *= main_light_attenuation;
     #endif
 
     #if defined(TOON_ADDITIONAL_LIGHTS)

diff --git a/Packages/com.deltation.toon-shader/Assets/DELTation/ToonShader/Shaders/ToonShaderUtils.hlsl b/Packages/com.deltation.toon-shader/Assets/DELTation/ToonShader/Shaders/ToonShaderUtils.hlsl
@@ -211,12 +211,11 @@ inline void additional_lights(const half4 position_cs, const float3 position_ws,
         #else
         ramp_color *= brightness;
         #endif
-        const half attenuation_step = step(0.001, attenuation);
-        diffuse_color += ramp_color * attenuation_step;
+        diffuse_color += ramp_color;
 
         #ifdef TOON_ADDITIONAL_LIGHTS_SPECULAR
         specular_color += get_specular_color(light.color, view_direction_ws, normal_ws, tangent_ws, light.direction) *
-            attenuation_step;
+            attenuation;
         #endif
     }
 }