feat: the Allow To Modify Mesh Shape property should remain unchanged when loading a preset

mob-sakai · mob-sakai · commit f7175c037371 · 2025-01-07T17:23:22.000+09:00
close #294
diff --git a/Packages/src/Editor/UIEffectReplicaEditor.cs b/Packages/src/Editor/UIEffectReplicaEditor.cs
@@ -12,13 +12,15 @@ public class UIEffectReplicaEditor : Editor
         private SerializedProperty _target;
         private SerializedProperty _useTargetTransform;
         private SerializedProperty _samplingScale;
+        private SerializedProperty _allowToModifyMeshShape;
         private Editor _uiEffectEditor;
 
         private void OnEnable()
         {
             _target = serializedObject.FindProperty("m_Target");
             _useTargetTransform = serializedObject.FindProperty("m_UseTargetTransform");
             _samplingScale = serializedObject.FindProperty("m_SamplingScale");
+            _allowToModifyMeshShape = serializedObject.FindProperty("m_AllowToModifyMeshShape");
         }
 
         public override void OnInspectorGUI()
@@ -27,6 +29,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(_target);
             EditorGUILayout.PropertyField(_useTargetTransform);
             EditorGUILayout.PropertyField(_samplingScale);
+            EditorGUILayout.PropertyField(_allowToModifyMeshShape);
 
             if (_target.objectReferenceValue)
             {
diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs
@@ -294,6 +294,8 @@ public float samplingScale
             ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)
             : 1;
 
+        public override bool canModifyShape => m_AllowToModifyMeshShape;
+
         /// <summary>
         /// Transition filter for rendering.
         /// </summary>
@@ -714,7 +716,7 @@ public bool allowToModifyMeshShape
             set
             {
                 if (m_AllowToModifyMeshShape == value) return;
-                context.allowToModifyMeshShape = m_AllowToModifyMeshShape = value;
+                m_AllowToModifyMeshShape = value;
                 SetVerticesDirty();
             }
         }
@@ -832,8 +834,6 @@ protected override void UpdateContext(UIEffectContext c)
             c.gradationOffset = m_GradationOffset;
             c.gradationScale = m_GradationScale;
             c.gradationRotation = m_GradationRotation;
-
-            c.allowToModifyMeshShape = m_AllowToModifyMeshShape;
         }
 
         public override void ApplyContextToMaterial()
@@ -1013,8 +1013,6 @@ internal void CopyFrom(UIEffectContext c)
             m_GradationScale = c.gradationScale;
             m_GradationRotation = c.gradationRotation;
 
-            m_AllowToModifyMeshShape = c.allowToModifyMeshShape;
-
             UpdateContext(context);
             ApplyContextToMaterial();
             SetVerticesDirty();
diff --git a/Packages/src/Runtime/UIEffectBase.cs b/Packages/src/Runtime/UIEffectBase.cs
@@ -32,6 +32,7 @@ public abstract class UIEffectBase : UIBehaviour, IMeshModifier, IMaterialModifi
         public Graphic graphic => _graphic ? _graphic : _graphic = GetComponent<Graphic>();
         public virtual uint effectId => (uint)GetInstanceID();
         public virtual float actualSamplingScale => 1;
+        public virtual bool canModifyShape => true;
 
         public virtual UIEffectContext context
         {
@@ -90,7 +91,7 @@ public virtual void ModifyMesh(VertexHelper vh)
         {
             if (!isActiveAndEnabled || context == null) return;
 
-            context.ModifyMesh(graphic, transitionRoot, vh);
+            context.ModifyMesh(graphic, transitionRoot, vh, canModifyShape);
         }
 
         public virtual Material GetModifiedMaterial(Material baseMaterial)
diff --git a/Packages/src/Runtime/UIEffectContext.cs b/Packages/src/Runtime/UIEffectContext.cs
@@ -184,9 +184,6 @@ public class UIEffectContext
         public float gradationRotation;
         private List<float> _keyTimes;
 
-        public bool allowToModifyMeshShape;
-
-
         public bool willModifyMaterial => samplingFilter != SamplingFilter.None
                                           || transitionFilter != TransitionFilter.None
                                           || toneFilter != ToneFilter.None
@@ -254,8 +251,6 @@ public void CopyFrom(UIEffectContext preset)
             gradationOffset = preset.gradationOffset;
             gradationScale = preset.gradationScale;
             gradationRotation = preset.gradationRotation;
-
-            allowToModifyMeshShape = preset.allowToModifyMeshShape;
         }
 
         public void SetGradationDirty()
@@ -363,14 +358,14 @@ private static void SetKeyword(Material material, string[] keywords, int index)
             }
         }
 
