diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader index c41faf5..fef7470 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIDissolve).shader @@ -114,7 +114,7 @@ SubShader { CGPROGRAM #pragma target 3.0 #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ BEVEL_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER #pragma shader_feature __ GLOW_ON @@ -128,188 +128,26 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" + #define UI_DISSOLVE 1 #define DISSOLVE 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" #pragma shader_feature __ ADD SUBTRACT FILL - struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - half3 eParam : TEXCOORD6; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - half3 param = UnpackToVec3(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - }; - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; + // Dissolve + color = ApplyTransitionEffect(color, IN.eParam); + color.rgb *= color.a; - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, 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)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - 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 - - // Dissolve - faceColor = ApplyTransitionEffect(faceColor, input.eParam); - faceColor.rgb *= faceColor.a; - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); + clip(color.a - 0.001); #endif - - return faceColor * input.color.a; + + return color * IN.color.a; } - ENDCG } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader index bf6095f..b02d307 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIEffect).shader @@ -131,193 +131,39 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" + #define UI_EFFECT 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - #if EX - float2 uvMask : TEXCOORD2; - #endif - }; - - - struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - half eParam : TEXCOORD6; - #if EX - half4 uvMask : TEXCOORD7; - #endif - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) - { - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - half param = input.texcoord0.y; - input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - #if EX - half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), - #endif - }; - - return output; - } - - - fixed4 PixShader(pixel_t input)// : SV_Target - { - - float c = tex2D(_MainTex, input.atlas).a; - -// #ifndef UNDERLAY_ON -// clip(c - input.param.x); -// #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - -// faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, 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)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - 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; - } - #include "UI-Effect-TMPro.cginc" + + fixed4 frag(pixel_t IN) : SV_Target + { + fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); + fixed effectFactor = param.x; + fixed colorFactor = param.y; + fixed blurFactor = param.z; + + #if PIXEL + half2 pixelSize = max(2, (1-effectFactor*0.95) * float2(_TextureWidth, _TextureHeight)); + UV(IN).xy = round(UV(IN).xy * pixelSize) / pixelSize; + #endif + + #if defined(UI_BLUR) && EX + half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4, IN.uvMask); + #elif defined(UI_BLUR) + half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4); + #else + half4 color = PixShader(IN) * IN.color.a; + #endif + + #if defined (UI_TONE) + color = ApplyToneEffect(color, effectFactor); + #endif + + color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); + color.rgb *= color.a; + + return color * IN.color.a; + } ENDCG } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader index f2928e5..14aecb4 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIHsvModifier).shader @@ -114,7 +114,7 @@ SubShader { CGPROGRAM #pragma target 3.0 #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ BEVEL_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER #pragma shader_feature __ GLOW_ON @@ -128,182 +128,23 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" + #define UI_HSV_MODIFIER 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" - struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - half eParam : TEXCOORD6; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - half param = input.texcoord0.y; - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - }; - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, 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)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - 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 - - // Hsv - faceColor = ApplyHsvEffect(faceColor, input.eParam); - faceColor.rgb *= input.color.rgb; - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); + clip(color.a - 0.001); #endif - return faceColor * input.color.a; + // Hsv + color = ApplyHsvEffect(color, IN.eParam); + color.rgb *= IN.color.rgb; + + return color * IN.color.a; } ENDCG diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader index a338251..ff9c4ca 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UIShiny).shader @@ -114,7 +114,7 @@ SubShader { CGPROGRAM #pragma target 3.0 #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ BEVEL_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER #pragma shader_feature __ GLOW_ON @@ -128,185 +128,23 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" + #define UI_SHINY 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - half2 eParam : TEXCOORD6; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) + #include "UI-Effect-TMPro.cginc" + + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - half2 param = UnpackToVec2(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - }; - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; - - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, 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)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - 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 - - // Shiny - faceColor = ApplyShinyEffect(faceColor, input.eParam); - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); + clip(color.a - 0.001); #endif - return faceColor * input.color.a; - } + // Shiny + color = ApplyShinyEffect(color, IN.eParam); + return color * IN.color.a; + } ENDCG } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader index da18e23..b6a4741 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF (UITransition).shader @@ -114,7 +114,7 @@ SubShader { CGPROGRAM #pragma target 3.0 #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ BEVEL_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER #pragma shader_feature __ GLOW_ON @@ -129,187 +129,25 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc" #define ADD 1 + #define UI_TRANSITION 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" #pragma shader_feature __ FADE CUTOFF DISSOLVE - struct vertex_t { - float4 position : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - - struct pixel_t { - float4 position : SV_POSITION; - fixed4 color : COLOR; - float2 atlas : TEXCOORD0; // Atlas - float4 param : TEXCOORD1; // alphaClip, scale, bias, weight - float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) - float3 viewDir : TEXCOORD3; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 texcoord2 : TEXCOORD4; // u,v, scale, bias - fixed4 underlayColor : COLOR1; - #endif - float4 textures : TEXCOORD5; - half3 eParam : TEXCOORD6; - }; - - // Used by Unity internally to handle Texture Tiling and Offset. - float4 _FaceTex_ST; - float4 _OutlineTex_ST; - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.position; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float bias =(.5 - weight) + (.5 / scale); - - float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); - - #if GLOW_ON - alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); - #endif - - alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; - - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4 underlayColor = _UnderlayColor; - underlayColor.rgb *= underlayColor.a; - - float bScale = scale; - bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); - float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 bOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Support for texture tiling and offset - float2 textureUV = UnpackUV(input.texcoord1.x); - float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); - float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); - - half3 param = UnpackToVec3(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - input.color, - input.texcoord0, - float4(alphaClip, scale, bias, weight), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), - #if (UNDERLAY_ON || UNDERLAY_INNER) - float4(input.texcoord0 + bOffset, bScale, bBias), - underlayColor, - #endif - float4(faceUV, outlineUV), - param, - }; - - return output; - } - - - fixed4 PixShader(pixel_t input) : SV_Target - { - float c = tex2D(_MainTex, input.atlas).a; - - #ifndef UNDERLAY_ON - clip(c - input.param.x); - #endif - - float scale = input.param.y; - float bias = input.param.z; - float weight = input.param.w; - float sd = (bias - c) * scale; - - float outline = (_OutlineWidth * _ScaleRatioA) * scale; - float softness = (_OutlineSoftness * _ScaleRatioA) * scale; - - half4 faceColor = _FaceColor; - half4 outlineColor = _OutlineColor; - - faceColor.rgb *= input.color.rgb; + // Transition + color = ApplyTransitionEffect(color, IN.eParam); + color.rgb *= color.a; - faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); - outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); - - faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); - - #if BEVEL_ON - float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); - float3 n = GetSurfaceNormal(input.atlas, 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)); - n = normalize(n- bump); - - float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); - - float3 col = GetSpecular(n, light); - faceColor.rgb += col*faceColor.a; - faceColor.rgb *= 1-(dot(n, light)*_Diffuse); - faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); - - fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); - faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; - #endif - - #if UNDERLAY_ON - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); - #endif - - #if UNDERLAY_INNER - float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; - faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); - #endif - - #if GLOW_ON - float4 glowColor = GetGlowColor(sd, scale); - 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 - - // Transition - faceColor = ApplyTransitionEffect(faceColor, input.eParam); - faceColor.rgb *= faceColor.a; - #if UNITY_UI_ALPHACLIP - clip(faceColor.a - 0.001); + clip(color.a - 0.001); #endif - return faceColor * input.color.a; + return color * IN.color.a; } - ENDCG } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader index c441706..2ad9fe1 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIDissolve).shader @@ -82,7 +82,7 @@ SubShader { Pass { CGPROGRAM #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ OUTLINE_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER @@ -93,147 +93,26 @@ SubShader { #include "UnityUI.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" + #define MOBILE 1 + #define UI_DISSOLVE 1 #define DISSOLVE 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" #pragma shader_feature __ ADD SUBTRACT FILL - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - half3 eParam : TEXCOORD5; - }; - - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); + // Dissolve + color = ApplyTransitionEffect(color, IN.eParam); + color.rgb *= color.a; - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - half3 param = UnpackToVec3(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - param, - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - // Dissolve - c = ApplyTransitionEffect(c, input.eParam); - c.rgb *= c.a; - #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); + clip(color.a - 0.001); #endif - - return c; + + return color * IN.color.a; } ENDCG } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader index 3ad4b54..77efd50 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIEffect).shader @@ -99,155 +99,39 @@ SubShader { #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" #define MOBILE 1 + #define UI_EFFECT 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - #if EX - float2 uvMask : TEXCOORD2; - #endif - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - fixed4 color : COLOR2; - half eParam : TEXCOORD5; - #if EX - half4 uvMask : TEXCOORD6; - #endif - }; - - - pixel_t VertShader(vertex_t input) - { - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - // float opacity = input.color.a; - //#if (UNDERLAY_ON | UNDERLAY_INNER) - // opacity = 1.0; - //#endif - - fixed4 faceColor = input.color * _FaceColor; - //faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - //outlineColor.a *= opacity; - //outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - half param = input.texcoord0.y; - input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - input.color, - param, - #if EX - half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), - #endif - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); - #endif - - return c * input.color.a; - } - #include "UI-Effect-TMPro.cginc" + + fixed4 frag(pixel_t IN) : SV_Target + { + fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); + fixed effectFactor = param.x; + fixed colorFactor = param.y; + fixed blurFactor = param.z; + + #if PIXEL + half2 pixelSize = max(2, (1-effectFactor*0.95) * float2(_TextureWidth, _TextureHeight)); + UV(IN).xy = round(UV(IN).xy * pixelSize) / pixelSize; + #endif + + #if defined(UI_BLUR) && EX + half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4, IN.uvMask); + #elif defined(UI_BLUR) + half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4); + #else + half4 color = PixShader(IN) * IN.color.a; + #endif + + #if defined (UI_TONE) + color = ApplyToneEffect(color, effectFactor); + #endif + + color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); + color.rgb *= color.a; + + return color * IN.color.a; + } ENDCG } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader index 33163e2..35ea899 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIHsvModifier).shader @@ -82,7 +82,7 @@ SubShader { Pass { CGPROGRAM #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ OUTLINE_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER @@ -93,144 +93,24 @@ SubShader { #include "UnityUI.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" + #define MOBILE 1 + #define UI_HSV_MODIFIER 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - half2 eParam : TEXCOORD5; - }; - - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - half2 param = UnpackToVec2(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - param, - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - // Hsv - c = ApplyHsvEffect(c, input.eParam); + half4 color = PixShader(IN); #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); + clip(color.a - 0.001); #endif - - return c; + + // Hsv + color = ApplyHsvEffect(color, IN.eParam); + color.rgb *= IN.color.rgb; + + return color * IN.color.a; } ENDCG } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader index b5cf5d6..c598b5f 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UIShiny).shader @@ -82,7 +82,7 @@ SubShader { Pass { CGPROGRAM #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ OUTLINE_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER @@ -93,144 +93,23 @@ SubShader { #include "UnityUI.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" - #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #define MOBILE 1 + #define UI_SHINY 1 + #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - half2 eParam : TEXCOORD5; - }; - - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); - - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - half2 param = UnpackToVec2(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - param, - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - // Shiny - c = ApplyShinyEffect(c, input.eParam); + half4 color = PixShader(IN); #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); + clip(color.a - 0.001); #endif - - return c; + + // Shiny + color = ApplyShinyEffect(color, IN.eParam); + + return color * IN.color.a; } ENDCG } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader index cd99921..8279ee2 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_SDF-Mobile (UITransition).shader @@ -82,7 +82,7 @@ SubShader { Pass { CGPROGRAM #pragma vertex VertShader - #pragma fragment PixShader + #pragma fragment frag #pragma shader_feature __ OUTLINE_ON #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER @@ -93,147 +93,26 @@ SubShader { #include "UnityUI.cginc" #include "Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc" + #define MOBILE 1 #define ADD 1 + #define UI_TRANSITION 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro.cginc" #pragma shader_feature __ FADE CUTOFF DISSOLVE - struct vertex_t { - float4 vertex : POSITION; - float3 normal : NORMAL; - fixed4 color : COLOR; - float2 texcoord0 : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - }; - - struct pixel_t { - float4 vertex : SV_POSITION; - fixed4 faceColor : COLOR; - fixed4 outlineColor : COLOR1; - float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV - half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) - half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved - half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) - #endif - half3 eParam : TEXCOORD5; - }; - - - pixel_t VertShader(vertex_t input) + fixed4 frag(pixel_t IN) : SV_Target { - float bold = step(input.texcoord1.y, 0); + half4 color = PixShader(IN); - float4 vert = input.vertex; - vert.x += _VertexOffsetX; - vert.y += _VertexOffsetY; - float4 vPosition = UnityObjectToClipPos(vert); - - float2 pixelSize = vPosition.w; - pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); + // Transition + color = ApplyTransitionEffect(color, IN.eParam); + color.rgb *= color.a; - float scale = rsqrt(dot(pixelSize, pixelSize)); - scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; - if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); - - float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; - weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; - - float layerScale = scale; - - scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); - float bias = (0.5 - weight) * scale - 0.5; - float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; - - float opacity = input.color.a; - #if (UNDERLAY_ON | UNDERLAY_INNER) - opacity = 1.0; - #endif - - fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; - faceColor.rgb *= faceColor.a; - - fixed4 outlineColor = _OutlineColor; - outlineColor.a *= opacity; - outlineColor.rgb *= outlineColor.a; - outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); - - #if (UNDERLAY_ON | UNDERLAY_INNER) - - layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); - float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); - - float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; - float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; - float2 layerOffset = float2(x, y); - #endif - - // Generate UV for the Masking Texture - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); - - // Structure for pixel shader - half3 param = UnpackToVec3(input.texcoord0.y); - input.texcoord0 = UnpackToVec2(input.texcoord0.x); - pixel_t output = { - vPosition, - faceColor, - outlineColor, - float4(input.texcoord0, maskUV.x, maskUV.y), - half4(scale, bias - outline, bias + outline, bias), - half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), - #if (UNDERLAY_ON | UNDERLAY_INNER) - float4(input.texcoord0 + layerOffset, input.color.a, 0), - half2(layerScale, layerBias), - #endif - param, - }; - - return output; - } - - - // PIXEL SHADER - fixed4 PixShader(pixel_t input) : SV_Target - { - half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; - half4 c = input.faceColor * saturate(d - input.param.w); - - #ifdef OUTLINE_ON - c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); - c *= saturate(d - input.param.y); - #endif - - #if UNDERLAY_ON - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); - #endif - - #if UNDERLAY_INNER - half sd = saturate(d - input.param.z); - d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; - c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); - c *= m.x * m.y; - #endif - - #if (UNDERLAY_ON | UNDERLAY_INNER) - c *= input.texcoord1.z; - #endif - - // Transition - c = ApplyTransitionEffect(c, input.eParam); - c.rgb *= c.a; - #if UNITY_UI_ALPHACLIP - clip(c.a - 0.001); + clip(color.a - 0.001); #endif - return c; + return color * IN.color.a; } ENDCG } diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader index 6fa175b..b176a7f 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIDissolve).shader @@ -57,52 +57,14 @@ #pragma multi_compile __ UNITY_UI_CLIP_RECT #pragma multi_compile __ UNITY_UI_ALPHACLIP - + + + #define UI_DISSOLVE 1 #define DISSOLVE 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro-Sprite.cginc" #pragma shader_feature __ ADD SUBTRACT FILL - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - half2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - half3 eParam : TEXCOORD2; - }; - - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - - OUT.texcoord = UnpackToVec2(IN.texcoord.x); - - #ifdef UNITY_HALF_TEXEL_OFFSET - OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); - #endif - - OUT.color = IN.color * _Color; - - OUT.eParam = UnpackToVec3(IN.texcoord.y); - - return OUT; - } - - sampler2D _MainTex; - fixed4 frag(v2f IN) : SV_Target { half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader index 35d49f7..7c51e34 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIEffect).shader @@ -63,60 +63,10 @@ #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR #pragma shader_feature __ EX + #define UI_EFFECT 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - #if EX - float2 uvMask : TEXCOORD2; - #endif - }; + #include "UI-Effect-TMPro-Sprite.cginc" - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - half2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - half eParam : TEXCOORD2; - #if EX - half4 uvMask : TEXCOORD3; - #endif - }; - - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - - OUT.texcoord = UnpackToVec2(IN.texcoord.x) * 2 - 0.5;; - - #ifdef UNITY_HALF_TEXEL_OFFSET - OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); - #endif - - OUT.color = IN.color * _Color; - - OUT.eParam = IN.texcoord.y; - - #if EX - OUT.uvMask = half4(UnpackToVec2(IN.uvMask.x), UnpackToVec2(IN.uvMask.y)); - #endif - - return OUT; - } - - sampler2D _MainTex; - float4 _MainTex_TexelSize; - fixed4 frag(v2f IN) : SV_Target { fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader index 4748687..5f30143 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIHsvModifier).shader @@ -58,48 +58,9 @@ #pragma multi_compile __ UNITY_UI_CLIP_RECT #pragma multi_compile __ UNITY_UI_ALPHACLIP + #define UI_HSV_MODIFIER 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - half2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - half eParam : TEXCOORD2; - }; - - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - - OUT.texcoord = UnpackToVec2(IN.texcoord.x); - - #ifdef UNITY_HALF_TEXEL_OFFSET - OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); - #endif - - OUT.color = IN.color * _Color; - - OUT.eParam = IN.texcoord.y; - - return OUT; - } - - sampler2D _MainTex; + #include "UI-Effect-TMPro-Sprite.cginc" fixed4 frag(v2f IN) : SV_Target { diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader index 2df0a6a..b68342d 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UIShiny).shader @@ -58,48 +58,9 @@ #pragma multi_compile __ UNITY_UI_CLIP_RECT #pragma multi_compile __ UNITY_UI_ALPHACLIP + #define UI_SHINY 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - half2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - half2 eParam : TEXCOORD2; - }; - - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - - OUT.texcoord = UnpackToVec2(IN.texcoord.x); - - #ifdef UNITY_HALF_TEXEL_OFFSET - OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); - #endif - - OUT.color = IN.color * _Color; - - OUT.eParam = UnpackToVec2(IN.texcoord.y); - - return OUT; - } - - sampler2D _MainTex; + #include "UI-Effect-TMPro-Sprite.cginc" fixed4 frag(v2f IN) : SV_Target { diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader index 27a3ea6..72ae8be 100755 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/TMP_Sprite (UITransition).shader @@ -58,50 +58,11 @@ #pragma multi_compile __ UNITY_UI_CLIP_RECT #pragma multi_compile __ UNITY_UI_ALPHACLIP + #define UI_TRANSITION 1 #define ADD 1 #include "Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.cginc" + #include "UI-Effect-TMPro-Sprite.cginc" #pragma shader_feature __ FADE CUTOFF DISSOLVE - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - half2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - half3 eParam : TEXCOORD2; - }; - - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - - v2f vert(appdata_t IN) - { - v2f OUT; - OUT.worldPosition = IN.vertex; - OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); - - OUT.texcoord = UnpackToVec2(IN.texcoord.x); - - #ifdef UNITY_HALF_TEXEL_OFFSET - OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); - #endif - - OUT.color = IN.color * _Color; - - OUT.eParam = UnpackToVec3(IN.texcoord.y); - - return OUT; - } - - sampler2D _MainTex; fixed4 frag(v2f IN) : SV_Target { diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc new file mode 100644 index 0000000..ed031ff --- /dev/null +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc @@ -0,0 +1,93 @@ +#ifndef UI_EFFECT_TMPRO_SPRITE_INCLUDED +#define UI_EFFECT_TMPRO_SPRITE_INCLUDED + +fixed4 _Color; +fixed4 _TextureSampleAdd; +float4 _ClipRect; +sampler2D _MainTex; +float4 _MainTex_TexelSize; + +struct appdata_t +{ + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; +#if EX + float2 uvMask : TEXCOORD2; +#endif +}; + +struct v2f +{ + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + half2 texcoord : TEXCOORD0; + float4 worldPosition : TEXCOORD1; +#if UI_DISSOLVE || UI_TRANSITION + half3 eParam : TEXCOORD2; +#elif UI_SHINY + half2 eParam : TEXCOORD2; +#else + half eParam : TEXCOORD2; +#endif +#if EX + half4 uvMask : TEXCOORD3; +#endif +}; + + +// v2f vert(appdata_t IN) +// { +// v2f OUT; +// OUT.worldPosition = IN.vertex; +// OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); +// +// OUT.texcoord = UnpackToVec2(IN.texcoord.x); +// +// #ifdef UNITY_HALF_TEXEL_OFFSET +// OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); +// #endif +// +// OUT.color = IN.color * _Color; +// +// OUT.eParam = UnpackToVec3(IN.texcoord.y); +// +// return OUT; +// } + +v2f vert(appdata_t IN) +{ + v2f OUT; + OUT.worldPosition = IN.vertex; + OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); + + #if UI_EFFECT + OUT.texcoord = UnpackToVec2(IN.texcoord.x) * 2 - 0.5; + #else + OUT.texcoord = UnpackToVec2(IN.texcoord.x); + #endif + + #ifdef UNITY_HALF_TEXEL_OFFSET + OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); + #endif + + OUT.color = IN.color * _Color; + + #if UI_DISSOLVE || UI_TRANSITION + OUT.eParam = UnpackToVec3(IN.texcoord.y); + #elif UI_SHINY + OUT.eParam = UnpackToVec2(IN.texcoord.y); + #else + OUT.eParam = IN.texcoord.y; + #endif + + #if EX + OUT.uvMask = half4(UnpackToVec2(IN.uvMask.x), UnpackToVec2(IN.uvMask.y)); + #endif + + return OUT; +} + + + +#endif // UI_EFFECT_TMPRO_SPRITE_INCLUDED diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc.meta b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc.meta new file mode 100644 index 0000000..c4238be --- /dev/null +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro-Sprite.cginc.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 39d13ff5e00704f319b9d2bbb61c5322 +timeCreated: 1487915863 +licenseType: Pro +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc index e5f2e65..bc41b46 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc +++ b/Assets/Coffee/UIExtensions/UIEffect/ForTMPro/Shaders/UI-Effect-TMPro.cginc @@ -1,14 +1,386 @@ #ifndef UI_EFFECT_TMPRO_INCLUDED #define UI_EFFECT_TMPRO_INCLUDED +// Used by Unity internally to handle Texture Tiling and Offset. +float4 _FaceTex_ST; +float4 _OutlineTex_ST; + + #if MOBILE #define UV(x) x.texcoord0 #define UV2(x) x.texcoord1 + +struct vertex_t { + float4 vertex : POSITION; + float3 normal : NORMAL; + fixed4 color : COLOR; + float2 texcoord0 : TEXCOORD0; + float2 texcoord1 : TEXCOORD1; +#if EX + float2 uvMask : TEXCOORD2; +#endif +}; + +struct pixel_t { + float4 vertex : SV_POSITION; + fixed4 faceColor : COLOR; + fixed4 outlineColor : COLOR1; + float4 texcoord0 : TEXCOORD0; // Texture UV, Mask UV + half4 param : TEXCOORD1; // Scale(x), BiasIn(y), BiasOut(z), Bias(w) + half4 mask : TEXCOORD2; // Position in clip space(xy), Softness(zw) +#if (UNDERLAY_ON | UNDERLAY_INNER) + float4 texcoord1 : TEXCOORD3; // Texture UV, alpha, reserved + half2 underlayParam : TEXCOORD4; // Scale(x), Bias(y) +#endif + fixed4 color : COLOR2; +#if UI_DISSOLVE || UI_TRANSITION + half3 eParam : TEXCOORD5; +#elif UI_SHINY + half2 eParam : TEXCOORD5; +#else + half eParam : TEXCOORD5; +#endif +#if EX + half4 uvMask : TEXCOORD6; +#endif +}; + + +pixel_t VertShader(vertex_t input) +{ + float bold = step(input.texcoord1.y, 0); + + float4 vert = input.vertex; + vert.x += _VertexOffsetX; + vert.y += _VertexOffsetY; + float4 vPosition = UnityObjectToClipPos(vert); + + float2 pixelSize = vPosition.w; + pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); + + float scale = rsqrt(dot(pixelSize, pixelSize)); + scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; + if(UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); + + float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; + weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; + + float layerScale = scale; + + scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale); + float bias = (0.5 - weight) * scale - 0.5; + float outline = _OutlineWidth * _ScaleRatioA * 0.5 * scale; + +// float opacity = input.color.a; +//#if (UNDERLAY_ON | UNDERLAY_INNER) +// opacity = 1.0; +//#endif + + fixed4 faceColor = input.color * _FaceColor; +// fixed4 faceColor = fixed4(input.color.rgb, opacity) * _FaceColor; +// faceColor.rgb *= faceColor.a; + + fixed4 outlineColor = _OutlineColor; +// outlineColor.a *= opacity; +// outlineColor.rgb *= outlineColor.a; + outlineColor = lerp(faceColor, outlineColor, sqrt(min(1.0, (outline * 2)))); + +#if (UNDERLAY_ON | UNDERLAY_INNER) + + layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale); + float layerBias = (.5 - weight) * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale); + + float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; + float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; + float2 layerOffset = float2(x, y); +#endif + + // Generate UV for the Masking Texture + float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); + float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); + + // Structure for pixel shader + #if UI_DISSOLVE || UI_TRANSITION + half3 param = UnpackToVec3(input.texcoord0.y); + #elif UI_SHINY + half2 param = UnpackToVec2(input.texcoord0.y); + #else + half param = input.texcoord0.y; + #endif + + #if UI_EFFECT + input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; + #else + input.texcoord0 = UnpackToVec2(input.texcoord0.x); + #endif + pixel_t output = { + vPosition, + faceColor, + outlineColor, + float4(input.texcoord0, maskUV.x, maskUV.y), + half4(scale, bias - outline, bias + outline, bias), + half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), + #if (UNDERLAY_ON | UNDERLAY_INNER) + float4(input.texcoord0 + layerOffset, input.color.a, 0), + half2(layerScale, layerBias), + #endif + input.color, + param, + #if EX + half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), + #endif + }; + + return output; +} + + +// PIXEL SHADER +fixed4 PixShader(pixel_t input) : SV_Target +{ + half d = tex2D(_MainTex, input.texcoord0.xy).a * input.param.x; + half4 c = input.faceColor * saturate(d - input.param.w); + +#ifdef OUTLINE_ON + c = lerp(input.outlineColor, input.faceColor, saturate(d - input.param.z)); + c *= saturate(d - input.param.y); +#endif + +#if UNDERLAY_ON + d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; + c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - input.underlayParam.y) * (1 - c.a); +#endif + +#if UNDERLAY_INNER + half sd = saturate(d - input.param.z); + d = tex2D(_MainTex, input.texcoord1.xy).a * input.underlayParam.x; + c += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - input.underlayParam.y)) * sd * (1 - c.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); + c *= m.x * m.y; +#endif + +#if (UNDERLAY_ON | UNDERLAY_INNER) +// c *= input.texcoord1.z; +#endif + +// Dissolve +//c = ApplyTransitionEffect(c, input.eParam); +//c.rgb *= c.a; + +#if UNITY_UI_ALPHACLIP + clip(c.a - 0.001); +#endif + + return c; +} + #else #define UV(x) x.atlas #define UV2(x) x.texcoord2 + +struct vertex_t { + float4 position : POSITION; + float3 normal : NORMAL; + fixed4 color : COLOR; + float2 texcoord0 : TEXCOORD0; + float2 texcoord1 : TEXCOORD1; +#if EX + float2 uvMask : TEXCOORD2; +#endif +}; + + +struct pixel_t { + float4 position : SV_POSITION; + fixed4 color : COLOR; + float2 atlas : TEXCOORD0; // Atlas + float4 param : TEXCOORD1; // alphaClip, scale, bias, weight + float4 mask : TEXCOORD2; // Position in object space(xy), pixel Size(zw) + float3 viewDir : TEXCOORD3; + +#if (UNDERLAY_ON || UNDERLAY_INNER) + float4 texcoord2 : TEXCOORD4; // u,v, scale, bias + fixed4 underlayColor : COLOR1; +#endif + float4 textures : TEXCOORD5; +#if UI_DISSOLVE || UI_TRANSITION + half3 eParam : TEXCOORD6; +#elif UI_SHINY + half2 eParam : TEXCOORD6; +#else + half eParam : TEXCOORD6; +#endif +#if EX + half4 uvMask : TEXCOORD7; +#endif +}; + +pixel_t VertShader(vertex_t input) +{ + float bold = step(input.texcoord1.y, 0); + + float4 vert = input.position; + vert.x += _VertexOffsetX; + vert.y += _VertexOffsetY; + + float4 vPosition = UnityObjectToClipPos(vert); + + float2 pixelSize = vPosition.w; + pixelSize /= float2(_ScaleX, _ScaleY) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); + float scale = rsqrt(dot(pixelSize, pixelSize)); + scale *= abs(input.texcoord1.y) * _GradientScale * 1.5; + if (UNITY_MATRIX_P[3][3] == 0) scale = lerp(abs(scale) * (1 - _PerspectiveFilter), scale, abs(dot(UnityObjectToWorldNormal(input.normal.xyz), normalize(WorldSpaceViewDir(vert))))); + + float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0; + weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5; + + float bias =(.5 - weight) + (.5 / scale); + + float alphaClip = (1.0 - _OutlineWidth*_ScaleRatioA - _OutlineSoftness*_ScaleRatioA); + +#if GLOW_ON + alphaClip = min(alphaClip, 1.0 - _GlowOffset * _ScaleRatioB - _GlowOuter * _ScaleRatioB); #endif + alphaClip = alphaClip / 2.0 - ( .5 / scale) - weight; + +#if (UNDERLAY_ON || UNDERLAY_INNER) + float4 underlayColor = _UnderlayColor; + underlayColor.rgb *= underlayColor.a; + + float bScale = scale; + bScale /= 1 + ((_UnderlaySoftness*_ScaleRatioC) * bScale); + float bBias = (0.5 - weight) * bScale - 0.5 - ((_UnderlayDilate * _ScaleRatioC) * 0.5 * bScale); + + float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _TextureWidth; + float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _TextureHeight; + float2 bOffset = float2(x, y); +#endif + + // Generate UV for the Masking Texture + float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); + float2 maskUV = (vert.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); + + // Support for texture tiling and offset + float2 textureUV = UnpackUV(input.texcoord1.x); + float2 faceUV = TRANSFORM_TEX(textureUV, _FaceTex); + float2 outlineUV = TRANSFORM_TEX(textureUV, _OutlineTex); + + #if UI_DISSOLVE || UI_TRANSITION + half3 param = UnpackToVec3(input.texcoord0.y); + #elif UI_SHINY + half2 param = UnpackToVec2(input.texcoord0.y); + #else + half param = input.texcoord0.y; + #endif + + #if UI_EFFECT + input.texcoord0 = UnpackToVec2(input.texcoord0.x) * 2 - 0.5; + #else + input.texcoord0 = UnpackToVec2(input.texcoord0.x); + #endif + pixel_t output = { + vPosition, + input.color, + input.texcoord0, + float4(alphaClip, scale, bias, weight), + half4(vert.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_MaskSoftnessX, _MaskSoftnessY) + pixelSize.xy)), + mul((float3x3)_EnvMatrix, _WorldSpaceCameraPos.xyz - mul(unity_ObjectToWorld, vert).xyz), + #if (UNDERLAY_ON || UNDERLAY_INNER) + float4(input.texcoord0 + bOffset, bScale, bBias), + underlayColor, + #endif + float4(faceUV, outlineUV), + param, + #if EX + half4(UnpackToVec2(input.uvMask.x), UnpackToVec2(input.uvMask.y)), + #endif + }; + + return output; +} + + +fixed4 PixShader(pixel_t input)// : SV_Target +{ + float c = tex2D(_MainTex, input.atlas).a; + +// #ifndef UNDERLAY_ON +// clip(c - input.param.x); +// #endif + + float scale = input.param.y; + float bias = input.param.z; + float weight = input.param.w; + float sd = (bias - c) * scale; + + float outline = (_OutlineWidth * _ScaleRatioA) * scale; + float softness = (_OutlineSoftness * _ScaleRatioA) * scale; + + half4 faceColor = _FaceColor; + half4 outlineColor = _OutlineColor; + +// faceColor.rgb *= input.color.rgb; + + faceColor *= tex2D(_FaceTex, input.textures.xy + float2(_FaceUVSpeedX, _FaceUVSpeedY) * _Time.y); + outlineColor *= tex2D(_OutlineTex, input.textures.zw + float2(_OutlineUVSpeedX, _OutlineUVSpeedY) * _Time.y); + + faceColor = GetColor(sd, faceColor, outlineColor, outline, softness); + +#if BEVEL_ON + float3 dxy = float3(0.5 / _TextureWidth, 0.5 / _TextureHeight, 0); + float3 n = GetSurfaceNormal(input.atlas, 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)); + n = normalize(n- bump); + + float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), -1.0)); + + float3 col = GetSpecular(n, light); + faceColor.rgb += col*faceColor.a; + faceColor.rgb *= 1-(dot(n, light)*_Diffuse); + faceColor.rgb *= lerp(_Ambient, 1, n.z*n.z); + + fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n)); + faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a; +#endif + +#if UNDERLAY_ON + float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; + faceColor += input.underlayColor * saturate(d - input.texcoord2.w) * (1 - faceColor.a); +#endif + +#if UNDERLAY_INNER + float d = tex2D(_MainTex, input.texcoord2.xy).a * input.texcoord2.z; + faceColor += input.underlayColor * (1 - saturate(d - input.texcoord2.w)) * saturate(1 - sd) * (1 - faceColor.a); +#endif + +#if GLOW_ON + float4 glowColor = GetGlowColor(sd, scale); + 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; +} + +#endif + +#if defined(UI_BLUR) fixed4 Tex2DBlurring (pixel_t IN, half2 blur, half4 mask) { #if FASTBLUR && EX @@ -59,48 +431,22 @@ fixed4 Tex2DBlurring (pixel_t IN, half2 blur, half4 mask) #if EX fixed masked = min(mask.x <= uv.x, uv.x <= mask.z) * min(mask.y <= uv.y, uv.y <= mask.w); - o += lerp(fixed4(0, 0, 0, 0), PixShader(IN)* alpha, masked); + o += lerp(fixed4(0, 0, 0, 0), PixShader(IN) * weight, masked); #else - o += PixShader(IN) * alpha; + o += PixShader(IN) * weight; #endif } } - return o / sum; + IN.color.a = alpha; + return o / sum;// * alpha; } fixed4 Tex2DBlurring (pixel_t IN, half2 blur) { return Tex2DBlurring(IN, blur, half4(0,0,1,1)); } +#endif -fixed4 frag(pixel_t IN) : SV_Target -{ - fixed4 param = tex2D(_ParamTex, float2(0.5, IN.eParam)); - fixed effectFactor = param.x; - fixed colorFactor = param.y; - fixed blurFactor = param.z; - #if PIXEL - half2 pixelSize = max(2, (1-effectFactor*0.95) * float2(_TextureWidth, _TextureHeight)); - UV(IN).xy = round(UV(IN).xy * pixelSize) / pixelSize; - #endif - - #if defined(UI_BLUR) && EX - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4, IN.uvMask); - #elif defined(UI_BLUR) - half4 color = Tex2DBlurring(IN, blurFactor * float2(1/_TextureWidth, 1/_TextureHeight) * 4); - #else - half4 color = PixShader(IN) * IN.color.a; - #endif - - #if defined (UI_TONE) - color = ApplyToneEffect(color, effectFactor); - #endif - - color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor)); - color.rgb *= color.a; - - return color; -} #endif // UI_EFFECT_TMPRO_INCLUDED