fix: MaskingShape.maskingMethod = Subtract is not working correctly

mob-sakai · Sep 4, 2024 · 56e1262 · 56e1262
1 parent 07c3afd
commit 56e1262
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/Packages/src/Runtime/MaskingShape/MaskingShape.cs b/Packages/src/Runtime/MaskingShape/MaskingShape.cs
@@ -278,18 +278,6 @@ Material IMaterialModifier.GetModifiedMaterial(Material baseMaterial)
             var toUse = baseMaterial;
             Material maskMat = null;
             var colorMask = m_ShowMaskGraphic ? ColorWriteMask.All : 0;
-            if (SoftMaskingEnabled() && !UISoftMaskProjectSettings.useStencilOutsideScreen)
-            {
-                if (m_ShowMaskGraphic)
-                {
-                    Profiler.BeginSample(
-                        "(SM4UI)[MaskingShape)] GetModifiedMaterial > StencilMaterial.Add for SoftMask");
-                    maskMat = StencilMaterial.Add(baseMaterial, _stencilBits, StencilOp.Keep, CompareFunction.Equal,
-                        colorMask, _stencilBits, _stencilBits);
-                    Profiler.EndSample();
-                }
-            }
-            else
             {
                 Profiler.BeginSample("(SM4UI)[MaskingShape)] GetModifiedMaterial > StencilMaterial.Add");
                 switch (maskingMethod)

diff --git a/Packages/src/Shaders/SoftMask.cginc b/Packages/src/Shaders/SoftMask.cginc
@@ -82,7 +82,7 @@ float SoftMaskSample(float2 uv, float a)
     #if SOFTMASK_EDITOR
         int inScreen = step(0, uv.x) * step(uv.x, 1) * step(0, uv.y) * step(uv.y, 1);
         alpha = lerp(_SoftMaskOutsideColor, alpha, inScreen);
-        clip (a * alpha.x * alpha.y * alpha.z * alpha.w - _AlphaClipThreshold * (1 - inScreen) - 0.001);
+        clip (a * alpha.x * alpha.y * alpha.z * alpha.w - _AlphaClipThreshold - 0.001);
     #endif
 
     return alpha.x * alpha.y * alpha.z * alpha.w;