feat: softmask buffers are now baked considering Graphic.color.a

mob-sakai · Jul 21, 2024 · 2eaaad6 · 2eaaad6
1 parent 8080cb2
commit 2eaaad6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Packages/src/Runtime/MaskingShape/MaskingShape.cs b/Packages/src/Runtime/MaskingShape/MaskingShape.cs
@@ -428,7 +428,7 @@ internal void DrawSoftMaskBuffer(CommandBuffer cb, int depth)
                 _mpb = SoftMaskUtils.materialPropertyBlockPool.Rent();
             }
 
-            SoftMaskUtils.ApplyMaterialPropertyBlock(_mpb, depth, texture, softnessRange);
+            SoftMaskUtils.ApplyMaterialPropertyBlock(_mpb, depth, texture, softnessRange, alpha);
             var softMaterial = SoftMaskUtils.GetSoftMaskingMaterial(maskingMethod);
 
             cb.DrawMesh(mesh, transform.localToWorldMatrix, softMaterial, 0, 0, _mpb);

diff --git a/Packages/src/Runtime/SoftMask.cs b/Packages/src/Runtime/SoftMask.cs
@@ -805,7 +805,7 @@ private void RenderSoftMaskBuffer(CommandBuffer cb, Camera.MonoOrStereoscopicEye
 
                 Profiler.BeginSample("(SM4UI)[SoftMask] RenderSoftMaskBuffer > ApplyMaterialPropertyBlock");
                 var texture = graphic.mainTexture;
-                SoftMaskUtils.ApplyMaterialPropertyBlock(_mpb, softMaskDepth, texture, softnessRange);
+                SoftMaskUtils.ApplyMaterialPropertyBlock(_mpb, softMaskDepth, texture, softnessRange, alpha);
                 Profiler.EndSample();
             }
 

diff --git a/Packages/src/Runtime/Utilities/SoftMaskUtils.cs b/Packages/src/Runtime/Utilities/SoftMaskUtils.cs
@@ -111,11 +111,11 @@ private static void UpdateSubMeshUI(TextMeshProUGUI text, bool show, float aa, M
         /// Applies properties to a MaterialPropertyBlock for soft masking.
         /// </summary>
         public static void ApplyMaterialPropertyBlock(MaterialPropertyBlock mpb, int depth, Texture texture,
-            MinMax01 threshold)
+            MinMax01 threshold, float alpha)
         {
             Profiler.BeginSample("(SM4UI)[SoftMaskUtils] ApplyMaterialPropertyBlock");
             var colorMask = Vector4.zero;
-            colorMask[depth] = 1;
+            colorMask[depth] = alpha;
             mpb.SetVector(s_ColorMask, colorMask);
             mpb.SetTexture(s_MainTex, texture ? texture : null);
             mpb.SetFloat(s_ThresholdMin, threshold.min);