feat: add GradationMode.Angle and GradationMode.AngleGradient

Author: mob-sakai

Packages/src/Editor/UIEffectEditor.cs

@@ -66,6 +66,7 @@ public class UIEffect2Editor : Editor
         private SerializedProperty _gradationGradient;
         private SerializedProperty _gradationOffset;
         private SerializedProperty _gradationScale;
+        private SerializedProperty _gradationRotation;
 
         private bool _expandOthers;
         private SerializedProperty _allowToModifyMeshShape;
@@ -128,6 +129,7 @@ private void OnEnable()
             _gradationGradient = serializedObject.FindProperty("m_GradationGradient");
             _gradationOffset = serializedObject.FindProperty("m_GradationOffset");
             _gradationScale = serializedObject.FindProperty("m_GradationScale");
+            _gradationRotation = serializedObject.FindProperty("m_GradationRotation");
 
             _allowToModifyMeshShape = serializedObject.FindProperty("m_AllowToModifyMeshShape");
         }
@@ -283,10 +285,10 @@ public void DrawProperties()
                 {
                     case GradationMode.HorizontalGradient:
                     case GradationMode.VerticalGradient:
+                    case GradationMode.AngleGradient:
                         EditorGUILayout.PropertyField(_gradationGradient);
                         break;
                     default:
-                    {
                         EditorGUILayout.PropertyField(_gradationColor1);
                         var r = EditorGUILayout.GetControlRect();
                         r.width -= 20;
@@ -302,11 +304,17 @@ public void DrawProperties()
                         }
 
                         break;
-                    }
                 }
 
                 EditorGUILayout.PropertyField(_gradationOffset);
                 EditorGUILayout.PropertyField(_gradationScale);
+
+                if ((GradationMode)_gradationMode.intValue == GradationMode.Angle
+                    || (GradationMode)_gradationMode.intValue == GradationMode.AngleGradient)
+                {
+                    EditorGUILayout.PropertyField(_gradationRotation);
+                }
+
                 EditorGUI.indentLevel--;
             }
 

Packages/src/Runtime/Enums.cs

@@ -86,7 +86,9 @@ public enum GradationMode
         RadialFast,
         RadialDetail,
         DiagonalToRightBottom,
-        DiagonalToLeftBottom
+        DiagonalToLeftBottom,
+        Angle,
+        AngleGradient
     }
 
     internal static class BlendTypeConverter

Packages/src/Runtime/UIEffect.cs

@@ -148,9 +148,11 @@ public class UIEffect : UIEffectBase
         protected GradationMode m_GradationMode = GradationMode.None;
 
         [SerializeField]
+        [ColorUsage(true, true)]
         protected Color m_GradationColor1 = Color.white;
 
         [SerializeField]
+        [ColorUsage(true, true)]
         protected Color m_GradationColor2 = Color.white;
 
         [SerializeField]
@@ -164,6 +166,10 @@ public class UIEffect : UIEffectBase
         [SerializeField]
         protected float m_GradationScale = 1;
 
+        [SerializeField]
+        [Range(0, 360)]
+        private float m_GradationRotation = 0;
+
         [SerializeField]
         protected bool m_AllowToModifyMeshShape = true;
 
@@ -696,6 +702,18 @@ public float gradationScale
             }
         }
 
+        public float gradationRotation
+        {
+            get => m_GradationRotation;
+            set
+            {
+                value = Mathf.Repeat(value, 360);
+                if (Mathf.Approximately(m_GradationRotation, value)) return;
+                context.gradationRotation = m_GradationRotation = value;
+                SetVerticesDirty();
+            }
+        }
+
         public bool allowToModifyMeshShape
         {
             get => m_AllowToModifyMeshShape;
@@ -819,6 +837,7 @@ protected override void UpdateContext(UIEffectContext c)
             c.gradationGradient = m_GradationGradient;
             c.gradationOffset = m_GradationOffset;
             c.gradationScale = m_GradationScale;
+            c.gradationRotation = m_GradationRotation;
 
             c.allowToModifyMeshShape = m_AllowToModifyMeshShape;
         }
@@ -855,10 +874,16 @@ public override void SetRate(float rate, UIEffectTweener.CullingMask mask)
                 transitionRate = rate;
             }
 
-            if (gradationMode != GradationMode.None && 0 < (mask & UIEffectTweener.CullingMask.Gradiation))
+            if (gradationMode != GradationMode.None && 0 < (mask & UIEffectTweener.CullingMask.GradiationOffset))
             {
                 gradationOffset = Mathf.Lerp(-1f, 1f, rate);
             }
+
+            if ((gradationMode == GradationMode.Angle || gradationMode == GradationMode.AngleGradient)
+                && 0 < (mask & UIEffectTweener.CullingMask.GradiationRotation))
+            {
+                gradationRotation = Mathf.Lerp(0f, 360f, rate);
+            }
         }
 
         public override bool IsRaycastLocationValid(Vector2 sp, Camera eventCamera)
@@ -993,6 +1018,7 @@ internal void CopyFrom(UIEffectContext c)
             m_GradationGradient = c.gradationGradient;
             m_GradationOffset = c.gradationOffset;
             m_GradationScale = c.gradationScale;
+            m_GradationRotation = c.gradationRotation;
 
             m_AllowToModifyMeshShape = c.allowToModifyMeshShape;
 

Packages/src/Runtime/UIEffectContext.cs

@@ -181,8 +181,8 @@ public class UIEffectContext
         public Gradient gradationGradient;
         public float gradationOffset;
         public float gradationScale;
+        public float gradationRotation;
         private List<float> _keyTimes;
