diff --git a/Packages/src/Editor/UIEffectPropertyEditor.cs b/Packages/src/Editor/UIEffectPropertyEditor.cs index 378ec8a..fb30a5d 100644 --- a/Packages/src/Editor/UIEffectPropertyEditor.cs +++ b/Packages/src/Editor/UIEffectPropertyEditor.cs @@ -82,6 +82,7 @@ namespace Coffee.UIEffects.Editors private SerializedProperty _gradationScale; private SerializedProperty _gradationRotation; private SerializedProperty _gradationWrapMode; + private SerializedProperty _gradationReverse; private SerializedProperty _edgeMode; private SerializedProperty _edgeWidth; @@ -185,6 +186,7 @@ namespace Coffee.UIEffects.Editors _gradationScale = serializedObject.FindProperty("m_GradationScale"); _gradationRotation = serializedObject.FindProperty("m_GradationRotation"); _gradationWrapMode = serializedObject.FindProperty("m_GradationWrapMode"); + _gradationReverse = serializedObject.FindProperty("m_GradationReverse"); _detailFilter = serializedObject.FindProperty("m_DetailFilter"); _detailIntensity = serializedObject.FindProperty("m_DetailIntensity"); @@ -376,6 +378,7 @@ namespace Coffee.UIEffects.Editors DrawGradientField(_gradationGradient); EditorGUI.indentLevel++; EditorGUILayout.PropertyField(_gradationWrapMode, EditorGUIUtility.TrTempContent("Wrap Mode")); + EditorGUILayout.PropertyField(_gradationReverse, EditorGUIUtility.TrTempContent("Reverse")); EditorGUI.indentLevel--; break; case GradationMode.Diagonal: diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs index 5cf7eb0..01b0e32 100644 --- a/Packages/src/Runtime/UIEffect.cs +++ b/Packages/src/Runtime/UIEffect.cs @@ -204,6 +204,9 @@ namespace Coffee.UIEffects [SerializeField] protected TextureWrapMode m_GradationWrapMode = TextureWrapMode.Repeat; + [SerializeField] + protected bool m_GradationReverse = false; + [SerializeField] protected bool m_AllowToModifyMeshShape = true; @@ -1299,6 +1302,18 @@ namespace Coffee.UIEffects } } + public bool gradationReverse + { + get => m_GradationReverse; + set + { + if (m_GradationReverse == value) return; + context.m_GradationReverse = m_GradationReverse = value; + context.SetGradationDirty(); + SetMaterialDirty(); + } + } + public DetailFilter detailFilter { get => m_DetailFilter; @@ -1757,6 +1772,7 @@ namespace Coffee.UIEffects dst.m_GradationScale = src.m_GradationScale; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; } if (!append || src.m_DetailFilter != DetailFilter.None) @@ -1887,6 +1903,7 @@ namespace Coffee.UIEffects dst.m_GradationScale = src.m_GradationScale; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; } if (!append || src.m_DetailFilter != DetailFilter.None) @@ -2018,6 +2035,7 @@ namespace Coffee.UIEffects dst.m_GradationScale = src.m_GradationScale; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; } if (!append || src.m_DetailFilter != DetailFilter.None) @@ -2114,6 +2132,7 @@ namespace Coffee.UIEffects dst.m_GradationScale = src.m_GradationScale; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; dst.m_DetailFilter = src.m_DetailFilter; dst.m_DetailIntensity = src.m_DetailIntensity; diff --git a/Packages/src/Runtime/UIEffectContext.cs b/Packages/src/Runtime/UIEffectContext.cs index 763107c..cc54b17 100644 --- a/Packages/src/Runtime/UIEffectContext.cs +++ b/Packages/src/Runtime/UIEffectContext.cs @@ -232,6 +232,7 @@ namespace Coffee.UIEffects public float m_GradationScale; public float m_GradationRotation; public TextureWrapMode m_GradationWrapMode; + public bool m_GradationReverse; public DetailFilter m_DetailFilter; public float m_DetailIntensity; @@ -291,7 +292,9 @@ namespace Coffee.UIEffects var w = s_Colors.Length; for (var i = 0; i < w; i++) { - s_Colors[i] = m_GradationGradient.Evaluate((float)i / (w - 1)); + var x = m_GradationReverse ? w - 1 - i : i; + var t = (float)i / (w - 1); + s_Colors[x] = m_GradationGradient.Evaluate(t); } _gradationRampTex.wrapMode = m_GradationWrapMode; @@ -316,7 +319,8 @@ namespace Coffee.UIEffects var w = s_Colors.Length; for (var i = 0; i < w; i++) { - s_Colors[i] = m_TransitionGradient.Evaluate((float)i / (w - 1)); + var t = (float)i / (w - 1); + s_Colors[i] = m_TransitionGradient.Evaluate(t); } s_Colors[w - 1].a = 0; @@ -414,6 +418,7 @@ namespace Coffee.UIEffects dst.m_GradationOffset = src.m_GradationOffset; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; dst.m_DetailFilter = src.m_DetailFilter; dst.m_DetailIntensity = src.m_DetailIntensity; diff --git a/Packages/src/Runtime/UIEffectPreset.cs b/Packages/src/Runtime/UIEffectPreset.cs index bf7c208..ed9d8ae 100644 --- a/Packages/src/Runtime/UIEffectPreset.cs +++ b/Packages/src/Runtime/UIEffectPreset.cs @@ -83,6 +83,7 @@ namespace Coffee.UIEffects [PowerRange(0.01f, 10, 10)] public float m_GradationScale = 1; [Range(0, 360)] public float m_GradationRotation = 0; public TextureWrapMode m_GradationWrapMode = TextureWrapMode.Repeat; + public bool m_GradationReverse; public EdgeMode m_EdgeMode = EdgeMode.None; [Range(0, 1)] public float m_EdgeWidth = 0.5f; @@ -179,6 +180,7 @@ namespace Coffee.UIEffects dst.m_GradationScale = src.m_GradationScale; dst.m_GradationRotation = src.m_GradationRotation; dst.m_GradationWrapMode = src.m_GradationWrapMode; + dst.m_GradationReverse = src.m_GradationReverse; dst.m_DetailFilter = src.m_DetailFilter; dst.m_DetailIntensity = src.m_DetailIntensity;