-        public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelper vh)
+        public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelper vh, bool canModifyShape)
         {
             var processor = ContextProcessor.FindProcessor(graphic);
             var isText = processor.IsText(graphic);
             processor.OnPreModifyMesh(graphic);
 
             var verts = s_WorkingVertices;
-            var expandSize = GetExpandSize();
+            var expandSize = GetExpandSize(canModifyShape);
             var count = vh.currentIndexCount;
 
             // Get the rectangle to calculate the normalized position.
@@ -427,7 +422,7 @@ public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelp
             }
 
             // Apply gradation.
-            ApplyGradation(verts, transitionRoot.rect, rectMatrix);
+            ApplyGradation(verts, transitionRoot.rect, rectMatrix, canModifyShape);
 
             // Apply shadow.
             ApplyShadow(transitionRoot, verts);
@@ -436,7 +431,7 @@ public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelp
             vh.AddUIVertexTriangleStream(verts);
         }
 
-        private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
+        private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m, bool canModifyShape)
         {
             var a = gradationColor1;
             var b = gradationColor2;
@@ -476,7 +471,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
                         GradientUtil.GetKeyTimes(grad, _keyTimes);
                     }
 
-                    if (allowToModifyMeshShape)
+                    if (canModifyShape)
                     {
                         var splitTimes = InternalListPool<float>.Rent();
                         GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);
@@ -498,7 +493,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
                         GradientUtil.GetKeyTimes(grad, _keyTimes);
                     }
 
-                    if (allowToModifyMeshShape)
+                    if (canModifyShape)
                     {
                         var splitTimes = InternalListPool<float>.Rent();
                         GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);
@@ -521,7 +516,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)
                     }
 
                     m = Matrix4x4.Rotate(Quaternion.Euler(0, 0, rot)) * m;
-                    if (allowToModifyMeshShape)
+                    if (canModifyShape)
                     {
                         var splitTimes = InternalListPool<float>.Rent();
                         GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);
@@ -555,9 +550,9 @@ private void ApplyShadow(RectTransform transitionRoot, List<UIVertex> verts)
             }
         }
 
-        private Vector2 GetExpandSize()
+        private Vector2 GetExpandSize(bool canModifyShape)
         {
-            if (!allowToModifyMeshShape) return Vector2.zero;
+            if (!canModifyShape) return Vector2.zero;
 
             var expandSize = Vector2.zero;
             switch (samplingFilter)
diff --git a/Packages/src/Runtime/UIEffectReplica.cs b/Packages/src/Runtime/UIEffectReplica.cs
@@ -12,6 +12,9 @@ public class UIEffectReplica : UIEffectBase
         [SerializeField]
         protected float m_SamplingScale = 1f;
 
+        [SerializeField]
+        protected bool m_AllowToModifyMeshShape = true;
+
         private UIEffect _currentTarget;
         private Matrix4x4 _prevTransformHash;
 
@@ -55,6 +58,8 @@ public float samplingScale
             ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)
             : 1;
 
