[Port] [6000.4] [UUM-130317][6000.5] Add back sort at root

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.universal/Editor/2D/Overrides/SortingGroupEditor2DURP.cs

@@ -1,101 +1,120 @@
-using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
 namespace UnityEditor
 {
-    [CustomEditor(typeof(UnityEngine.Rendering.SortingGroup))]
+    [CustomEditor(typeof(SortingGroup))]
     [SupportedOnRenderPipeline(typeof(UniversalRenderPipelineAsset))]
     [CanEditMultipleObjects]
     internal class SortingGroupEditor2DURP : SortingGroupEditor
     {
-        private static class Styles
+        private enum SortType
         {
-            public static GUIContent sort3DAs2D = EditorGUIUtility.TrTextContent("Sort 3D as 2D", "Clears z values on 3D meshes affected by a Sorting Group allowing them to sort with other 2D objects and Sort 3D as 2D sorting groups.");
+            Default,
+            SortAtRoot,
+            Sort3DAs2D
+        }
+
+        private static class GUIStyles
+        {
+            public static GUIContent Default = EditorGUIUtility.TrTextContent("Sorting Type",
+               "Default sorting based on sorting layer and sorting order.");
+
+            public static GUIContent sortAtRootStyle = EditorGUIUtility.TrTextContent("Sorting Type",
+                "Ignores all parent Sorting Groups and sorts at the root level against other Sorting Groups and Renderers");
+
+            public static GUIContent sort3DAs2D = EditorGUIUtility.TrTextContent("Sorting Type",
+                "Clears z values on 3D meshes affected by a Sorting Group allowing them to sort with other 2D objects and Sort 3D as 2D sorting groups. This option also enables Sort At Root");
         }
 
-        private SerializedProperty m_SortingOrder;
-        private SerializedProperty m_SortingLayerID;
         private SerializedProperty m_Sort3DAs2D;
+        private SortType m_SortType;
 
         public override void OnEnable()
         {
             base.OnEnable();
 
-            alwaysAllowExpansion = true;
-            m_SortingOrder = serializedObject.FindProperty("m_SortingOrder");
-            m_SortingLayerID = serializedObject.FindProperty("m_SortingLayerID");
             m_Sort3DAs2D = serializedObject.FindProperty("m_Sort3DAs2D");
+
+            // Initialize m_SortType
+            m_SortType = m_Sort3DAs2D.boolValue ? SortType.Sort3DAs2D : m_SortAtRoot.boolValue ? SortType.SortAtRoot : SortType.Default;
         }
 
-        public RenderAs2D TryToFindCreatedRenderAs2D(SortingGroup sortingGroup)
+        void OnInspectorGUIFor2D()
         {
-            RenderAs2D[] renderAs2Ds = sortingGroup.GetComponents<RenderAs2D>();
-            foreach (RenderAs2D renderAs2D in renderAs2Ds)
-            {
-                if (renderAs2D.IsOwner(sortingGroup))
-                    return renderAs2D;
-            }
+            serializedObject.Update();
 
-            return null;
-        }
+            SortingLayerEditorUtility.RenderSortingLayerFields(m_SortingOrder, m_SortingLayerID);
 
-        bool DrawToggleWithLayout(bool flatten, GUIContent content)
-        {
-            Rect rect = EditorGUILayout.GetControlRect();
-            var boolValue = EditorGUI.Toggle(rect, content, flatten);
-            return boolValue;
-        }
+            var prevSortType = m_SortType;
+            var label = m_Sort3DAs2D.boolValue ? GUIStyles.sort3DAs2D : m_SortAtRoot.boolValue ? GUIStyles.sortAtRootStyle : GUIStyles.Default;
+            m_SortType = (SortType)EditorGUILayout.EnumPopup(label, m_SortType);
 
-        void DirtyScene()
-        {
-            UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(UnityEngine.SceneManagement.SceneManager.GetActiveScene());
-        }
+            if (prevSortType != m_SortType)
+            {
+                switch (m_SortType)
+                {
+                    case SortType.SortAtRoot:
+                        m_SortAtRoot.boolValue = true;
+                        m_Sort3DAs2D.boolValue = false;
+                        break;
+
+                    case SortType.Sort3DAs2D:
+                        m_SortAtRoot.boolValue = true;
+                        m_Sort3DAs2D.boolValue = true;
+                        break;
+
+                    default:
+                        m_SortAtRoot.boolValue = false;
+                        m_Sort3DAs2D.boolValue = false;
+                        break;
+                }
+            }
 
-        void RenderSort3DAs2D()
-        {
-            EditorGUILayout.PropertyField(m_Sort3DAs2D, Styles.sort3DAs2D);
             foreach (var target in targets)
             {
                 SortingGroup sortingGroup = (SortingGroup)target;
+                GameObject go = sortingGroup.gameObject;
+                go.TryGetComponent(out RenderAs2D renderAs2D);
+
                 if (sortingGroup.sort3DAs2D)
                 {
-                    GameObject go = sortingGroup.gameObject;
-                    go.TryGetComponent<RenderAs2D>(out RenderAs2D renderAs2D);
-
                     if (renderAs2D != null && !renderAs2D.IsOwner(sortingGroup))
                     {
-                        Component.DestroyImmediate(renderAs2D, true);
+                        DestroyImmediate(renderAs2D, true);
                         renderAs2D = null;
                     }
 
-                    if(renderAs2D == null)
+                    if (renderAs2D == null)
                     {
                         Material mat = AssetDatabase.LoadAssetAtPath<Material>("Packages/com.unity.render-pipelines.universal/Runtime/Materials/RenderAs2D-Flattening.mat");
                         renderAs2D = go.AddComponent<RenderAs2D>();
                         renderAs2D.Init(sortingGroup);
                         renderAs2D.material = mat;
-                        EditorUtility.SetDirty(sortingGroup.gameObject);
+                        EditorUtility.SetDirty(go);
+                    }
+                }
+                else
+                {
+                    if (renderAs2D != null)
+                    {
+                        DestroyImmediate(renderAs2D, true);
+                        renderAs2D = null;
                     }
                 }
             }
+
+            serializedObject.ApplyModifiedProperties();
         }
 
         public override void OnInspectorGUI()
         {
-            serializedObject.Update();
-
             var rpAsset = UniversalRenderPipeline.asset;
             if (rpAsset != null && (rpAsset.scriptableRenderer is Renderer2D))
-            {
-                SortingLayerEditorUtility.RenderSortingLayerFields(m_SortingOrder, m_SortingLayerID);
-                RenderSort3DAs2D();
-            }
+                OnInspectorGUIFor2D();
             else
                 base.OnInspectorGUI();
-
-            serializedObject.ApplyModifiedProperties();
         }
     }
 }