diff --git a/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader b/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader deleted file mode 100644 index 91f56e5..0000000 --- a/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader +++ /dev/null @@ -1,136 +0,0 @@ -Shader "Hidden/TextMeshPro/Sprite (SoftMaskable)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - Name "Default" - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 2.0 - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #include "Packages/com.coffee.softmask-for-ugui/Shaders/SoftMask.cginc" // Add for soft mask - #pragma shader_feature_local _ SOFTMASK_EDITOR // Add for soft mask - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - float4 mask : TEXCOORD2; - UNITY_VERTEX_OUTPUT_STEREO - }; - - sampler2D _MainTex; - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - float4 _MainTex_ST; - float _UIMaskSoftnessX; - float _UIMaskSoftnessY; - int _UIVertexColorAlwaysGammaSpace; - - v2f vert(appdata_t v) - { - v2f OUT; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); - float4 vPosition = UnityObjectToClipPos(v.vertex); - OUT.worldPosition = v.vertex; - OUT.vertex = vPosition; - - float2 pixelSize = vPosition.w; - pixelSize /= abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); - OUT.mask = half4(v.vertex.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); - - if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace()) - { - v.color.rgb = UIGammaToLinear(v.color.rgb); - } - OUT.color = v.color * _Color; - return OUT; - } - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color.a *= m.x * m.y; - #endif - - color.a *= SoftMask(IN.vertex, IN.worldPosition, color.a); // Add for soft mask - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - return color; - } - ENDCG - } - } -} diff --git a/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader.meta b/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader.meta deleted file mode 100644 index f8797a5..0000000 --- a/Packages/src/Samples~/TextMeshPro Support (ugui 2.0)~/Hidden-TMP_Sprite-SoftMaskable.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 94593ebff37d04a64936ebe46ce7e769 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-SoftMaskable.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-SoftMaskable.shader index e7e45e1..918f682 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-SoftMaskable.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-SoftMaskable.shader @@ -6,14 +6,14 @@ Shader "Hidden/TextMeshPro/Mobile/Distance Field (SoftMaskable)" { Properties { - _FaceColor ("Face Color", Color) = (1,1,1,1) + [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - _OutlineColor ("Outline Color", Color) = (0,0,0,1) + [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) _OutlineWidth ("Outline Thickness", Range(0,1)) = 0 _OutlineSoftness ("Outline Softness", Range(0,1)) = 0 - _UnderlayColor ("Border Color", Color) = (0,0,0,.5) + [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0,.5) _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-SoftMaskable.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-SoftMaskable.shader index fac8294..fe63975 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-SoftMaskable.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-SoftMaskable.shader @@ -4,10 +4,10 @@ Properties { _FaceTex ("Face Texture", 2D) = "white" {} _FaceUVSpeedX ("Face UV Speed X", Range(-5, 5)) = 0.0 _FaceUVSpeedY ("Face UV Speed Y", Range(-5, 5)) = 0.0 - _FaceColor ("Face Color", Color) = (1,1,1,1) + [HDR]_FaceColor ("Face Color", Color) = (1,1,1,1) _FaceDilate ("Face Dilate", Range(-1,1)) = 0 - _OutlineColor ("Outline Color", Color) = (0,0,0,1) + [HDR]_OutlineColor ("Outline Color", Color) = (0,0,0,1) _OutlineTex ("Outline Texture", 2D) = "white" {} _OutlineUVSpeedX ("Outline UV Speed X", Range(-5, 5)) = 0.0 _OutlineUVSpeedY ("Outline UV Speed Y", Range(-5, 5)) = 0.0 @@ -21,7 +21,7 @@ Properties { _BevelRoundness ("Bevel Roundness", Range(0,1)) = 0 _LightAngle ("Light Angle", Range(0.0, 6.2831853)) = 3.1416 - _SpecularColor ("Specular", Color) = (1,1,1,1) + [HDR]_SpecularColor ("Specular", Color) = (1,1,1,1) _SpecularPower ("Specular", Range(0,4)) = 2.0 _Reflectivity ("Reflectivity", Range(5.0,15.0)) = 10 _Diffuse ("Diffuse", Range(0,1)) = 0.5 @@ -37,13 +37,13 @@ Properties { _EnvMatrixRotation ("Texture Rotation", vector) = (0, 0, 0, 0) - _UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) + [HDR]_UnderlayColor ("Border Color", Color) = (0,0,0, 0.5) _UnderlayOffsetX ("Border OffsetX", Range(-1,1)) = 0 _UnderlayOffsetY ("Border OffsetY", Range(-1,1)) = 0 _UnderlayDilate ("Border Dilate", Range(-1,1)) = 0 _UnderlaySoftness ("Border Softness", Range(0,1)) = 0 - _GlowColor ("Color", Color) = (0, 1, 0, 0.5) + [HDR]_GlowColor ("Color", Color) = (0, 1, 0, 0.5) _GlowOffset ("Offset", Range(-1,1)) = 0 _GlowInner ("Inner", Range(0,1)) = 0.05 _GlowOuter ("Outer", Range(0,1)) = 0.05 diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader deleted file mode 100644 index 0acd0d5..0000000 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader +++ /dev/null @@ -1,131 +0,0 @@ -Shader "Hidden/TextMeshPro/Sprite (SoftMaskable)" -{ - Properties - { - _MainTex ("Sprite Texture", 2D) = "white" {} - _Color ("Tint", Color) = (1,1,1,1) - - _StencilComp ("Stencil Comparison", Float) = 8 - _Stencil ("Stencil ID", Float) = 0 - _StencilOp ("Stencil Operation", Float) = 0 - _StencilWriteMask ("Stencil Write Mask", Float) = 255 - _StencilReadMask ("Stencil Read Mask", Float) = 255 - - _CullMode ("Cull Mode", Float) = 0 - _ColorMask ("Color Mask", Float) = 15 - _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 - } - - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - - Cull [_CullMode] - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - ColorMask [_ColorMask] - - Pass - { - Name "Default" - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 2.0 - - #include "UnityCG.cginc" - #include "UnityUI.cginc" - - #include "Packages/com.coffee.softmask-for-ugui/Shaders/SoftMask.cginc" // Add for soft mask - #pragma shader_feature_local _ SOFTMASK_EDITOR // Add for soft mask - - #pragma multi_compile __ UNITY_UI_CLIP_RECT - #pragma multi_compile __ UNITY_UI_ALPHACLIP - - struct appdata_t - { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - - struct v2f - { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 worldPosition : TEXCOORD1; - float4 mask : TEXCOORD2; - UNITY_VERTEX_OUTPUT_STEREO - }; - - sampler2D _MainTex; - fixed4 _Color; - fixed4 _TextureSampleAdd; - float4 _ClipRect; - float4 _MainTex_ST; - float _UIMaskSoftnessX; - float _UIMaskSoftnessY; - - v2f vert(appdata_t v) - { - v2f OUT; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); - float4 vPosition = UnityObjectToClipPos(v.vertex); - OUT.worldPosition = v.vertex; - OUT.vertex = vPosition; - - float2 pixelSize = vPosition.w; - pixelSize /= abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); - OUT.mask = half4(v.vertex.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); - - OUT.color = v.color * _Color; - return OUT; - } - - fixed4 frag(v2f IN) : SV_Target - { - half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; - - #if UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color.a *= m.x * m.y; - #endif - - color.a *= SoftMask(IN.vertex, IN.worldPosition, color.a); // Add for soft mask - - #ifdef UNITY_UI_ALPHACLIP - clip (color.a - 0.001); - #endif - - return color; - } - ENDCG - } - } -} diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader.meta deleted file mode 100644 index f8797a5..0000000 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Sprite-SoftMaskable.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 94593ebff37d04a64936ebe46ce7e769 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: