feat: new effect that synchronize with another effect

With UISyncEffect, you can apply the same effect as any other effect component. Close #159, #158, #143
mob-sakai · Apr 10, 2020 · 7a2a97c · 7a2a97c
1 parent 7116ac0
commit 7a2a97c
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 147 deletions.
diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/BaseMaterialEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/BaseMaterialEffect.cs
@@ -36,17 +36,28 @@ public virtual ParameterTexture paramTex
         /// <summary>
         /// Mark the vertices as dirty.
         /// </summary>
-        protected void SetMaterialDirty()
+        public void SetMaterialDirty()
         {
             connector.SetMaterialDirty(graphic);
+
+            foreach (var effect in syncEffects)
+            {
+                effect.SetMaterialDirty();
+                // BaseConnector.FindConnector(effect.graphic).SetMaterialDirty(effect.graphic);
+            }
         }
 
         public virtual Hash128 GetMaterialHash(Material baseMaterial)
         {
             return k_InvalidHash;
         }
 
-        public virtual Material GetModifiedMaterial(Material baseMaterial)
+        public Material GetModifiedMaterial(Material baseMaterial)
+        {
+            return GetModifiedMaterial(baseMaterial, graphic);
+        }
+
+        public virtual Material GetModifiedMaterial(Material baseMaterial, Graphic graphic)
         {
             if (!isActiveAndEnabled) return baseMaterial;
 
@@ -55,7 +66,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
             var modifiedMaterial = baseMaterial;
             if (_effectMaterialHash.isValid)
             {
-                modifiedMaterial = MaterialCache.Register(baseMaterial, _effectMaterialHash, ModifyMaterial);
+                modifiedMaterial = MaterialCache.Register(baseMaterial, _effectMaterialHash, ModifyMaterial, graphic);
             }
 
             MaterialCache.Unregister(oldHash);
@@ -68,7 +79,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         // 	return material && material.shader && material.shader.name.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal);
         // }
 
-        public virtual void ModifyMaterial(Material newMaterial)
+        public virtual void ModifyMaterial(Material newMaterial, Graphic graphic)
         {
             if (isActiveAndEnabled && paramTex != null)
                 paramTex.RegisterMaterial(newMaterial);

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/BaseMeshEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/BaseMeshEffect.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
@@ -41,6 +42,8 @@ protected RectTransform rectTransform
             get { return _rectTransform ? _rectTransform : _rectTransform = GetComponent<RectTransform>(); }
         }
 
+        internal readonly List<UISyncEffect> syncEffects = new List<UISyncEffect>(0);
+
         /// <summary>
         /// The material for rendering.
         /// </summary>
@@ -63,6 +66,11 @@ public virtual void ModifyMesh(Mesh mesh)
         /// </summary>
         /// <param name="vh">VertexHelper.</param>
         public virtual void ModifyMesh(VertexHelper vh)
+        {
+            ModifyMesh(vh, graphic);
+        }
+
+        public virtual void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
         }
 
@@ -73,6 +81,11 @@ protected virtual void SetVerticesDirty()
         {
             connector.SetVerticesDirty(graphic);
 
+            foreach (var effect in syncEffects)
+            {
+                effect.SetVerticesDirty();
+            }
+
 // #if TMP_PRESENT
 //             if (textMeshPro)
 //             {

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/MaterialCache.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/MaterialCache.cs
@@ -3,6 +3,7 @@
 using System;
 using UnityEngine;
 using System.Text;
+using UnityEngine.UI;
 
 namespace Coffee.UIExtensions
 {
@@ -39,7 +40,7 @@ private static void ClearCache()
         }
 #endif
 
-        public static Material Register(Material baseMaterial, Hash128 hash, System.Action<Material> onModifyMaterial)
+        public static Material Register(Material baseMaterial, Hash128 hash, System.Action<Material, Graphic> onModifyMaterial, Graphic graphic)
         {
             if (!hash.isValid) return null;
 
@@ -54,7 +55,7 @@ public static Material Register(Material baseMaterial, Hash128 hash, System.Acti
                     },
                 };
 
-                onModifyMaterial(entry.material);
+                onModifyMaterial(entry.material, graphic);
                 materialMap.Add(hash, entry);
             }
 

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/MaterialDirtyScope.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/MaterialDirtyScope.cs
@@ -21,13 +21,9 @@ protected override void CloseScope()
         {
             if (changed)
             {
-                var graphics = targets.OfType<BaseMaterialEffect>()
-                    .Select(x => x.graphic)
-                    .Where(x => x);
-
-                foreach (var g in graphics)
+                foreach (var effect in targets.OfType<BaseMaterialEffect>())
                 {
-                    BaseConnector.FindConnector(g).SetMaterialDirty(g);
+                    effect.SetMaterialDirty();
                 }
             }
 

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs
@@ -136,6 +136,16 @@ public Texture transitionTexture
             }
         }
 