+        public override bool canModifyShape => m_AllowToModifyMeshShape;
+
         public override uint effectId => target ? target.effectId : 0;
         public override UIEffectContext context => target && target.isActiveAndEnabled ? target.context : null;
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public abstract class UIEffectBase : UIBehaviour, IMeshModifier, IMaterialModifi`
`32`	`32`	`public Graphic graphic => _graphic ? _graphic : _graphic = GetComponent<Graphic>();`
`33`	`33`	`public virtual uint effectId => (uint)GetInstanceID();`
`34`	`34`	`public virtual float actualSamplingScale => 1;`
	`35`	`+ public virtual bool canModifyShape => true;`
`35`	`36`
`36`	`37`	`public virtual UIEffectContext context`
`37`	`38`	`{`
`@@ -90,7 +91,7 @@ public virtual void ModifyMesh(VertexHelper vh)`
`90`	`91`	`{`
`91`	`92`	`if (!isActiveAndEnabled \|\| context == null) return;`
`92`	`93`
`93`		`- context.ModifyMesh(graphic, transitionRoot, vh);`
	`94`	`+ context.ModifyMesh(graphic, transitionRoot, vh, canModifyShape);`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public virtual Material GetModifiedMaterial(Material baseMaterial)`
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,6 @@ public class UIEffectContext`
`184`	`184`	`public float gradationRotation;`
`185`	`185`	`private List<float> _keyTimes;`
`186`	`186`
`187`		`- public bool allowToModifyMeshShape;`
`188`		`-`
`189`		`-`
`190`	`187`	`public bool willModifyMaterial => samplingFilter != SamplingFilter.None`
`191`	`188`	`\|\| transitionFilter != TransitionFilter.None`
`192`	`189`	`\|\| toneFilter != ToneFilter.None`
`@@ -254,8 +251,6 @@ public void CopyFrom(UIEffectContext preset)`
`254`	`251`	`gradationOffset = preset.gradationOffset;`
`255`	`252`	`gradationScale = preset.gradationScale;`
`256`	`253`	`gradationRotation = preset.gradationRotation;`
`257`		`-`
`258`		`- allowToModifyMeshShape = preset.allowToModifyMeshShape;`
`259`	`254`	`}`
`260`	`255`
`261`	`256`	`public void SetGradationDirty()`
`@@ -363,14 +358,14 @@ private static void SetKeyword(Material material, string[] keywords, int index)`
`363`	`358`	`}`
`364`	`359`	`}`
`365`	`360`
`366`		`- public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelper vh)`
	`361`	`+ public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelper vh, bool canModifyShape)`
`367`	`362`	`{`
`368`	`363`	`var processor = ContextProcessor.FindProcessor(graphic);`
`369`	`364`	`var isText = processor.IsText(graphic);`
`370`	`365`	`processor.OnPreModifyMesh(graphic);`
`371`	`366`
`372`	`367`	`var verts = s_WorkingVertices;`
`373`		`- var expandSize = GetExpandSize();`
	`368`	`+ var expandSize = GetExpandSize(canModifyShape);`
`374`	`369`	`var count = vh.currentIndexCount;`
`375`	`370`
`376`	`371`	`// Get the rectangle to calculate the normalized position.`
`@@ -427,7 +422,7 @@ public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelp`
`427`	`422`	`}`
`428`	`423`
`429`	`424`	`// Apply gradation.`
`430`		`- ApplyGradation(verts, transitionRoot.rect, rectMatrix);`
	`425`	`+ ApplyGradation(verts, transitionRoot.rect, rectMatrix, canModifyShape);`
`431`	`426`
`432`	`427`	`// Apply shadow.`
`433`	`428`	`ApplyShadow(transitionRoot, verts);`
`@@ -436,7 +431,7 @@ public void ModifyMesh(Graphic graphic, RectTransform transitionRoot, VertexHelp`
`436`	`431`	`vh.AddUIVertexTriangleStream(verts);`
`437`	`432`	`}`
`438`	`433`
`439`		`- private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)`
	`434`	`+ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m, bool canModifyShape)`
`440`	`435`	`{`
`441`	`436`	`var a = gradationColor1;`
`442`	`437`	`var b = gradationColor2;`
`@@ -476,7 +471,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)`
`476`	`471`	`GradientUtil.GetKeyTimes(grad, _keyTimes);`
`477`	`472`	`}`
`478`	`473`
`479`		`- if (allowToModifyMeshShape)`
	`474`	`+ if (canModifyShape)`
`480`	`475`	`{`
`481`	`476`	`var splitTimes = InternalListPool<float>.Rent();`
`482`	`477`	`GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);`
`@@ -498,7 +493,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)`
`498`	`493`	`GradientUtil.GetKeyTimes(grad, _keyTimes);`
`499`	`494`	`}`
`500`	`495`
`501`		`- if (allowToModifyMeshShape)`
	`496`	`+ if (canModifyShape)`
`502`	`497`	`{`
`503`	`498`	`var splitTimes = InternalListPool<float>.Rent();`
`504`	`499`	`GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);`
`@@ -521,7 +516,7 @@ private void ApplyGradation(List<UIVertex> verts, Rect rect, Matrix4x4 m)`
`521`	`516`	`}`
`522`	`517`
`523`	`518`	`m = Matrix4x4.Rotate(Quaternion.Euler(0, 0, rot)) * m;`
`524`		`- if (allowToModifyMeshShape)`
	`519`	`+ if (canModifyShape)`
`525`	`520`	`{`
`526`	`521`	`var splitTimes = InternalListPool<float>.Rent();`
`527`	`522`	`GradientUtil.SplitKeyTimes(_keyTimes, splitTimes, offset, scale);`
`@@ -555,9 +550,9 @@ private void ApplyShadow(RectTransform transitionRoot, List<UIVertex> verts)`
`555`	`550`	`}`
`556`	`551`	`}`
`557`	`552`
`558`		`- private Vector2 GetExpandSize()`
	`553`	`+ private Vector2 GetExpandSize(bool canModifyShape)`
`559`	`554`	`{`
`560`		`- if (!allowToModifyMeshShape) return Vector2.zero;`
	`555`	`+ if (!canModifyShape) return Vector2.zero;`
`561`	`556`
`562`	`557`	`var expandSize = Vector2.zero;`
`563`	`558`	`switch (samplingFilter)`