diff --git a/Assets/Demos/TextMeshPro Support/TextMeshProSupport.cs b/Assets/Demos/TextMeshPro Support/TextMeshProSupport.cs index f632f5d..9baf52b 100644 --- a/Assets/Demos/TextMeshPro Support/TextMeshProSupport.cs +++ b/Assets/Demos/TextMeshPro Support/TextMeshProSupport.cs @@ -9,7 +9,7 @@ using Debug = UnityEngine.Debug; internal static class TextMeshProSupport { - private const string k_Version = "userData: v5.7.0"; + private const string k_Version = "userData: v5.8.0"; private const string k_VersionUnity6 = k_Version + " (Unity 6)"; private static readonly Dictionary s_FileGuids = new Dictionary() diff --git a/Packages/src/Editor/UIEffectEditor.cs b/Packages/src/Editor/UIEffectEditor.cs index c9fd4e6..a62c023 100644 --- a/Packages/src/Editor/UIEffectEditor.cs +++ b/Packages/src/Editor/UIEffectEditor.cs @@ -106,6 +106,7 @@ namespace Coffee.UIEffects.Editors private SerializedProperty _detailFilter; private SerializedProperty _detailIntensity; + private SerializedProperty _detailColor; private SerializedProperty _detailThreshold; private SerializedProperty _detailTex; private SerializedProperty _detailTexScale; @@ -202,6 +203,7 @@ namespace Coffee.UIEffects.Editors _detailFilter = serializedObject.FindProperty("m_DetailFilter"); _detailIntensity = serializedObject.FindProperty("m_DetailIntensity"); + _detailColor = serializedObject.FindProperty("m_DetailColor"); _detailThreshold = serializedObject.FindProperty("m_DetailThreshold"); _detailTex = serializedObject.FindProperty("m_DetailTex"); _detailTexScale = serializedObject.FindProperty("m_DetailTexScale"); @@ -455,6 +457,7 @@ namespace Coffee.UIEffects.Editors else { EditorGUILayout.PropertyField(_detailIntensity); + DrawColorPickerField(EditorGUILayout.GetControlRect(), _detailColor, true); } EditorGUILayout.PropertyField(_detailTex); diff --git a/Packages/src/Runtime/Enums.cs b/Packages/src/Runtime/Enums.cs index f05a008..56db231 100644 --- a/Packages/src/Runtime/Enums.cs +++ b/Packages/src/Runtime/Enums.cs @@ -125,6 +125,7 @@ namespace Coffee.UIEffects Masking = 1, Multiply = 2, Additive = 3, + Subtractive = 6, Replace = 4, MultiplyAdditive = 5 } diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs index 3394f71..bd9e6fe 100644 --- a/Packages/src/Runtime/UIEffect.cs +++ b/Packages/src/Runtime/UIEffect.cs @@ -240,6 +240,9 @@ namespace Coffee.UIEffects [SerializeField] protected MinMax01 m_DetailThreshold = new MinMax01(0, 1); + [SerializeField] + protected Color m_DetailColor = Color.white; + [SerializeField] protected Texture m_DetailTex; @@ -1302,6 +1305,28 @@ namespace Coffee.UIEffects } } + public Color detailColor + { + get => m_EdgeColor; + set + { + if (m_EdgeColor == value) return; + context.detailColor = m_EdgeColor = value; + SetMaterialDirty(); + } + } + + public float detailColorAlpha + { + get => detailColor.a; + set + { + var c = detailColor; + c.a = value; + detailColor = c; + } + } + public Texture detailTexture { get => m_DetailTex; @@ -1360,11 +1385,7 @@ namespace Coffee.UIEffects public RectTransform customRoot { get => m_CustomRoot; - set - { - if (m_CustomRoot == value) return; - m_CustomRoot = value; - } + set => m_CustomRoot = value; } public override Flip flip @@ -1592,6 +1613,7 @@ namespace Coffee.UIEffects c.detailFilter = m_DetailFilter; c.detailIntensity = m_DetailIntensity; + c.detailColor = m_DetailColor; c.detailThreshold = m_DetailThreshold; c.detailTex = m_DetailTex; c.detailTexScale = m_DetailTexScale; @@ -1799,6 +1821,7 @@ namespace Coffee.UIEffects m_DetailFilter = preset.m_DetailFilter; m_DetailIntensity = preset.m_DetailIntensity; m_DetailThreshold = preset.m_DetailThreshold; + m_DetailColor = preset.m_DetailColor; m_DetailTex = preset.m_DetailTex; m_DetailTexScale = preset.m_DetailTexScale; m_DetailTexOffset = preset.m_DetailTexOffset; @@ -1887,6 +1910,7 @@ namespace Coffee.UIEffects m_DetailFilter = c.detailFilter; m_DetailIntensity = c.detailIntensity; m_DetailThreshold = c.detailThreshold; + m_DetailColor = c.detailColor; m_DetailTex = c.detailTex; m_DetailTexScale = c.detailTexScale; m_DetailTexOffset = c.detailTexOffset; diff --git a/Packages/src/Runtime/UIEffectContext.cs b/Packages/src/Runtime/UIEffectContext.cs index aca0517..f18d8ed 100644 --- a/Packages/src/Runtime/UIEffectContext.cs +++ b/Packages/src/Runtime/UIEffectContext.cs @@ -53,6 +53,7 @@ namespace Coffee.UIEffects private static readonly int s_PatternArea = Shader.PropertyToID("_PatternArea"); private static readonly int s_DetailIntensity = Shader.PropertyToID("_DetailIntensity"); private static readonly int s_DetailThreshold = Shader.PropertyToID("_DetailThreshold"); + private static readonly int s_DetailColor = Shader.PropertyToID("_DetailColor"); private static readonly int s_DetailTex = Shader.PropertyToID("_DetailTex"); private static readonly int s_DetailTex_ST = Shader.PropertyToID("_DetailTex_ST"); private static readonly int s_DetailTex_Speed = Shader.PropertyToID("_DetailTex_Speed"); @@ -130,7 +131,8 @@ namespace Coffee.UIEffects "DETAIL_MULTIPLY", "DETAIL_ADDITIVE", "DETAIL_REPLACE", - "DETAIL_MULTIPLY_ADDITIVE" + "DETAIL_MULTIPLY_ADDITIVE", + "DETAIL_SUBTRACTIVE" }; private static readonly string[] s_GradationKeywords = @@ -231,6 +233,7 @@ namespace Coffee.UIEffects public DetailFilter detailFilter; public float detailIntensity; public MinMax01 detailThreshold; + public Color detailColor; public Texture detailTex; public Vector2 detailTexScale = new Vector2(1, 1); public Vector2 detailTexOffset = new Vector2(0, 0); @@ -419,6 +422,7 @@ namespace Coffee.UIEffects material.SetColor(s_GradationColor4, gradationColor4); material.SetFloat(s_DetailIntensity, Mathf.Clamp01(detailIntensity)); + material.SetColor(s_DetailColor, detailColor); material.SetVector(s_DetailThreshold, new Vector2(detailThreshold.min, detailThreshold.max)); material.SetTexture(s_DetailTex, detailFilter != 0 ? detailTex : null); material.SetVector(s_DetailTex_ST, diff --git a/Packages/src/Runtime/UIEffectProjectSettings.cs b/Packages/src/Runtime/UIEffectProjectSettings.cs index 93fab24..16ab51f 100644 --- a/Packages/src/Runtime/UIEffectProjectSettings.cs +++ b/Packages/src/Runtime/UIEffectProjectSettings.cs @@ -83,10 +83,10 @@ namespace Coffee.UIEffects { #if UNITY_2023_2_OR_NEWER const string tmpSupport = "TextMeshPro Support (Unity 6)"; - const string version = "v5.7.0 (Unity 6)"; + const string version = "v5.8.0 (Unity 6)"; #else const string tmpSupport = "TextMeshPro Support"; - const string version = "v5.7.0"; + const string version = "v5.8.0"; #endif ShaderSampleImporter.RegisterShaderSamples(new[] { diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader index 07f173b..5781c4e 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader @@ -63,7 +63,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader.meta index ee7a693..d676333 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader index 7228b9e..6e01a97 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader @@ -62,7 +62,7 @@ SubShader{ #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader.meta index 513c20a..d6e8301 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader index a029c69..c57c8e5 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader @@ -132,7 +132,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader.meta index c022f90..b0211ec 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader index b18a344..f5aae9c 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader @@ -133,7 +133,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader.meta index fa6e197..011b85f 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader index e257dc5..2215775 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader @@ -94,7 +94,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader.meta index da86bc7..b621616 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader index af849b5..b7e8de0 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader @@ -97,7 +97,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader.meta index 6cf48f7..1ede4d9 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader index 4baaba8..477a2ff 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader @@ -95,7 +95,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader.meta index 35dda88..ad4727c 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader index 4abd9c0..7c829a2 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader @@ -132,7 +132,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader.meta b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader.meta index 2743c46..fe3cbc4 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 (Unity 6) + userData: v5.8.0 (Unity 6) assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader index 83a9678..41192d6 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader @@ -63,7 +63,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader.meta index 17c8f28..a839dfe 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader index adb27c7..02a3d60 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader @@ -62,7 +62,7 @@ SubShader{ #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader.meta index 3d596fa..3d3fcf3 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader index e44ea3a..eb49487 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader @@ -132,7 +132,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader.meta index 6e20fd5..caddb04 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader index 230c3d7..1ad981e 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader @@ -132,7 +132,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader.meta index a29880a..7b9cc64 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader index 090eee8..3e27d24 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader @@ -94,7 +94,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader.meta index f082e7d..ae41166 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader index 0f78289..a582efc 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader @@ -97,7 +97,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader.meta index a8e8fa1..0566e41 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader index 23f4274..237123d 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader @@ -94,7 +94,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader.meta index 01d1b13..1490802 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader index bfbd2d1..5b16d13 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader @@ -132,7 +132,7 @@ SubShader { #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader.meta b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader.meta index d09a992..a027801 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader.meta +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader.meta @@ -4,6 +4,6 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] - userData: v5.7.0 + userData: v5.8.0 assetBundleName: assetBundleVariant: diff --git a/Packages/src/Shaders/UIEffect.cginc b/Packages/src/Shaders/UIEffect.cginc index 1423479..84efe98 100644 --- a/Packages/src/Shaders/UIEffect.cginc +++ b/Packages/src/Shaders/UIEffect.cginc @@ -49,6 +49,7 @@ uniform const int _EdgeColorGlow; uniform const int _PatternArea; uniform const float _DetailIntensity; uniform const float2 _DetailThreshold; +uniform const half4 _DetailColor; uniform const sampler2D _DetailTex; uniform const float4 _DetailTex_ST; uniform const float2 _DetailTex_Speed; @@ -81,7 +82,7 @@ uniform const matrix _CanvasToWorldMatrix; #define TRANSITION_NONE (!TRANSITION_FADE && !TRANSITION_CUTOFF && !TRANSITION_DISSOLVE && !TRANSITION_SHINY && !TRANSITION_MASK && !TRANSITION_MELT && !TRANSITION_BURN && !TRANSITION_PATTERN) #define TARGET_NONE (!TARGET_HUE && !TARGET_LUMINANCE) #define EDGE_NONE (!EDGE_PLAIN && !EDGE_SHINY) -#define DETAIL_NONE (!DETAIL_MASKING && !DETAIL_MULTIPLY && !DETAIL_ADDITIVE && !DETAIL_REPLACE && !DETAIL_MULTIPLY_ADDITIVE) +#define DETAIL_NONE (!DETAIL_MASKING && !DETAIL_MULTIPLY && !DETAIL_ADDITIVE && !DETAIL_SUBTRACTIVE && !DETAIL_REPLACE && !DETAIL_MULTIPLY_ADDITIVE) #define GRADATION_NONE (!GRADATION_GRADIENT && !GRADATION_RADIAL && !GRADATION_COLOR2 && !GRADATION_COLOR4) #if TONE_NONE && !COLOR_FILTER && SAMPLING_NONE && TRANSITION_NONE && TARGET_NONE && EDGE_NONE && DETAIL_NONE && GRADATION_NONE @@ -623,34 +624,40 @@ half4 apply_detail_filter(half4 color, float2 uvLocal) { const half4 inColor = color; const float2 uv = uvLocal * _DetailTex_ST.xy + _DetailTex_ST.zw + _Time.y * _DetailTex_Speed; - const half4 detail = tex2D(_DetailTex, uv); + half4 detail = tex2D(_DetailTex, uv); #if DETAIL_MASKING // Detail.Masking { color *= inv_lerp(_DetailThreshold.x, _DetailThreshold.y, detail.a); } #elif DETAIL_MULTIPLY // Detail.Multiply { + detail *= _DetailColor; color.rgb *= detail.rgb; color = lerp(inColor, color * detail.a, _DetailIntensity); - } #elif DETAIL_ADDITIVE // Detail.Additive { + detail *= _DetailColor; color.rgb += detail.rgb * detail.a * color.a; color = lerp(inColor, color, _DetailIntensity); - + } + #elif DETAIL_SUBTRACTIVE // Detail.Subtractive + { + detail *= _DetailColor; + color.rgb -= detail.rgb * detail.a * color.a; + color = lerp(inColor, color, _DetailIntensity); } #elif DETAIL_REPLACE // Detail.Replace { + detail *= _DetailColor; color.rgb = detail.rgb * color.a; color = lerp(inColor, color, _DetailIntensity * detail.a); - } #elif DETAIL_MULTIPLY_ADDITIVE // Detail.MultiplyAdditive { + detail *= _DetailColor; color.rgb *= (1 + detail.rgb * detail.a); color = lerp(inColor, color, _DetailIntensity); - } #else { diff --git a/Packages/src/Shaders/UIEffect.shader b/Packages/src/Shaders/UIEffect.shader index a0f5298..a6c9c07 100644 --- a/Packages/src/Shaders/UIEffect.shader +++ b/Packages/src/Shaders/UIEffect.shader @@ -64,7 +64,7 @@ Shader "Hidden/UI/Default (UIEffect)" #pragma shader_feature_local_fragment _ SAMPLING_BLUR_FAST SAMPLING_BLUR_MEDIUM SAMPLING_BLUR_DETAIL SAMPLING_PIXELATION SAMPLING_RGB_SHIFT SAMPLING_EDGE_LUMINANCE SAMPLING_EDGE_ALPHA #pragma shader_feature_local_fragment _ TRANSITION_FADE TRANSITION_CUTOFF TRANSITION_DISSOLVE TRANSITION_SHINY TRANSITION_MASK TRANSITION_MELT TRANSITION_BURN TRANSITION_PATTERN #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE + #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR