test

Author: sindharta

com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToonBodyDoubleShadeWithFeather.hlsl

@@ -1,4 +1,6 @@
 
+#include "../../Shaders/URP/ToonShading.hlsl"
+
 void ToonShading(
     const float4 firstShadePosTex, const float4 secondShadePosTex, const float3 highlightTex, 
     const float3 highlightMaskTex,
@@ -23,14 +25,21 @@ void ToonShading(
     float halfLambert = 0.5 * dot(lerp(vertexNormalWS, perturbedNormalWS, _Is_NormalMapToBase), lightDirection) + 0.5;
 
     //[TODO-sin: 2026-1-27] It looks like we only need one channel of firstShadePosTex
-    float Set_FinalShadowMask = saturate(
-        1.0 + (lerp(halfLambert, halfLambert * saturate(tweakShadows), _Set_SystemShadowsToBase)
-            - baseStepMinusFeather) * ((1.0 - firstShadePosTex.rgb).r - 1.0) / (baseColorStep - baseStepMinusFeather));
-    //
-    //Composition: 3 Basic Colors as Set_FinalBaseColor
-    float3 finalColor = lerp(Set_BaseColor, lerp(Set_1st_ShadeColor, Set_2nd_ShadeColor,
-        saturate(( 1.0 + (halfLambert - firstStepMinusFeather) * ((1.0 - secondShadePosTex.rgb).r - 1.0)
-              / (shadeColorStep - firstStepMinusFeather)))), Set_FinalShadowMask); 
+    // float Set_FinalShadowMask = saturate(
+    //     1.0 + (lerp(halfLambert, halfLambert * saturate(tweakShadows), _Set_SystemShadowsToBase)
+    //         - baseStepMinusFeather) * ((1.0 - firstShadePosTex.rgb).r - 1.0) / (baseColorStep - baseStepMinusFeather));
+
+    
+    const float dotNL = dot( perturbedNormalWS, lightDirection);
+    const float dotNL_01 = 0.5 * dotNL + 0.5;
+    float shadowFactor = lerp(1,tweakShadows,saturate(dotNL));
+    
+    float3 finalColor = ThreeColorsLinearShading(Set_BaseColor, Set_1st_ShadeColor, Set_2nd_ShadeColor, 
+        baseColorStep, _BaseShade_Feather, shadeColorStep, 
+        _1st2nd_Shades_Feather, dotNL_01 * shadowFactor);
+    
+    float Set_FinalShadowMask = dotNL_01 * shadowFactor * firstShadePosTex.r;
+///
 
     float specular = 0.5 * dot(halfDirection, lerp(vertexNormalWS, perturbedNormalWS, _Is_NormalMapToHighColor)) + 0.5;