Skip to content

Refactor feather bracket #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sindharta wants to merge 2 commits into
base: master
Choose a base branch
from
+77 −79
Open

Refactor feather bracket #733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c78982e
fix bracket position
sindharta Feb 4, 2026
5c7b416
move bracket
sindharta Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 77 additions & 79 deletions ...unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToonBodyDoubleShadeWithFeather.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,46 +367,45 @@ void frag(VertexOutput i, out float4 finalRGBA : SV_Target0
#ifdef _LIGHT_LAYERS
, meshRenderingLayers
#endif
);

float3 lightDirection = additionalLight.direction;
//v.2.0.5:
float3 addPassLightColor = (0.5 * dot(lerp(i.normalDir, normalDirection, _Is_NormalMapToBase), lightDirection) +
0.5) * additionalLightColor.rgb;
float pureIntencity = max(0.001,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b));
float3 lightColor = max(float3(0.0, 0.0, 0.0), lerp(addPassLightColor,
lerp(float3(0.0, 0.0, 0.0), min(addPassLightColor, addPassLightColor / pureIntencity), notDirectional),
_Is_Filter_LightColor));

//v.2.0.5: If Added lights is directional, set 0 as _LightIntensity
float _LightIntensity = lerp(0,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b),
notDirectional);

float lightIntensity = _LightIntensity;
float tweakShadows = 1.0 + _Tweak_SystemShadowsLevel;
float baseColorStep = saturate(_BaseColor_Step + _StepOffset);
float shadeColorStep = saturate(_ShadeColor_Step + _StepOffset);
float specularBlendModeLerp = 1;
float filterHighlightInForwardAdd = _Is_Filter_HiCutPointLightColor;
float3 finalColor = float3(0,0,0);
float unused = 0;
ToonShading(
firstShadePosTex, secondShadePosTex, highlightTex.rgb,
highlightMaskTex.rgb,lightColor.rgb, lightIntensity, tweakShadows,
baseAlbedo.rgb, firstShadeAlbedo.rgb, secondShadeAlbedo.rgb,
baseColorStep, shadeColorStep,
i.normalDir, normalDirection,lightDirection.xyz,viewDirection.xyz,
specularBlendModeLerp, filterHighlightInForwardAdd,
finalColor, unused);


finalColor = SATURATE_IF_SDR(finalColor);

pointLightColor += finalColor;
}
}
);

float3 lightDirection = additionalLight.direction;
//v.2.0.5:
float3 addPassLightColor = (0.5 * dot(lerp(i.normalDir, normalDirection, _Is_NormalMapToBase), lightDirection) +
0.5) * additionalLightColor.rgb;
float pureIntencity = max(0.001,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b));
float3 lightColor = max(float3(0.0, 0.0, 0.0), lerp(addPassLightColor,
lerp(float3(0.0, 0.0, 0.0), min(addPassLightColor, addPassLightColor / pureIntencity), notDirectional),
_Is_Filter_LightColor));

//v.2.0.5: If Added lights is directional, set 0 as _LightIntensity
float _LightIntensity = lerp(0,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b),
notDirectional);

float lightIntensity = _LightIntensity;
float tweakShadows = 1.0 + _Tweak_SystemShadowsLevel;
float baseColorStep = saturate(_BaseColor_Step + _StepOffset);
float shadeColorStep = saturate(_ShadeColor_Step + _StepOffset);
float specularBlendModeLerp = 1;
float filterHighlightInForwardAdd = _Is_Filter_HiCutPointLightColor;
float3 finalColor = float3(0,0,0);
float unused = 0;
ToonShading(
firstShadePosTex, secondShadePosTex, highlightTex.rgb,
highlightMaskTex.rgb,lightColor.rgb, lightIntensity, tweakShadows,
baseAlbedo.rgb, firstShadeAlbedo.rgb, secondShadeAlbedo.rgb,
baseColorStep, shadeColorStep,
i.normalDir, normalDirection,lightDirection.xyz,viewDirection.xyz,
specularBlendModeLerp, filterHighlightInForwardAdd,
finalColor, unused);

finalColor = SATURATE_IF_SDR(finalColor);

pointLightColor += finalColor;
}
}
#endif // USE_FORWARD_PLUS

// determine main light inorder to apply light culling
Expand All @@ -430,48 +429,47 @@ void frag(VertexOutput i, out float4 finalRGBA : SV_Target0
half3 additionalLightColor = GetLightColor(
additionalLight
#ifdef _LIGHT_LAYERS
, meshRenderingLayers
, meshRenderingLayers
#endif
);

float3 lightDirection = additionalLight.direction;
//v.2.0.5:
float3 addPassLightColor = (0.5 * dot(lerp(i.normalDir, normalDirection, _Is_NormalMapToBase), lightDirection) +
0.5) * additionalLightColor.rgb;
float pureIntencity = max(0.001,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b));
float3 lightColor = max(float3(0.0, 0.0, 0.0), lerp(addPassLightColor,
lerp(float3(0.0, 0.0, 0.0), min(addPassLightColor, addPassLightColor / pureIntencity), notDirectional),
_Is_Filter_LightColor));

//v.2.0.5: If Added lights is directional, set 0 as _LightIntensity
float _LightIntensity = lerp(0,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b),
notDirectional);

float lightIntensity = _LightIntensity;
float tweakShadows = 1.0 + _Tweak_SystemShadowsLevel;
float baseColorStep = saturate(_BaseColor_Step + _StepOffset);
float shadeColorStep = saturate(_ShadeColor_Step + _StepOffset);
float specularBlendModeLerp = 1;
float filterHighlightInForwardAdd = _Is_Filter_HiCutPointLightColor;
float3 finalColor = float3(0,0,0);
float unused = 0;
ToonShading(
firstShadePosTex, secondShadePosTex, highlightTex.rgb,
highlightMaskTex.rgb,lightColor.rgb, lightIntensity, tweakShadows,
baseAlbedo.rgb, firstShadeAlbedo.rgb, secondShadeAlbedo.rgb,
baseColorStep, shadeColorStep,
i.normalDir, normalDirection,lightDirection.xyz,viewDirection.xyz,
specularBlendModeLerp, filterHighlightInForwardAdd,
finalColor, unused);

);

float3 lightDirection = additionalLight.direction;
//v.2.0.5:
float3 addPassLightColor = (0.5 * dot(lerp(i.normalDir, normalDirection, _Is_NormalMapToBase), lightDirection) +
0.5) * additionalLightColor.rgb;
float pureIntencity = max(0.001,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b));
float3 lightColor = max(float3(0.0, 0.0, 0.0), lerp(addPassLightColor,
lerp(float3(0.0, 0.0, 0.0), min(addPassLightColor, addPassLightColor / pureIntencity), notDirectional),
_Is_Filter_LightColor));

//v.2.0.5: If Added lights is directional, set 0 as _LightIntensity
float _LightIntensity = lerp(0,
(0.299 * additionalLightColor.r + 0.587 * additionalLightColor.g + 0.114 * additionalLightColor.b),
notDirectional);
float lightIntensity = _LightIntensity;
float tweakShadows = 1.0 + _Tweak_SystemShadowsLevel;
float baseColorStep = saturate(_BaseColor_Step + _StepOffset);
float shadeColorStep = saturate(_ShadeColor_Step + _StepOffset);
float specularBlendModeLerp = 1;
float filterHighlightInForwardAdd = _Is_Filter_HiCutPointLightColor;
float3 finalColor = float3(0,0,0);
float unused = 0;
ToonShading(
firstShadePosTex, secondShadePosTex, highlightTex.rgb,
highlightMaskTex.rgb,lightColor.rgb, lightIntensity, tweakShadows,
baseAlbedo.rgb, firstShadeAlbedo.rgb, secondShadeAlbedo.rgb,
baseColorStep, shadeColorStep,
i.normalDir, normalDirection,lightDirection.xyz,viewDirection.xyz,
specularBlendModeLerp, filterHighlightInForwardAdd,
finalColor, unused);

finalColor = SATURATE_IF_SDR(finalColor);
finalColor = SATURATE_IF_SDR(finalColor);

pointLightColor += finalColor;
// pointLightColor += lightColor;
}
pointLightColor += finalColor;
}
UTS_LIGHT_LOOP_END

#endif
Expand Down