Improve GoWrapper clipping

Author: xiaoguzhu

Assets/Scripts/Core/GoWrapper.cs

@@ -21,7 +21,6 @@ public class GoWrapper : DisplayObject
         protected Canvas _canvas;
         protected bool _cloneMaterial;
         protected bool _shouldCloneMaterial;
-        protected bool _supportMask;
 
         protected struct RendererInfo
         {
@@ -85,7 +84,6 @@ public void SetWrapTarget(GameObject target, bool cloneMaterial)
 
             _canvas = null;
             _wrapTarget = target;
-            _supportMask = false;
             _shouldCloneMaterial = false;
             _renderers.Clear();
 
@@ -176,10 +174,6 @@ void CloneMaterials()
                     if (shouldSetRQ && mat.renderQueue != 3000) //Set the object rendering in Transparent Queue as UI objects
                         mat.renderQueue = 3000;
 
-                    if (mat.HasProperty(ShaderConfig.ID_Stencil) || mat.HasProperty(ShaderConfig.ID_Stencil2)
-                        || mat.HasProperty(ShaderConfig.ID_ClipBox))
-                        _supportMask = true;
-
                     //确保相同的材质不会复制两次
                     Material newMat;
                     if (!_materialsBackup.TryGetValue(mat, out newMat))
@@ -291,31 +285,48 @@ override public void Update(UpdateContext context)
             if (_shouldCloneMaterial)
                 CloneMaterials();
 
-            if (_supportMask)
+            ApplyClipping(context);
+
+            base.Update(context);
+        }
+
+        private List<Material> helperMaterials = new List<Material>();
+        virtual protected void ApplyClipping(UpdateContext context)
+        {
+#if UNITY_2018_2_OR_NEWER
+            int cnt = _renderers.Count;
+            for (int i = 0; i < cnt; i++)
             {
-                int cnt = _renderers.Count;
-                for (int i = 0; i < cnt; i++)
+                _renderers[i].renderer.GetMaterials(helperMaterials);
+
+                int cnt2 = helperMaterials.Count;
+                for (int j = 0; j < cnt2; j++)
                 {
-                    RendererInfo ri = _renderers[i];
-                    Material[] mats = ri.materials;
-                    if (mats != null)
-                    {
-                        int cnt2 = mats.Length;
-                        for (int j = 0; j < cnt2; j++)
-                        {
-                            Material mat = mats[j];
-                            if (mat != null)
-                                context.ApplyClippingProperties(mat, false);
-                        }
+                    Material mat = helperMaterials[j];
+                    if (mat != null)
+                        context.ApplyClippingProperties(mat, false);
+                }
 
-                        if (cnt2 > 0 && _cloneMaterial && ri.renderer != null
-                             && !Material.ReferenceEquals(ri.renderer.sharedMaterial, mats[0]))
-                            ri.renderer.sharedMaterials = mats;
+                helperMaterials.Clear();
+            }
+#else
+            int cnt = _renderers.Count;
+            for (int i = 0; i < cnt; i++)
+            {
+                RendererInfo ri = _renderers[i];
+                Material[] mats = ri.materials;
+                if (mats != null)
+                {
+                    int cnt2 = mats.Length;
+                    for (int j = 0; j < cnt2; j++)
+                    {
+                        Material mat = mats[j];
+                        if (mat != null)
+                            context.ApplyClippingProperties(mat, false);
                     }
                 }
             }
-
-            base.Update(context);
+#endif
         }
 
         public override void Dispose()

Assets/Scripts/Core/ShaderConfig.cs

@@ -53,7 +53,6 @@ public static class ShaderConfig
         public static int ID_BlendDstFactor;
         public static int ID_ColorOption;
 
-        public static int ID_StencilComp2;
         public static int ID_Stencil2;
 
         static ShaderConfig()
@@ -73,7 +72,6 @@ static ShaderConfig()
             ID_ColorOption = Shader.PropertyToID("_ColorOption");
 
             ID_Stencil2 = Shader.PropertyToID("_StencilRef");
-            ID_StencilComp2 = Shader.PropertyToID("_StencilComp");
         }
 
         /// <summary>

Assets/Scripts/Core/UpdateContext.cs

@@ -228,6 +228,7 @@ public void ApplyClippingProperties(Material mat, bool isStdMaterial)
             {
                 mat.SetInt(ShaderConfig.ID_StencilComp, (int)UnityEngine.Rendering.CompareFunction.Equal);
                 mat.SetInt(ShaderConfig.ID_Stencil, stencilCompareValue);
+                mat.SetInt(ShaderConfig.ID_Stencil2, stencilCompareValue);
                 mat.SetInt(ShaderConfig.ID_StencilOp, (int)UnityEngine.Rendering.StencilOp.Keep);
                 mat.SetInt(ShaderConfig.ID_StencilReadMask, stencilReferenceValue | (stencilReferenceValue - 1));
                 mat.SetInt(ShaderConfig.ID_ColorMask, 15);
@@ -236,6 +237,7 @@ public void ApplyClippingProperties(Material mat, bool isStdMaterial)
             {
                 mat.SetInt(ShaderConfig.ID_StencilComp, (int)UnityEngine.Rendering.CompareFunction.Always);
                 mat.SetInt(ShaderConfig.ID_Stencil, 0);
+                mat.SetInt(ShaderConfig.ID_Stencil2, 0);
                 mat.SetInt(ShaderConfig.ID_StencilOp, (int)UnityEngine.Rendering.StencilOp.Keep);
                 mat.SetInt(ShaderConfig.ID_StencilReadMask, 255);
                 mat.SetInt(ShaderConfig.ID_ColorMask, 15);