+        private static Texture defaultTransitionTexture
+        {
+            get
+            {
+                return _defaultTransitionTexture
+                    ? _defaultTransitionTexture
+                    : (_defaultTransitionTexture = Resources.Load<Texture>("Default-Transition"));
+            }
+        }
+
         /// <summary>
         /// The area for effect.
         /// </summary>
@@ -201,19 +211,9 @@ public override Hash128 GetMaterialHash(Material material)
             );
         }
 
-
-        private static Texture defaultTransitionTexture
-        {
-            get
-            {
-                return _defaultTransitionTexture
-                    ? _defaultTransitionTexture
-                    : (_defaultTransitionTexture = Resources.Load<Texture>("Default-Transition"));
-            }
-        }
-
-        public override void ModifyMaterial(Material newMaterial)
+        public override void ModifyMaterial(Material newMaterial, Graphic graphic)
         {
+            var connector = BaseConnector.FindConnector(graphic);
             newMaterial.shader = connector.FindShader("UIDissolve");
             SetShaderVariants(newMaterial, m_ColorMode);
 
@@ -224,7 +224,7 @@ public override void ModifyMaterial(Material newMaterial)
         /// <summary>
         /// Modifies the mesh.
         /// </summary>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled)
                 return;

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs
@@ -207,8 +207,10 @@ public override Hash128 GetMaterialHash(Material material)
             );
         }
 
-        public override void ModifyMaterial(Material newMaterial)
+        public override void ModifyMaterial(Material newMaterial, Graphic graphic)
         {
+            var connector = BaseConnector.FindConnector(graphic);
+
             newMaterial.shader = connector.FindShader("UIEffect");
             SetShaderVariants(newMaterial, m_EffectMode, m_ColorMode, m_BlurMode,
                 m_AdvancedBlur ? BlurEx.Ex : BlurEx.None);
@@ -219,7 +221,7 @@ public override void ModifyMaterial(Material newMaterial)
         /// <summary>
         /// Modifies the mesh.
         /// </summary>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled)
             {

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectChild.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectChild.cs
diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIFlip.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIFlip.cs
@@ -49,7 +49,7 @@ public bool vertical
         /// Call used to modify mesh.
         /// </summary>
         /// <param name="vh">VertexHelper.</param>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled) return;
 

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIGradient.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIGradient.cs
@@ -230,7 +230,7 @@ public bool ignoreAspectRatio
         /// <summary>
         /// Call used to modify mesh.
         /// </summary>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled)
                 return;

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs
@@ -125,13 +125,15 @@ public override Hash128 GetMaterialHash(Material material)
             );
         }
 
-        public override void ModifyMaterial(Material newMaterial)
+        public override void ModifyMaterial(Material newMaterial, Graphic graphic)
         {
+            var connector = BaseConnector.FindConnector(graphic);
+
             newMaterial.shader = connector.FindShader("UIHsvModifier");
             paramTex.RegisterMaterial(newMaterial);
         }
 
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled)
                 return;

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShadow.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShadow.cs
@@ -181,7 +181,7 @@ protected override void OnDisable()
         /// <summary>
         /// Modifies the mesh.
         /// </summary>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled || vh.currentVertCount <= 0 || m_Style == ShadowStyle.None)
             {

diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs
@@ -185,16 +185,18 @@ public override Hash128 GetMaterialHash(Material material)
             );
         }
 
-        public override void ModifyMaterial(Material newMaterial)
+        public override void ModifyMaterial(Material newMaterial, Graphic graphic)
         {
+            var connector = BaseConnector.FindConnector(graphic);
+
             newMaterial.shader = connector.FindShader("UIShiny");
             paramTex.RegisterMaterial(newMaterial);
         }
 
         /// <summary>
         /// Modifies the mesh.
         /// </summary>
-        public override void ModifyMesh(VertexHelper vh)
+        public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         {
             if (!isActiveAndEnabled)
                 return;