feat: maskable option to ignore masking

Close #109
mob-sakai · Oct 28, 2020 · af5f7e9 · af5f7e9
1 parent 3d8f11b
commit af5f7e9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Scripts/Editor/UIParticleEditor.cs b/Scripts/Editor/UIParticleEditor.cs
@@ -25,6 +25,7 @@ internal class UIParticleEditor : GraphicEditor
         private static readonly List<UIParticle> s_TempParents = new List<UIParticle>();
         private static readonly List<UIParticle> s_TempChildren = new List<UIParticle>();
 
+        private SerializedProperty _spMaskable;
         private SerializedProperty _spScale;
         private SerializedProperty _spIgnoreCanvasScaler;
         private SerializedProperty _spAnimatableProperties;
@@ -52,6 +53,7 @@ internal class UIParticleEditor : GraphicEditor
         protected override void OnEnable()
         {
             base.OnEnable();
+            _spMaskable = serializedObject.FindProperty("m_Maskable");
             _spScale = serializedObject.FindProperty("m_Scale3D");
             _spIgnoreCanvasScaler = serializedObject.FindProperty("m_IgnoreCanvasScaler");
             _spAnimatableProperties = serializedObject.FindProperty("m_AnimatableProperties");
@@ -127,6 +129,9 @@ public override void OnInspectorGUI()
 
             serializedObject.Update();
 
+            // Maskable
+            EditorGUILayout.PropertyField(_spMaskable);
+
             // IgnoreCanvasScaler
             using (var ccs = new EditorGUI.ChangeCheckScope())
             {

diff --git a/Scripts/UIParticle.cs b/Scripts/UIParticle.cs
@@ -38,6 +38,11 @@ public class UIParticle : MaskableGraphic
         [Tooltip("Particles")] [SerializeField]
         private List<ParticleSystem> m_Particles = new List<ParticleSystem>();
 
+#if !UNITY_2019_4_OR_NEWER
+        [SerializeField]
+        private bool m_Maskable = true;
+#endif
+
         private bool _shouldBeRemoved;
         private DrivenRectTransformTracker _tracker;
         private Mesh _bakedMesh;
@@ -350,6 +355,9 @@ internal void UpdateMaterialProperties(Renderer r, int index)
         /// </summary>
         protected override void OnEnable()
         {
+#if !UNITY_2019_4_OR_NEWER
+            maskable = m_Maskable;
+#endif
             _cachedPosition = transform.localPosition;
             activeMeshIndices.Clear();
 
@@ -440,6 +448,9 @@ protected override void OnValidate()
             SetVerticesDirty();
             m_ShouldRecalculateStencil = true;
             RecalculateClipping();
+#if !UNITY_2019_4_OR_NEWER
+            maskable = m_Maskable;
+#endif
         }
 
         void ISerializationCallbackReceiver.OnBeforeSerialize()