fix: Nested MaskingShape is not working correctly

close #189
mob-sakai · Sep 4, 2024 · 42fcc14 · 42fcc14
1 parent 21dfae7
commit 42fcc14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/Packages/src/Runtime/Internal/Extensions/TransformExtensions.cs b/Packages/src/Runtime/Internal/Extensions/TransformExtensions.cs
@@ -25,15 +25,15 @@ public static int CompareHierarchyIndex(this Transform self, Transform other, Tr
             Profiler.EndSample();
 
             Profiler.BeginSample("(COF)[TransformExt] CompareHierarchyIndex > Calc");
-            var loop = Mathf.Min(lTrs.Count, rTrs.Count);
+            var loop = Mathf.Max(lTrs.Count, rTrs.Count);
             var result = 0;
             for (var i = 0; i < loop; ++i)
             {
-                self = lTrs[lTrs.Count - i - 1];
-                other = rTrs[rTrs.Count - i - 1];
-                if (self == other) continue;
+                var selfIndex = 0 <= lTrs.Count - i - 1 ? lTrs[lTrs.Count - i - 1].GetSiblingIndex() : -1;
+                var otherIndex = 0 <= rTrs.Count - i - 1 ? rTrs[rTrs.Count - i - 1].GetSiblingIndex() : -1;
+                if (selfIndex == otherIndex) continue;
 
-                result = self.GetSiblingIndex() - other.GetSiblingIndex();
+                result = selfIndex - otherIndex;
                 break;
             }
 

diff --git a/Packages/src/Runtime/MaskingShape/MaskingShape.cs b/Packages/src/Runtime/MaskingShape/MaskingShape.cs
@@ -249,6 +249,8 @@ int IComparable<MaskingShape>.CompareTo(MaskingShape other)
 
         void IMaskable.RecalculateMasking()
         {
+            StencilMaterial.Remove(_maskMaterial);
+            _maskMaterial = null;
             _shouldRecalculateStencil = true;
             UpdateContainer();
             RegisterAntiAliasingIfNeeded();
@@ -258,6 +260,8 @@ Material IMaterialModifier.GetModifiedMaterial(Material baseMaterial)
         {
             if (!isActiveAndEnabled)
             {
+                StencilMaterial.Remove(_maskMaterial);
+                _maskMaterial = null;
                 return baseMaterial;
             }
 
@@ -267,10 +271,11 @@ Material IMaterialModifier.GetModifiedMaterial(Material baseMaterial)
             {
                 StencilMaterial.Remove(_maskMaterial);
                 _maskMaterial = null;
-                return null;
+                return baseMaterial;
             }
 
             // Mask material
+            var toUse = baseMaterial;
             Material maskMat = null;
             var colorMask = m_ShowMaskGraphic ? ColorWriteMask.All : 0;
             if (SoftMaskingEnabled() && !UISoftMaskProjectSettings.useStencilOutsideScreen)
@@ -303,8 +308,12 @@ Material IMaterialModifier.GetModifiedMaterial(Material baseMaterial)
             }
 
             StencilMaterial.Remove(_maskMaterial);
-            _maskMaterial = maskMat;
-            return _maskMaterial;
+            if (maskMat && maskMat != baseMaterial)
+            {
+                toUse = _maskMaterial = maskMat;
+            }
+
+            return toUse;
         }
 
         void IMeshModifier.ModifyMesh(Mesh mesh)