Skip to content

Commit cd5bae6

Browse files
committed
update
1 parent 11251aa commit cd5bae6

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ void ToonShading(
4141
const float oneMinusHighPow5 = _HighlightRimlightMath.y;
4242

4343
//Specular
44-
//[TODO-sin: 2026-1-27] We can cache lerp and pow results here
44+
//[TODO-sin: 2026-2-27] We only use one channel from highlightMaskTex ?
4545
float tweakHighColorMask = saturate(highlightMaskTex.g + _Tweak_HighColorMaskLevel)
46-
* lerp(1.0 - step(specular, oneMinusHighPow5),
47-
pow(abs(specular), exp2High), _Is_SpecularToHighColor);
46+
* lerp(1.0 - step(specular, oneMinusHighPow5), pow(abs(specular), exp2High), _Is_SpecularToHighColor);
4847

4948
const float3 highColor = (lerp(highlightAlbedo, highlightAlbedo * lightColor, _Is_LightColor_HighColor)
5049
* tweakHighColorMask);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,13 @@ void ToonShadingSG(
4545

4646
float specular = 0.5 * dot(halfDirection, lerp(vertexNormalWS, perturbedNormalWS, _Is_NormalMapToHighColor)) + 0.5;
4747

48+
const float exp2High = _HighlightRimlightMath.x;
49+
const float oneMinusHighPow5 = _HighlightRimlightMath.y;
50+
4851
// Specular
49-
float tweakHighColorMask = (saturate((highlightMaskTex.g + _Tweak_HighColorMaskLevel)) * lerp(
50-
(1.0 - step(specular, (1.0 - pow(abs(_HighColor_Power), 5)))),
51-
pow(abs(specular), exp2(lerp(11, 1, _HighColor_Power))), _Is_SpecularToHighColor));
52+
//[TODO-sin: 2026-2-27] We only use one channel from highlightMaskTex ?
53+
float tweakHighColorMask = saturate(highlightMaskTex.g + _Tweak_HighColorMaskLevel)
54+
* lerp(1.0 - step(specular, oneMinusHighPow5),pow(abs(specular), exp2High), _Is_SpecularToHighColor);
5255

5356
float3 highColor = (lerp(highlightAlbedo, highlightAlbedo * lightColor, _Is_LightColor_HighColor)
5457
* tweakHighColorMask);

0 commit comments

Comments
 (0)