-        private List<float> _splitTimes;
 
         public bool allowToModifyMeshShape;
 
@@ -253,6 +253,7 @@ public void CopyFrom(UIEffectContext preset)
             gradationGradient = preset.gradationGradient;
             gradationOffset = preset.gradationOffset;
             gradationScale = preset.gradationScale;
+            gradationRotation = preset.gradationRotation;
 
             allowToModifyMeshShape = preset.allowToModifyMeshShape;
         }
@@ -442,6 +443,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
             var offset = gradationOffset;
             var scale = gradationScale;
             var grad = gradationGradient;
+            var rot = gradationRotation;
             switch (gradationMode)
             {
                 case GradationMode.Horizontal:
@@ -462,6 +464,10 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
                 case GradationMode.RadialDetail:
                     GradientUtil.DoRadialGradient(verts, a, b, offset, scale, rect, m, 12);
                     break;
+                case GradationMode.Angle:
+                    m = Matrix4x4.Rotate(Quaternion.Euler(0, 0, rot)) * m;
+                    GradientUtil.DoHorizontalGradient(verts, a, b, offset, scale, rect, m);
+                    break;
                 case GradationMode.HorizontalGradient:
                 {
                     if (_keyTimes == null)
@@ -503,6 +509,30 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
                     {
                         GradientUtil.DoVerticalGradient(verts, grad, offset, scale, rect, m);
                     }
+
+                    break;
+                }
+                case GradationMode.AngleGradient:
+                {
+                    if (_keyTimes == null)
+                    {
+                        _keyTimes = InternalListPool<float>.Rent();
+                        GradientUtil.GetKeyTimes(grad, _keyTimes);
+                    }
+
+                    m = Matrix4x4.Rotate(Quaternion.Euler(0, 0, rot)) * m;
+                    if (allowToModifyMeshShape)
+                    {
+                        var splitTimes = InternalListPool<float>.Rent();
+                        GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);
+                        GradientUtil.DoAngleGradient(verts, grad, splitTimes, offset, scale, rect, m);
+                        InternalListPool<float>.Return(ref splitTimes);
+                    }
+                    else
+                    {
+                        GradientUtil.DoHorizontalGradient(verts, grad, offset, scale, rect, m);
+                    }
+
                     break;
                 }
             }

Packages/src/Runtime/UIEffectTweener.cs

@@ -16,7 +16,8 @@ public enum CullingMask
             Color = 1 << 1,
             Sampling = 1 << 2,
             Transition = 1 << 3,
-            Gradiation = 1 << 5
+            GradiationOffset = 1 << 5,
+            GradiationRotation = 1 << 6
         }
 
         public enum UpdateMode

Packages/src/Runtime/Utilities/GradientUtil.cs

@@ -27,7 +27,7 @@ public static void DoHorizontalGradient(List<UIVertex> verts, Gradient gradient,
                 UIVertexUtil.GetQuad(verts, i, out var lb, out var lt, out var rt, out var rb);
                 if (i + 5 < count)
                 {
-                    UIVertexUtil.SplitHorizontal(verts, splitTimes, lb, lt, ref rb, ref rt, rect, m);
+                    UIVertexUtil.SplitHorizontalFast(verts, splitTimes, lb, lt, ref rb, ref rt, rect, m);
                 }
 
                 lb.color *= Evaluate(gradient, rect, m.MultiplyPoint3x4(lb.position).x + 0.0005f, offset, scale);
@@ -51,7 +51,7 @@ public static void DoHorizontalGradient(List<UIVertex> verts, Gradient gradient,
             Rect rect, Matrix4x4 m)
         {
             var count = verts.Count;
-            for (var i = 0; i < count; i ++)
+            for (var i = 0; i < count; i++)
             {
                 var vt = verts[i];
                 vt.color *= Evaluate(gradient, rect, m.MultiplyPoint3x4(vt.position).x, offset, scale);
@@ -90,7 +90,7 @@ public static void DoVerticalGradient(List<UIVertex> verts, Gradient gradient, L
                 UIVertexUtil.GetQuad(verts, i, out var lb, out var lt, out var rt, out var rb);
                 if (i + 5 < count)
                 {
-                    UIVertexUtil.SplitVertical(verts, splitTimes, lb, ref lt, rb, ref rt, rect, m);
+                    UIVertexUtil.SplitVerticalFast(verts, splitTimes, lb, ref lt, rb, ref rt, rect, m);
                 }
 
                 lb.color *= Evaluate(gradient, rect, m.MultiplyPoint3x4(lb.position).y + 0.0005f, offset, scale);
@@ -114,7 +114,7 @@ public static void DoVerticalGradient(List<UIVertex> verts, Gradient gradient, f
             Rect rect, Matrix4x4 m)
         {
             var count = verts.Count;
-            for (var i = 0; i < count; i ++)
+            for (var i = 0; i < count; i++)
             {
                 var vt = verts[i];
                 vt.color *= Evaluate(gradient, rect, m.MultiplyPoint3x4(vt.position).y, offset, scale);
@@ -215,6 +215,13 @@ static Color DoGradient(UIVertex vt, Color a, Color b, Rect rect, Matrix4x4 m, f
             }
         }
 
+        public static void DoAngleGradient(List<UIVertex> verts, Gradient gradient, List<float> splitTimes,
+            float offset, float scale, Rect rect, Matrix4x4 m)
+        {
+            UIVertexUtil.SplitAngle(verts, splitTimes, rect, m);
+            DoHorizontalGradient(verts, gradient, offset, scale, rect, m);
+        }
+
         public static void GetKeyTimes(Gradient gradient, List<float> results)
         {
             results.Clear();