From 7f60a56a9af6b4ecee223b466f1b2499af0194f4 Mon Sep 17 00:00:00 2001 From: mob-sakai <12690315+mob-sakai@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:30:22 +0900 Subject: [PATCH] fix: shrink shader variants for color filters This avoids the local shader variant limit (=60). Since it uses a uniform branch, there is no impact on rendering performance. --- Packages/src/Runtime/UIEffectContext.cs | 90 +--------- ...n-TMP_Bitmap-Mobile-UIEffect-Unity6.shader | 5 +- .../Hidden-TMP_Bitmap-UIEffect-Unity6.shader | 5 +- ...den-TMP_SDF Overlay-UIEffect-Unity6.shader | 5 +- .../Hidden-TMP_SDF SSD-UIEffect-Unity6.shader | 5 +- ..._SDF-Mobile Overlay-UIEffect-Unity6.shader | 5 +- ...-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader | 5 +- ...dden-TMP_SDF-Mobile-UIEffect-Unity6.shader | 5 +- .../Hidden-TMP_SDF-UIEffect-Unity6.shader | 5 +- .../Hidden-TMP_Bitmap-Mobile-UIEffect.shader | 5 +- .../Hidden-TMP_Bitmap-UIEffect.shader | 5 +- .../Hidden-TMP_SDF Overlay-UIEffect.shader | 5 +- .../Hidden-TMP_SDF SSD-UIEffect.shader | 5 +- ...den-TMP_SDF-Mobile Overlay-UIEffect.shader | 5 +- .../Hidden-TMP_SDF-Mobile SSD-UIEffect.shader | 5 +- .../Hidden-TMP_SDF-Mobile-UIEffect.shader | 5 +- .../Hidden-TMP_SDF-UIEffect.shader | 5 +- Packages/src/Shaders/UIEffect.cginc | 164 +++++++++--------- Packages/src/Shaders/UIEffect.shader | 5 +- 19 files changed, 109 insertions(+), 230 deletions(-) diff --git a/Packages/src/Runtime/UIEffectContext.cs b/Packages/src/Runtime/UIEffectContext.cs index 0335c0a..484297a 100644 --- a/Packages/src/Runtime/UIEffectContext.cs +++ b/Packages/src/Runtime/UIEffectContext.cs @@ -16,6 +16,7 @@ namespace Coffee.UIEffects private static readonly int s_DstBlend = Shader.PropertyToID("_DstBlend"); private static readonly int s_ToneIntensity = Shader.PropertyToID("_ToneIntensity"); private static readonly int s_ToneParams = Shader.PropertyToID("_ToneParams"); + private static readonly int s_ColorFilter = Shader.PropertyToID("_ColorFilter"); private static readonly int s_ColorValue = Shader.PropertyToID("_ColorValue"); private static readonly int s_ColorIntensity = Shader.PropertyToID("_ColorIntensity"); private static readonly int s_ColorGlow = Shader.PropertyToID("_ColorGlow"); @@ -38,10 +39,12 @@ namespace Coffee.UIEffects private static readonly int s_TargetColor = Shader.PropertyToID("_TargetColor"); private static readonly int s_TargetRange = Shader.PropertyToID("_TargetRange"); private static readonly int s_TargetSoftness = Shader.PropertyToID("_TargetSoftness"); + private static readonly int s_ShadowColorFilter = Shader.PropertyToID("_ShadowColorFilter"); private static readonly int s_ShadowColor = Shader.PropertyToID("_ShadowColor"); private static readonly int s_ShadowBlurIntensity = Shader.PropertyToID("_ShadowBlurIntensity"); private static readonly int s_ShadowColorGlow = Shader.PropertyToID("_ShadowColorGlow"); private static readonly int s_EdgeWidth = Shader.PropertyToID("_EdgeWidth"); + private static readonly int s_EdgeColorFilter = Shader.PropertyToID("_EdgeColorFilter"); private static readonly int s_EdgeColor = Shader.PropertyToID("_EdgeColor"); private static readonly int s_EdgeColorGlow = Shader.PropertyToID("_EdgeColorGlow"); private static readonly int s_EdgeShinyAutoPlaySpeed = Shader.PropertyToID("_EdgeShinyAutoPlaySpeed"); @@ -76,14 +79,7 @@ namespace Coffee.UIEffects private static readonly string[] s_ColorKeywords = { "", - "COLOR_MULTIPLY", - "COLOR_ADDITIVE", - "COLOR_SUBTRACTIVE", - "COLOR_REPLACE", - "COLOR_MULTIPLY_LUMINANCE", - "COLOR_MULTIPLY_ADDITIVE", - "COLOR_HSV_MODIFIER", - "COLOR_CONTRAST" + "COLOR_FILTER" }; private static readonly string[] s_SamplingKeywords = @@ -111,19 +107,6 @@ namespace Coffee.UIEffects "TRANSITION_PATTERN" }; - private static readonly string[] s_TransitionColorKeywords = - { - "", - "TRANSITION_COLOR_MULTIPLY", - "TRANSITION_COLOR_ADDITIVE", - "TRANSITION_COLOR_SUBTRACTIVE", - "TRANSITION_COLOR_REPLACE", - "TRANSITION_COLOR_MULTIPLY_LUMINANCE", - "TRANSITION_COLOR_MULTIPLY_ADDITIVE", - "TRANSITION_COLOR_HSV_MODIFIER", - "TRANSITION_COLOR_CONTRAST" - }; - private static readonly string[] s_TargetKeywords = { "", @@ -131,19 +114,6 @@ namespace Coffee.UIEffects "TARGET_LUMINANCE" }; - private static readonly string[] s_ShadowColorKeywords = - { - "", - "SHADOW_COLOR_MULTIPLY", - "SHADOW_COLOR_ADDITIVE", - "SHADOW_COLOR_SUBTRACTIVE", - "SHADOW_COLOR_REPLACE", - "SHADOW_COLOR_MULTIPLY_LUMINANCE", - "SHADOW_COLOR_MULTIPLY_ADDITIVE", - "SHADOW_COLOR_HSV_MODIFIER", - "SHADOW_COLOR_CONTRAST" - }; - private static readonly string[] s_EdgeKeywords = { "", @@ -151,19 +121,6 @@ namespace Coffee.UIEffects "EDGE_SHINY" }; - private static readonly string[] s_EdgeColorKeywords = - { - "", - "EDGE_COLOR_MULTIPLY", - "EDGE_COLOR_ADDITIVE", - "EDGE_COLOR_SUBTRACTIVE", - "EDGE_COLOR_REPLACE", - "EDGE_COLOR_MULTIPLY_LUMINANCE", - "EDGE_COLOR_MULTIPLY_ADDITIVE", - "EDGE_COLOR_HSV_MODIFIER", - "EDGE_COLOR_CONTRAST" - }; - private static readonly string[] s_DetailKeywords = { "", @@ -391,6 +348,7 @@ namespace Coffee.UIEffects material.SetFloat(s_ToneIntensity, Mathf.Clamp01(toneIntensity)); material.SetVector(s_ToneParams, toneParams); + material.SetInt(s_ColorFilter, (int)colorFilter); material.SetColor(s_ColorValue, color); material.SetFloat(s_ColorIntensity, Mathf.Clamp01(colorIntensity)); material.SetInt(s_ColorGlow, colorGlow ? 1 : 0); @@ -431,10 +389,12 @@ namespace Coffee.UIEffects break; } + material.SetInt(s_ShadowColorFilter, (int)shadowColorFilter); material.SetColor(s_ShadowColor, shadowColor); material.SetInt(s_ShadowColorGlow, shadowColorGlow ? 1 : 0); material.SetFloat(s_EdgeWidth, Mathf.Clamp01(edgeWidth)); + material.SetInt(s_EdgeColorFilter, (int)edgeColorFilter); material.SetColor(s_EdgeColor, edgeColor); material.SetInt(s_EdgeColorGlow, edgeColorGlow ? 1 : 0); material.SetFloat(s_EdgeShinyRate, Mathf.Clamp01(edgeShinyRate)); @@ -459,45 +419,11 @@ namespace Coffee.UIEffects material.SetVector(s_DetailTex_Speed, detailTexSpeed); SetKeyword(material, s_ToneKeywords, (int)toneFilter); - SetKeyword(material, s_ColorKeywords, (int)colorFilter); + SetKeyword(material, s_ColorKeywords, colorFilter != 0 || shadowMode != 0 ? 1 : 0); SetKeyword(material, s_SamplingKeywords, (int)samplingFilter); SetKeyword(material, s_TransitionKeywords, (int)transitionFilter); - switch (transitionFilter) - { - case TransitionFilter.None: - case TransitionFilter.Fade: - case TransitionFilter.Cutoff: - SetKeyword(material, s_TransitionColorKeywords, (int)ColorFilter.None); - break; - default: - SetKeyword(material, s_TransitionColorKeywords, (int)transitionColorFilter); - break; - } - - switch (shadowMode) - { - case ShadowMode.None: - SetKeyword(material, s_ShadowColorKeywords, (int)ColorFilter.None); - break; - default: - SetKeyword(material, s_ShadowColorKeywords, (int)shadowColorFilter); - break; - } - SetKeyword(material, s_EdgeKeywords, (int)edgeMode); - - switch (edgeMode) - { - case EdgeMode.None: - SetKeyword(material, s_EdgeColorKeywords, (int)ColorFilter.None); - break; - default: - SetKeyword(material, s_EdgeColorKeywords, (int)edgeColorFilter); - break; - } - SetKeyword(material, s_DetailKeywords, (int)detailFilter); - SetKeyword(material, s_TargetKeywords, (int)targetMode); switch (gradationMode) 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 c4563c6..07f173b 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 @@ -59,13 +59,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 a0e087c..7228b9e 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 @@ -58,13 +58,10 @@ SubShader{ // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 634dc33..a029c69 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 @@ -128,13 +128,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 7a5f480..b18a344 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 @@ -129,13 +129,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 3fb830b..e257dc5 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 @@ -90,13 +90,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 e653cd6..af849b5 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 @@ -93,13 +93,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 4bff6fe..4baaba8 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 @@ -91,13 +91,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 8b48ef8..4abd9c0 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 @@ -128,13 +128,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 17e654f..83a9678 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 @@ -59,13 +59,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 49d5eff..adb27c7 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader @@ -58,13 +58,10 @@ SubShader{ // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 5b17a56..e44ea3a 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 @@ -128,13 +128,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 9380f84..230c3d7 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 @@ -128,13 +128,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 48246df..090eee8 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 @@ -90,13 +90,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 3d6e20f..0f78289 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 @@ -93,13 +93,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 f7b4e80..23f4274 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 @@ -90,13 +90,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 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 957f2ea..bfbd2d1 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader @@ -128,13 +128,10 @@ SubShader { // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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 diff --git a/Packages/src/Shaders/UIEffect.cginc b/Packages/src/Shaders/UIEffect.cginc index a70d71a..92b5fa0 100644 --- a/Packages/src/Shaders/UIEffect.cginc +++ b/Packages/src/Shaders/UIEffect.cginc @@ -12,6 +12,7 @@ uniform const float4 _MainTex_TexelSize; #endif uniform const float _ToneIntensity; +uniform const int _ColorFilter; uniform const half4 _ColorValue; uniform const float _ColorIntensity; uniform const int _ColorGlow; @@ -23,6 +24,7 @@ uniform const float4 _TransitionTex_ST; uniform const float2 _TransitionTex_Speed; uniform const float _TransitionRate; uniform const int _TransitionReverse; +uniform const int _TransitionColorFilter; uniform const half4 _TransitionColor; uniform const int _TransitionColorGlow; uniform const float _TransitionSoftness; @@ -34,12 +36,14 @@ uniform const half4 _TargetColor; uniform const float _TargetRange; uniform const float _TargetSoftness; uniform const float _ShadowBlurIntensity; +uniform const int _ShadowColorFilter; uniform const half4 _ShadowColor; uniform const int _ShadowColorGlow; uniform const float _EdgeWidth; uniform const float _EdgeShinyRate; uniform const float _EdgeShinyAutoPlaySpeed; uniform const float _EdgeShinyWidth; +uniform const int _EdgeColorFilter; uniform const half4 _EdgeColor; uniform const int _EdgeColorGlow; uniform const int _PatternArea; @@ -78,7 +82,7 @@ uniform const matrix _CanvasToWorldMatrix; #define DETAIL_NONE (!DETAIL_MASKING && !DETAIL_MULTIPLY && !DETAIL_ADDITIVE && !DETAIL_REPLACE && !DETAIL_MULTIPLY_ADDITIVE) #define GRADATION_NONE (!GRADATION_GRADIENT && !GRADATION_RADIAL && !GRADATION_COLOR2 && !GRADATION_COLOR4) -#if TONE_NONE && SAMPLING_NONE && TRANSITION_NONE && TARGET_NONE && EDGE_NONE && DETAIL_NONE && GRADATION_NONE +#if TONE_NONE && !COLOR_FILTER && SAMPLING_NONE && TRANSITION_NONE && TARGET_NONE && EDGE_NONE && DETAIL_NONE && GRADATION_NONE #define NO_UIEFFECT #endif @@ -205,210 +209,210 @@ half4 apply_tone_filter(half4 color) color.rgb = lerp(color.rgb, retro * color.a, _ToneIntensity); #elif TONE_POSTERIZE // Tone.Posterize const half3 hsv = rgb_to_hsv(color.rgb); - const int div = round(lerp(48, 4, _ToneIntensity) / 2) * 2; + const float div = round(lerp(48, 4, _ToneIntensity) / 2) * 2; color.rgb = hsv_to_rgb((floor(hsv * div) + 0.5) / div) * color.a; #endif return color; } -half4 apply_color_filter(half4 color, const half4 factor, const float intensity) +half4 apply_color_filter(const half4 inColor, const half4 factor, const float intensity) { - const half4 inColor = color; - #if COLOR_MULTIPLY // Color.Multiply + const float glow = _ColorGlow; + const int mode = _ColorFilter; + half4 color = inColor; + if (mode == 1) // Color.Multiply { color.rgb = color.rgb * factor.rgb; } - #elif COLOR_ADDITIVE // Color.Additive + else if (mode == 2) // Color.Additive { color.rgb = color.rgb + factor.rgb * color.a; } - #elif COLOR_SUBTRACTIVE // Color.Subtractive + else if (mode == 3) // Color.Subtractive { color.rgb = color.rgb - factor.rgb * color.a; } - #elif COLOR_REPLACE // Color.Replace + else if (mode == 4) // Color.Replace { color.rgb = factor.rgb * color.a; } - #elif COLOR_MULTIPLY_LUMINANCE // Color.MultiplyLuminance + else if (mode == 5) // Color.MultiplyLuminance { color.rgb = (1 + Luminance(color.rgb)) * factor.rgb / 2 * color.a; } - #elif COLOR_MULTIPLY_ADDITIVE // Color.MultiplyAdditive + else if (mode == 6) // Color.MultiplyAdditive { color.rgb = color.rgb * (1 + factor.rgb); } - #elif COLOR_HSV_MODIFIER // Color.HsvModifier + else if (mode == 7) // Color.HsvModifier { const float3 hsv = rgb_to_hsv(color.rgb); color.rgb = hsv_to_rgb(hsv + factor.rgb) * color.a * factor.a; - color.a = color.a * factor.a; + color.a = inColor.a * factor.a; } - #elif COLOR_CONTRAST // Color.Contrast + else if (mode == 8) // Color.Contrast { color.rgb = ((color.rgb - 0.5) * (factor.r + 1) + 0.5 + factor.g * 1.5) * color.a * factor.a; color.a = color.a * factor.a; } - #else + + if (0 < mode) { - return color; + color = lerp(inColor, color, intensity); + color.a *= 1 - glow * intensity; } - #endif - color = lerp(inColor, color, intensity); - color.a *= 1 - _ColorGlow * intensity; + return color; } -half4 apply_transition_color_filter(half4 color, const half4 factor, const float intensity) +half4 apply_transition_color_filter(const half4 inColor, const half4 factor, const float intensity) { - const half4 inColor = color; - #if TRANSITION_COLOR_MULTIPLY // Color.Multiply + const float glow = _TransitionColorGlow; + const int mode = _TransitionColorFilter; + half4 color = inColor; + if (mode == 1) // Color.Multiply { color.rgb = color.rgb * factor.rgb; } - #elif TRANSITION_COLOR_ADDITIVE // Color.Additive + else if (mode == 2) // Color.Additive { color.rgb = color.rgb + factor.rgb * color.a; } - #elif TRANSITION_COLOR_SUBTRACTIVE // Color.Subtractive + else if (mode == 3) // Color.Subtractive { color.rgb = color.rgb - factor.rgb * color.a; } - #elif TRANSITION_COLOR_REPLACE // Color.Replace + else if (mode == 4) // Color.Replace { color.rgb = factor.rgb * color.a; } - #elif TRANSITION_COLOR_MULTIPLY_LUMINANCE // Color.MultiplyLuminance + else if (mode == 5) // Color.MultiplyLuminance { color.rgb = (1 + Luminance(color.rgb)) * factor.rgb / 2 * color.a; } - #elif TRANSITION_COLOR_MULTIPLY_ADDITIVE // Color.MultiplyAdditive + else if (mode == 6) // Color.MultiplyAdditive { color.rgb = color.rgb * (1 + factor.rgb); } - #elif TRANSITION_COLOR_HSV_MODIFIER // Color.HsvModifier + else if (mode == 7) // Color.HsvModifier { const float3 hsv = rgb_to_hsv(color.rgb); color.rgb = hsv_to_rgb(hsv + factor.rgb) * color.a * factor.a; - color.a = color.a * factor.a; + color.a = inColor.a * factor.a; } - #elif TRANSITION_COLOR_CONTRAST // Color.Contrast + else if (mode == 8) // Color.Contrast { color.rgb = ((color.rgb - 0.5) * (factor.r + 1) + 0.5 + factor.g * 1.5) * color.a * factor.a; color.a = color.a * factor.a; } - #else + + if (0 < mode) { - return color; + color = lerp(inColor, color, intensity); + color.a *= 1 - glow * intensity; } - #endif - color = lerp(inColor, color, intensity); - color.a *= 1 - _TransitionColorGlow * intensity; + return color; } -half4 apply_shadow_color_filter(half4 color, const half4 factor, const float intensity) +half4 apply_shadow_color_filter(const half4 inColor, const half4 factor, const float intensity) { - const half4 inColor = color; - #if SHADOW_COLOR_NONE // Color.None - { - return color; - } - #elif SHADOW_COLOR_MULTIPLY // Color.Multiply + const float glow = _ShadowColorGlow; + const int mode = _ShadowColorFilter; + half4 color = inColor; + if (mode == 1) // Color.Multiply { color.rgb = color.rgb * factor.rgb; } - #elif SHADOW_COLOR_ADDITIVE // Color.Additive + else if (mode == 2) // Color.Additive { color.rgb = color.rgb + factor.rgb * color.a; } - #elif SHADOW_COLOR_SUBTRACTIVE // Color.Subtractive + else if (mode == 3) // Color.Subtractive { color.rgb = color.rgb - factor.rgb * color.a; } - #elif SHADOW_COLOR_REPLACE // Color.Replace + else if (mode == 4) // Color.Replace { color.rgb = factor.rgb * color.a; } - #elif SHADOW_COLOR_MULTIPLY_LUMINANCE // Color.MultiplyLuminance + else if (mode == 5) // Color.MultiplyLuminance { color.rgb = (1 + Luminance(color.rgb)) * factor.rgb / 2 * color.a; } - #elif SHADOW_COLOR_MULTIPLY_ADDITIVE // Color.MultiplyAdditive + else if (mode == 6) // Color.MultiplyAdditive { color.rgb = color.rgb * (1 + factor.rgb); } - #elif SHADOW_COLOR_HSV_MODIFIER // Color.HsvModifier + else if (mode == 7) // Color.HsvModifier { const float3 hsv = rgb_to_hsv(color.rgb); color.rgb = hsv_to_rgb(hsv + factor.rgb) * color.a * factor.a; - color.a = color.a * factor.a; + color.a = inColor.a * factor.a; } - #elif SHADOW_COLOR_CONTRAST // Color.Contrast + else if (mode == 8) // Color.Contrast { color.rgb = ((color.rgb - 0.5) * (factor.r + 1) + 0.5 + factor.g * 1.5) * color.a * factor.a; color.a = color.a * factor.a; } - #else + + if (0 < mode) { - return color; + color = lerp(inColor, color, intensity); + color.a *= 1 - glow * intensity; } - #endif - color = lerp(inColor, color, intensity); - color.a *= 1 - _ShadowColorGlow * intensity; + return color; } -half4 apply_edge_color_filter(half4 color, const half4 factor, const float intensity) +half4 apply_edge_color_filter(const half4 inColor, const half4 factor, const float intensity) { - const half4 inColor = color; - #if EDGE_COLOR_NONE // Color.None - { - return color; - } - #elif EDGE_COLOR_MULTIPLY // Color.Multiply + const float glow = _EdgeColorGlow; + const int mode = _EdgeColorFilter; + half4 color = inColor; + if (mode == 1) // Color.Multiply { color.rgb = color.rgb * factor.rgb; } - #elif EDGE_COLOR_ADDITIVE // Color.Additive + else if (mode == 2) // Color.Additive { color.rgb = color.rgb + factor.rgb * color.a; } - #elif EDGE_COLOR_SUBTRACTIVE // Color.Subtractive + else if (mode == 3) // Color.Subtractive { color.rgb = color.rgb - factor.rgb * color.a; } - #elif EDGE_COLOR_REPLACE // Color.Replace + else if (mode == 4) // Color.Replace { color.rgb = factor.rgb * color.a; } - #elif EDGE_COLOR_MULTIPLY_LUMINANCE // Color.MultiplyLuminance + else if (mode == 5) // Color.MultiplyLuminance { color.rgb = (1 + Luminance(color.rgb)) * factor.rgb / 2 * color.a; } - #elif EDGE_COLOR_MULTIPLY_ADDITIVE // Color.MultiplyAdditive + else if (mode == 6) // Color.MultiplyAdditive { color.rgb = color.rgb * (1 + factor.rgb); } - #elif EDGE_COLOR_HSV_MODIFIER // Color.HsvModifier + else if (mode == 7) // Color.HsvModifier { const float3 hsv = rgb_to_hsv(color.rgb); color.rgb = hsv_to_rgb(hsv + factor.rgb) * color.a * factor.a; - color.a = color.a * factor.a; + color.a = inColor.a * factor.a; } - #elif EDGE_COLOR_CONTRAST // Color.Contrast + else if (mode == 8) // Color.Contrast { color.rgb = ((color.rgb - 0.5) * (factor.r + 1) + 0.5 + factor.g * 1.5) * color.a * factor.a; color.a = color.a * factor.a; } - #else + + if (0 < mode) { - return color; + color = lerp(inColor, color, intensity); + color.a *= 1 - glow * intensity; } - #endif - color = lerp(inColor, color, intensity); - color.a *= 1 - _EdgeColorGlow * intensity; + return color; } @@ -495,7 +499,7 @@ half4 apply_transition_filter(half4 color, const float alpha, const float2 uvLoc #elif TRANSITION_PATTERN // Transition.Pattern { const half4 patternColor = apply_transition_color_filter(half4(color.rgb, 1), half4(_TransitionColor.rgb * color.a, 1), _TransitionColor.a); - int isPattern = min(inv_lerp(_TransitionRange.x, _TransitionRange.y, uvLocal.x), 0.995) < (_TransitionPatternReverse ? alpha : 1 - alpha); + float isPattern = min(inv_lerp(_TransitionRange.x, _TransitionRange.y, uvLocal.x), 0.995) < (_TransitionPatternReverse ? alpha : 1 - alpha); isPattern = _TransitionPatternReverse ? isPattern : 1 - isPattern; const float patternFactor = _PatternArea == 0 ? 1 : _PatternArea == 1 ? 1 - edgeFactor : edgeFactor; color.rgb = lerp(color.rgb, patternColor.rgb, patternFactor * isPattern); @@ -653,7 +657,7 @@ float edge(float2 uv, const float4 uvMask, float width) #endif } -int is_edge_shiny(const float2 uvLocal) +float is_edge_shiny(const float2 uvLocal) { #if EDGE_SHINY const float deg = atan2(uvLocal.y - 0.5, uvLocal.x - 0.5) / UNITY_PI; @@ -663,7 +667,7 @@ int is_edge_shiny(const float2 uvLocal) #endif } -half4 uieffect_internal(float2 uv, float4 uvMask, const float2 uvLocal, const float2 uvGrad, const int isShadow) +half4 uieffect_internal(float2 uv, float4 uvMask, const float2 uvLocal, const float2 uvGrad, const float isShadow) { const half alpha = transition_alpha(uvLocal); const float edgeFactor = edge(uv, uvMask, _EdgeWidth); @@ -674,7 +678,7 @@ half4 uieffect_internal(float2 uv, float4 uvMask, const float2 uvLocal, const fl color = apply_transition_filter(color, alpha, uvLocal, edgeFactor); color = apply_detail_filter(color, uvLocal); - if (isShadow) + if (0 < isShadow) { return apply_shadow_color_filter(color, _ShadowColor, 1); } @@ -684,7 +688,7 @@ half4 uieffect_internal(float2 uv, float4 uvMask, const float2 uvLocal, const fl { color = apply_color_filter(color, _ColorValue, _ColorIntensity); const half4 edgeColor = apply_edge_color_filter(color, _EdgeColor, 1); - const int isEdgeShiny = is_edge_shiny(uvLocal); + const float isEdgeShiny = is_edge_shiny(uvLocal); return lerp(color, edgeColor, edgeFactor * isEdgeShiny); } #else @@ -711,7 +715,7 @@ half4 uieffect(half4 origin, float2 uv, float4 uvMask, float4 wpos) const half rate = get_target_rate(origin.rgb); const float2 uvLocal = saturate(mul(_RootViewMatrix, wpos)).xy; const float2 uvGrad = mul(_GradViewMatrix, wpos).xy; - const int isShadow = uvMask.x < 0 ? 1 : 0; + const float isShadow = uvMask.x < 0 ? 1 : 0; uvMask.x += isShadow * 2; // Sampling.Pixelation diff --git a/Packages/src/Shaders/UIEffect.shader b/Packages/src/Shaders/UIEffect.shader index d0c9406..a0f5298 100644 --- a/Packages/src/Shaders/UIEffect.shader +++ b/Packages/src/Shaders/UIEffect.shader @@ -60,13 +60,10 @@ Shader "Hidden/UI/Default (UIEffect)" // ==== UIEFFECT START ==== #pragma shader_feature_local_fragment _ TONE_GRAYSCALE TONE_SEPIA TONE_NEGATIVE TONE_RETRO TONE_POSTERIZE - #pragma shader_feature_local_fragment _ COLOR_MULTIPLY COLOR_ADDITIVE COLOR_SUBTRACTIVE COLOR_REPLACE COLOR_MULTIPLY_LUMINANCE COLOR_MULTIPLY_ADDITIVE COLOR_HSV_MODIFIER COLOR_CONTRAST + #pragma shader_feature_local_fragment _ COLOR_FILTER #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 _ TRANSITION_COLOR_MULTIPLY TRANSITION_COLOR_ADDITIVE TRANSITION_COLOR_SUBTRACTIVE TRANSITION_COLOR_REPLACE TRANSITION_COLOR_MULTIPLY_LUMINANCE TRANSITION_COLOR_MULTIPLY_ADDITIVE TRANSITION_COLOR_HSV_MODIFIER TRANSITION_COLOR_CONTRAST - #pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY - #pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE 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