fix: fix TextMeshPro shader (underlay and bevel)

This commit is contained in:
mob-sakai
2024-12-11 19:39:44 +09:00
parent c893cb0ce2
commit f39097a73f
2 changed files with 4 additions and 15 deletions
@@ -275,7 +275,7 @@ SubShader {
float c = tex2D(_MainTex, input.atlas + uvMove).a;
#ifndef UNDERLAY_ON
clip(c - input.param.x);
c *= step(input.param.x, c);
#endif
float scale = input.param.y;
@@ -298,7 +298,7 @@ SubShader {
#if BEVEL_ON
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
float3 n = GetSurfaceNormal(input.atlas + uvMove, weight, dxy);
float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz;
bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5));
@@ -330,16 +330,6 @@ SubShader {
faceColor.rgb += glowColor.rgb * glowColor.a;
#endif
// Alternative implementation to UnityGet2DClipping with support for softness.
#if UNITY_UI_CLIP_RECT
half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(input.mask.xy)) * input.mask.zw);
faceColor *= m.x * m.y;
#endif
#if UNITY_UI_ALPHACLIP
clip(faceColor.a - 0.001);
#endif
return faceColor * input.color.a;
}
#define UIEFFECT_TEXTMESHPRO 1
@@ -267,8 +267,7 @@ SubShader {
float c = tex2D(_MainTex, input.atlas + uvMove).a;
#ifndef UNDERLAY_ON
if (c - input.param.x < 0)
return fixed4(0,0,0,0);
c *= step(input.param.x, c);
#endif
float scale = input.param.y;
@@ -291,7 +290,7 @@ SubShader {
#if BEVEL_ON
float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0);
float3 n = GetSurfaceNormal(input.atlas, weight, dxy);
float3 n = GetSurfaceNormal(input.atlas + uvMove, weight, dxy);
float3 bump = UnpackNormal(tex2D(_BumpMap, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y)).xyz;
bump *= lerp(_BumpFace, _BumpOutline, saturate(sd + outline * 0.5));