From 81822823ba02a89c446dd1add3dc2ef65bb0249e Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 15 Jun 2021 18:14:55 +0800
Subject: [PATCH 01/19] something is working

---
 .../Assets/LayerExplorer.meta                 |  8 ++
 .../Assets/LayerExplorer/LayerBatch.uxml      | 18 ++++
 .../Assets/LayerExplorer/LayerBatch.uxml.meta | 10 ++
 .../Assets/LayerExplorer/LayerExplorer.cs     | 91 +++++++++++++++++++
 .../LayerExplorer/LayerExplorer.cs.meta       | 11 +++
 .../Assets/LayerExplorer/LayerExplorer.uss    | 34 +++++++
 .../LayerExplorer/LayerExplorer.uss.meta      | 11 +++
 .../Assets/LayerExplorer/LayerExplorer.uxml   | 13 +++
 .../LayerExplorer/LayerExplorer.uxml.meta     | 10 ++
 9 files changed, 206 insertions(+)
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta
new file mode 100644
index 00000000000..5e714c24ce5
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5329900f84e7b4d949d9e72ec7a12c90
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
new file mode 100644
index 00000000000..db79727ec9b
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ui:UXML
+    xmlns:ui="UnityEngine.UIElements"
+    xmlns:uie="UnityEditor.UIElements"
+    xsi="http://www.w3.org/2001/XMLSchema-instance"
+    engine="UnityEngine.UIElements"
+    editor="UnityEditor.UIElements"
+    noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
+    editor-extension-mode="False">
+
+    <ui:VisualElement class="LayerBatch">
+        <ui:Label name="BatchIndex" class="BatchIndexColumn Index"/>
+        <ui:VisualElement name="BatchColor" class="BatchColor"/>
+        <ui:ListView name="LayerNames" class="BatchNameColumn LayerName"/>
+    </ui:VisualElement>
+
+</ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta
new file mode 100644
index 00000000000..46f02345329
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 754a67c6d4788447895a4349508b2f37
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
new file mode 100644
index 00000000000..b0a59772f90
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Unity.Mathematics;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Random = UnityEngine.Random;
+
+
+internal class LayerExplorer : EditorWindow
+{
+    public class LayerBatch
+    {
+        public string[] LayerNames;
+        public int batchId;
+        public int color;
+    }
+
+
+    [MenuItem("Window/2D/LayerExplorer")]
+    public static void ShowExample()
+    {
+        LayerExplorer wnd = GetWindow<LayerExplorer>();
+        wnd.titleContent = new GUIContent("Layer Explorer");
+    }
+
+    public void CreateGUI()
+    {
+        // Each editor window contains a root VisualElement object
+        var root = rootVisualElement;
+
+        // Import UXML
+        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerExplorer.uss");
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
+        VisualElement templateRoot = visualTree.Instantiate();
+        templateRoot.style.flexGrow = 1;
+        templateRoot.styleSheets.Add(styleSheet);
+        root.Add(templateRoot);
+
+        const int itemCount = 10;
+        var colors = new[]
+        {
+            Color.black, Color.blue, Color.cyan,
+            Color.gray, Color.green, Color.magenta,
+            Color.red, Color.white, Color.yellow,
+        };
+        var items = new List<LayerBatch>(itemCount);
+        for (var i = 0; i < itemCount; i++)
+        {
+            items.Add(new LayerBatch
+            {
+                batchId = i,
+                LayerNames = new []
+                {
+                    $"Layer {i}.A", $"Layer {i}.B", $"Layer {i}.C",
+                    $"Layer {i}.D", $"Layer {i}.E", $"Layer {i}.F",
+                    $"Layer {i}.G", $"Layer {i}.H", $"Layer {i}.J"
+                }
+            });
+        }
+
+        var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatch.uxml");
+        Func<VisualElement> makeItem = () => batchElement.Instantiate();
+
+        Action<VisualElement, int> bindItem = (e, i) =>
+        {
+            // this line is required to make the child of the Listview vary in heights
+            e.style.height = new StyleLength(StyleKeyword.Auto);
+            var batchIndex = e.Query<Label>("BatchIndex").First();
+            batchIndex.text = items[i].batchId.ToString();
+
+            var layers = e.Query<ListView>().First();
+            var layerNames = items[i].LayerNames.Take(Random.Range(1,items[i].LayerNames.Length)).ToList();
+            layers.itemsSource = layerNames;
+            layers.selectionType = SelectionType.None;
+            // layers.fixedItemHeight = 16;
+            layers.makeItem = () => new Label();
+            layers.bindItem = (element, index) => (element as Label).text = layerNames[index];
+
+            var color = e.Query<VisualElement>("BatchColor").First();
+            color.style.backgroundColor = new StyleColor(colors[i % colors.Length]);
+        };
+
+        var layerList = root.Query<ListView>("LayerList").First();
+        layerList.itemsSource = items;
+        layerList.makeItem = makeItem;
+        layerList.bindItem = bindItem;
+        // layerList.selectionType = SelectionType.None;
+    }
+}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta
new file mode 100644
index 00000000000..fcbda658083
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3f0281a9a104946b4b845f0338560878
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
new file mode 100644
index 00000000000..54872908859
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -0,0 +1,34 @@
+.LayerBatch {
+    flex-direction: row;
+    flex-shrink: 0;
+}
+
+.LayerBatch.Header {
+    background-color: darkmagenta;
+}
+
+.BatchIndexColumn {
+    width: 60px;
+}
+
+.BatchIndexColumn.Index {
+    border-left-width: 10px;
+}
+
+.BatchNameColumn {
+    border-left-width: 10px;
+}
+
+.BatchNameColumn.LayerName {
+    flex-grow: 1;
+}
+
+.BatchColor {
+    width: 10px;
+}
+
+#LayerList {
+    flex-grow: 1;
+    flex-shrink: 0;
+}
+
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta
new file mode 100644
index 00000000000..5840bd0404d
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fd5cb3dd3de574f1585db92b6689f86a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
new file mode 100644
index 00000000000..409607f0d42
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -0,0 +1,13 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+        <ui:TwoPaneSplitView height="20">
+            <ui:VisualElement name="LayerListContainer">
+                <ui:VisualElement class="LayerBatch Header">
+                    <ui:Label class="BatchIndexColumn" text="Batch ID"/>
+                    <ui:VisualElement class="BatchColor"/>
+                    <ui:Label class="BatchNameColumn" text="Layer Names"/>
+                </ui:VisualElement>
+                <ui:ListView name="LayerList"/>
+            </ui:VisualElement>
+            <ui:ScrollView name="InfoPanel"/>
+        </ui:TwoPaneSplitView>
+</ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta
new file mode 100644
index 00000000000..2dfcd418096
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 7f54b2764826949c192810bd3944abcc
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

From 93c0f0689c8c2111e47e110d46c0f8079702e12f Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Mon, 5 Jul 2021 10:53:14 +0800
Subject: [PATCH 02/19] wip

---
 .../Assets/LayerExplorer/LayerBatch.uxml      | 20 +++++--------------
 .../Assets/LayerExplorer/LayerExplorer.cs     |  6 ++++--
 .../Assets/LayerExplorer/LayerExplorer.uss    |  7 -------
 .../Assets/LayerExplorer/LayerExplorer.uxml   |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
index db79727ec9b..42b47af186a 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ui:UXML
-    xmlns:ui="UnityEngine.UIElements"
-    xmlns:uie="UnityEditor.UIElements"
-    xsi="http://www.w3.org/2001/XMLSchema-instance"
-    engine="UnityEngine.UIElements"
-    editor="UnityEditor.UIElements"
-    noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
-    editor-extension-mode="False">
-
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="project://database/Assets/LayerExplorer/LayerExplorer.uss?fileID=7433441132597879392&amp;guid=fd5cb3dd3de574f1585db92b6689f86a&amp;type=3#LayerExplorer" />
     <ui:VisualElement class="LayerBatch">
-        <ui:Label name="BatchIndex" class="BatchIndexColumn Index"/>
-        <ui:VisualElement name="BatchColor" class="BatchColor"/>
-        <ui:ListView name="LayerNames" class="BatchNameColumn LayerName"/>
+        <ui:Label name="BatchIndex" class="BatchIndexColumn Index" />
+        <ui:VisualElement name="BatchColor" class="BatchColor" />
+        <ui:ListView name="LayerNames" class="BatchNameColumn" />
     </ui:VisualElement>
-
 </ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index b0a59772f90..d3a0481ed24 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -74,7 +74,7 @@ public void CreateGUI()
             var layerNames = items[i].LayerNames.Take(Random.Range(1,items[i].LayerNames.Length)).ToList();
             layers.itemsSource = layerNames;
             layers.selectionType = SelectionType.None;
-            // layers.fixedItemHeight = 16;
+            layers.fixedItemHeight = 20;
             layers.makeItem = () => new Label();
             layers.bindItem = (element, index) => (element as Label).text = layerNames[index];
 
@@ -86,6 +86,8 @@ public void CreateGUI()
         layerList.itemsSource = items;
         layerList.makeItem = makeItem;
         layerList.bindItem = bindItem;
-        // layerList.selectionType = SelectionType.None;
+
+        var container = layerList.Query<VisualElement>("unity-content-container").First();
+        container.style.height = new StyleLength(StyleKeyword.Auto);
     }
 }
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index 54872908859..dd8f6f482f7 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -1,6 +1,5 @@
 .LayerBatch {
     flex-direction: row;
-    flex-shrink: 0;
 }
 
 .LayerBatch.Header {
@@ -19,16 +18,10 @@
     border-left-width: 10px;
 }
 
-.BatchNameColumn.LayerName {
-    flex-grow: 1;
-}
-
 .BatchColor {
     width: 10px;
 }
 
 #LayerList {
     flex-grow: 1;
-    flex-shrink: 0;
 }
-
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index 409607f0d42..1eaf70fad96 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-        <ui:TwoPaneSplitView height="20">
+        <ui:TwoPaneSplitView>
             <ui:VisualElement name="LayerListContainer">
                 <ui:VisualElement class="LayerBatch Header">
                     <ui:Label class="BatchIndexColumn" text="Batch ID"/>

From 5878ea9547736b1ba3af60c231dd10df1a44dc0e Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Mon, 12 Jul 2021 18:21:09 +0800
Subject: [PATCH 03/19] wip

---
 .../Assets/LayerExplorer/LayerBatch.uxml      |  2 +-
 .../Assets/LayerExplorer/LayerBatchView.cs    | 37 ++++++++++
 .../LayerExplorer/LayerBatchView.cs.meta      | 11 +++
 .../Assets/LayerExplorer/LayerBatchView.uss   |  5 ++
 .../LayerExplorer/LayerBatchView.uss.meta     | 11 +++
 .../Assets/LayerExplorer/LayerBatchView.uxml  | 15 ++++
 .../LayerExplorer/LayerBatchView.uxml.meta    | 10 +++
 .../Assets/LayerExplorer/LayerExplorer.cs     | 72 ++++++++++++++-----
 .../Assets/LayerExplorer/LayerExplorer.uss    | 40 ++++++++++-
 .../Assets/LayerExplorer/LayerExplorer.uxml   |  6 +-
 10 files changed, 185 insertions(+), 24 deletions(-)
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
index 42b47af186a..5ac09e0ec77 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
@@ -3,6 +3,6 @@
     <ui:VisualElement class="LayerBatch">
         <ui:Label name="BatchIndex" class="BatchIndexColumn Index" />
         <ui:VisualElement name="BatchColor" class="BatchColor" />
-        <ui:ListView name="LayerNames" class="BatchNameColumn" />
+        <ui:VisualElement name="LayerNames" class="BatchNameColumn" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
new file mode 100644
index 00000000000..63bc1e7c447
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
@@ -0,0 +1,37 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
+
+
+public class LayerBatchView : EditorWindow
+{
+    [MenuItem("Window/UI Toolkit/LayerBatchView")]
+    public static void ShowExample()
+    {
+        LayerBatchView wnd = GetWindow<LayerBatchView>();
+        wnd.titleContent = new GUIContent("LayerBatchView");
+    }
+
+    public void CreateGUI()
+    {
+        // Each editor window contains a root VisualElement object
+        VisualElement root = rootVisualElement;
+
+        // VisualElements objects can contain other VisualElement following a tree hierarchy.
+        VisualElement label = new Label("Hello World! From C#");
+        root.Add(label);
+
+        // Import UXML
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchView.uxml");
+        VisualElement labelFromUXML = visualTree.Instantiate();
+        root.Add(labelFromUXML);
+
+        // A stylesheet can be added to a VisualElement.
+        // The style will be applied to the VisualElement and all of its children.
+        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerBatchView.uss");
+        VisualElement labelWithStyle = new Label("Hello World! With Style");
+        labelWithStyle.styleSheets.Add(styleSheet);
+        root.Add(labelWithStyle);
+    }
+}
\ No newline at end of file
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
new file mode 100644
index 00000000000..231cac75be1
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca724eecedc804d29a0d8f6ee3d05ae9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
new file mode 100644
index 00000000000..d637471f37c
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
@@ -0,0 +1,5 @@
+Label {
+    font-size: 20px;
+    -unity-font-style: bold;
+    color: rgb(68, 138, 255);
+}
\ No newline at end of file
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
new file mode 100644
index 00000000000..be3e9d46ccc
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7aae4af35b8c24425a2873f386a9287d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
new file mode 100644
index 00000000000..678b8c8b9d9
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ui:UXML
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ui="UnityEngine.UIElements"
+    xmlns:editor="UnityEditor.UIElements"
+    xsi:noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
+>
+    <ui:VisualElement>
+        <ui:VisualElement name="Title" class="InfoView Content"/>
+        <ui:VisualElement name="Label1" class="InfoView Content"/>
+        <ui:VisualElement name="Bubble1" class="InfoView Content"/>
+        <ui:VisualElement name="Label2" class="InfoView Content"/>
+        <ui:VisualElement name="Bubble2" class="InfoView Content"/>
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta
new file mode 100644
index 00000000000..f6b780ec599
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c3014e2f4b3ea49b9b83110b77353c6e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index d3a0481ed24..60c333046e8 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using Unity.Mathematics;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Random = UnityEngine.Random;
@@ -29,13 +31,14 @@ public void CreateGUI()
     {
         // Each editor window contains a root VisualElement object
         var root = rootVisualElement;
+        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerExplorer.uss");
+        root.styleSheets.Add(styleSheet);
 
         // Import UXML
-        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerExplorer.uss");
         var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
         VisualElement templateRoot = visualTree.Instantiate();
         templateRoot.style.flexGrow = 1;
-        templateRoot.styleSheets.Add(styleSheet);
+        // templateRoot.styleSheets.Add(styleSheet);
         root.Add(templateRoot);
 
         const int itemCount = 10;
@@ -50,16 +53,20 @@ public void CreateGUI()
         {
             items.Add(new LayerBatch
             {
-                batchId = i,
-                LayerNames = new []
-                {
-                    $"Layer {i}.A", $"Layer {i}.B", $"Layer {i}.C",
-                    $"Layer {i}.D", $"Layer {i}.E", $"Layer {i}.F",
-                    $"Layer {i}.G", $"Layer {i}.H", $"Layer {i}.J"
-                }
+                batchId = i
             });
         }
 
+        foreach (var batch in items)
+        {
+            var count = Random.Range(1, 5);
+            batch.LayerNames = new string[count];
+            for (var j = 0; j < count; j++)
+            {
+                batch.LayerNames[j] = $"Batch{batch.batchId} Layer{j}";
+            }
+        }
+
         var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatch.uxml");
         Func<VisualElement> makeItem = () => batchElement.Instantiate();
 
@@ -67,16 +74,19 @@ public void CreateGUI()
         {
             // this line is required to make the child of the Listview vary in heights
             e.style.height = new StyleLength(StyleKeyword.Auto);
+
+            var batch = items[i];
             var batchIndex = e.Query<Label>("BatchIndex").First();
-            batchIndex.text = items[i].batchId.ToString();
+            batchIndex.text = batch.batchId.ToString();
 
-            var layers = e.Query<ListView>().First();
-            var layerNames = items[i].LayerNames.Take(Random.Range(1,items[i].LayerNames.Length)).ToList();
-            layers.itemsSource = layerNames;
-            layers.selectionType = SelectionType.None;
-            layers.fixedItemHeight = 20;
-            layers.makeItem = () => new Label();
-            layers.bindItem = (element, index) => (element as Label).text = layerNames[index];
+            var layers = e.Query<VisualElement>("LayerNames").First();
+            layers.Clear();
+            foreach (var layerName in items[i].LayerNames)
+            {
+                var label = new Label {text = layerName};
+                label.AddToClassList("LayerNameLabel");
+                layers.Add(label);
+            }
 
             var color = e.Query<VisualElement>("BatchColor").First();
             color.style.backgroundColor = new StyleColor(colors[i % colors.Length]);
@@ -86,8 +96,32 @@ public void CreateGUI()
         layerList.itemsSource = items;
         layerList.makeItem = makeItem;
         layerList.bindItem = bindItem;
+        layerList.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
+
+
+        var batchViewAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchView.uxml");
+        var batchView = batchViewAsset.Instantiate();
+
+        // populate
+        var title = batchView.Query<VisualElement>("Title").First();
+        title.Add(new Label{text = "Comparing Batch 2 and Batch 3"});
+
+        var label1 = batchView.Query<VisualElement>("Label1").First();
+        label1.Add(new Label{text = "Lights in Batch 2 but not in Batch 3"});
+
+        var bubble1 = batchView.Query<VisualElement>("Bubble1").First();
+        bubble1.Add(new Label{text = "[Bubble1]"});
+
+        var label2 = batchView.Query<VisualElement>("Label2").First();
+        label2.Add(new Label{text = "Lights in Batch 3 but not in Batch 2"});
+
+        var bubble2 = batchView.Query<VisualElement>("Bubble2").First();
+        bubble2.Add(new Label{text = "[Bubble2]"});
+
+        var desc = root.Query<VisualElement>("Description").First();
+        desc.Add(new Label{text = "Layers 2 and 3 are not batched together because they do not share the same set of lights."});
 
-        var container = layerList.Query<VisualElement>("unity-content-container").First();
-        container.style.height = new StyleLength(StyleKeyword.Auto);
+        var infoView = root.Query<ScrollView>("InfoScroller").First();
+        infoView.Add(batchView);
     }
 }
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index dd8f6f482f7..0ebe8b4c65b 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -3,7 +3,7 @@
 }
 
 .LayerBatch.Header {
-    background-color: darkmagenta;
+    height: 20px;
 }
 
 .BatchIndexColumn {
@@ -11,11 +11,16 @@
 }
 
 .BatchIndexColumn.Index {
-    border-left-width: 10px;
+    padding-left: 10px;
 }
 
 .BatchNameColumn {
-    border-left-width: 10px;
+    padding-left: 10px;
+}
+
+.LayerNamesList
+{
+
 }
 
 .BatchColor {
@@ -25,3 +30,32 @@
 #LayerList {
     flex-grow: 1;
 }
+
+.LayerNameLabel {
+    padding: 5px;
+}
+
+.InfoView {
+}
+
+.InfoView.Content {
+    border-bottom-width: 10px;
+}
+
+.InfoView.Content.Spacer {
+    flex-grow: 1;
+}
+
+.InfoView.Footer {
+    padding: 10px;
+}
+
+.InfoViewHeader {
+    height: 20px;
+}
+
+.InfoScroller {
+    flex-grow: 1;
+    padding: 10px;
+    background-color: #2A2A2A;
+}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index 1eaf70fad96..012bae54d83 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -8,6 +8,10 @@
                 </ui:VisualElement>
                 <ui:ListView name="LayerList"/>
             </ui:VisualElement>
-            <ui:ScrollView name="InfoPanel"/>
+            <ui:VisualElement>
+                <ui:VisualElement name="Header" class="InfoViewHeader"/>
+                <ui:ScrollView name="InfoScroller" class="InfoScroller"/>
+                <ui:VisualElement name="Description" class="InfoView Footer"/>
+            </ui:VisualElement>
         </ui:TwoPaneSplitView>
 </ui:UXML>

From 2f2f6f71b58bb46b50bb6710138f9ea893568915 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 13 Jul 2021 10:23:15 +0800
Subject: [PATCH 04/19] wip

---
 .../Assets/LayerExplorer/LayerBatchView.uxml  | 10 +++---
 .../Assets/LayerExplorer/LayerExplorer.cs     | 34 +++++++++++++------
 .../Assets/LayerExplorer/LayerExplorer.uss    | 22 ++++++++++++
 .../Assets/LayerExplorer/LayerExplorer.uxml   |  2 +-
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
index 678b8c8b9d9..3a05e350d7d 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
@@ -6,10 +6,10 @@
     xsi:noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
 >
     <ui:VisualElement>
-        <ui:VisualElement name="Title" class="InfoView Content"/>
-        <ui:VisualElement name="Label1" class="InfoView Content"/>
-        <ui:VisualElement name="Bubble1" class="InfoView Content"/>
-        <ui:VisualElement name="Label2" class="InfoView Content"/>
-        <ui:VisualElement name="Bubble2" class="InfoView Content"/>
+        <ui:Label name="Title" class="InfoView Content"/>
+        <ui:Label name="Label1" class="InfoView Content"/>
+        <ui:VisualElement name="Bubble1" class="InfoView Content PillContainer"/>
+        <ui:Label name="Label2" class="InfoView Content"/>
+        <ui:VisualElement name="Bubble2" class="InfoView Content PillContainer"/>
     </ui:VisualElement>
 </ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index 60c333046e8..c7a382b2055 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -103,25 +103,39 @@ public void CreateGUI()
         var batchView = batchViewAsset.Instantiate();
 
         // populate
-        var title = batchView.Query<VisualElement>("Title").First();
-        title.Add(new Label{text = "Comparing Batch 2 and Batch 3"});
+        var title = batchView.Query<Label>("Title").First();
+        title.text = "Comparing Batch 2 and Batch 3";
 
-        var label1 = batchView.Query<VisualElement>("Label1").First();
-        label1.Add(new Label{text = "Lights in Batch 2 but not in Batch 3"});
+        var label1 = batchView.Query<Label>("Label1").First();
+        label1.text = "Lights in Batch 2 but not in Batch 3";
 
         var bubble1 = batchView.Query<VisualElement>("Bubble1").First();
-        bubble1.Add(new Label{text = "[Bubble1]"});
+        for (var k = 0; k < 10; k++)
+        {
+            var bubble = new Button();
+            bubble.AddToClassList("Pill");
+            bubble.Add(new Label{text = $"Bubble{k}"});
+            bubble1.Add(bubble);
+        }
+
 
-        var label2 = batchView.Query<VisualElement>("Label2").First();
-        label2.Add(new Label{text = "Lights in Batch 3 but not in Batch 2"});
+        var label2 = batchView.Query<Label>("Label2").First();
+        label2.text = "Lights in Batch 3 but not in Batch 2";
 
         var bubble2 = batchView.Query<VisualElement>("Bubble2").First();
-        bubble2.Add(new Label{text = "[Bubble2]"});
+        for (var k = 0; k < 10; k++)
+        {
+            var bubble = new Button();
+            bubble.AddToClassList("Pill");
+            bubble.Add(new Label{text = $"Bubble{k}"});
+            bubble2.Add(bubble);
+        }
 
-        var desc = root.Query<VisualElement>("Description").First();
-        desc.Add(new Label{text = "Layers 2 and 3 are not batched together because they do not share the same set of lights."});
+        var desc = root.Query<Label>("Description").First();
+        desc.text = "Layers 2 and 3 are not batched together because they do not share the same set of lights.";
 
         var infoView = root.Query<ScrollView>("InfoScroller").First();
+        // infoView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
         infoView.Add(batchView);
     }
 }
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index 0ebe8b4c65b..95386d243d8 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -40,6 +40,12 @@
 
 .InfoView.Content {
     border-bottom-width: 10px;
+    white-space: normal;
+}
+
+.InfoView.Content.PillContainer {
+    flex-direction: row;
+    flex-wrap: wrap;
 }
 
 .InfoView.Content.Spacer {
@@ -48,6 +54,7 @@
 
 .InfoView.Footer {
     padding: 10px;
+    white-space: normal;
 }
 
 .InfoViewHeader {
@@ -59,3 +66,18 @@
     padding: 10px;
     background-color: #2A2A2A;
 }
+
+.Pill {
+    border-left-color: rgba(161, 154, 154, 255);
+    border-right-color: rgba(161, 154, 154, 255);
+    border-top-color: rgba(161, 154, 154, 255);
+    border-bottom-color: rgba(161, 154, 154, 255);
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-top-left-radius: 10px;
+    border-bottom-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-bottom-right-radius: 10px;
+}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index 012bae54d83..ca012962a0f 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -11,7 +11,7 @@
             <ui:VisualElement>
                 <ui:VisualElement name="Header" class="InfoViewHeader"/>
                 <ui:ScrollView name="InfoScroller" class="InfoScroller"/>
-                <ui:VisualElement name="Description" class="InfoView Footer"/>
+                <ui:Label name="Description" class="InfoView Footer"/>
             </ui:VisualElement>
         </ui:TwoPaneSplitView>
 </ui:UXML>

From 245e19652ad388fd13c544b5b432de738cb7d506 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 13 Jul 2021 12:08:54 +0800
Subject: [PATCH 05/19] wip

---
 .../Assets/LayerExplorer/LayerBatch.uxml      |   4 +
 .../Assets/LayerExplorer/LayerBatchView.cs    |  37 -----
 .../LayerExplorer/LayerBatchView.cs.meta      |  11 --
 .../Assets/LayerExplorer/LayerBatchView.uss   |   5 -
 .../LayerExplorer/LayerBatchView.uss.meta     |  11 --
 .../Assets/LayerExplorer/LayerBatchView.uxml  |  15 --
 .../LayerExplorer/LayerBatchView.uxml.meta    |  10 --
 .../Assets/LayerExplorer/LayerExplorer.cs     | 147 +++++++++++-------
 .../Assets/LayerExplorer/LayerExplorer.uss    |   7 +-
 .../Assets/LayerExplorer/LayerExplorer.uxml   |  20 ++-
 10 files changed, 110 insertions(+), 157 deletions(-)
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
 delete mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
index 5ac09e0ec77..d2ce790a1be 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
@@ -1,8 +1,12 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/LayerExplorer/LayerExplorer.uss?fileID=7433441132597879392&amp;guid=fd5cb3dd3de574f1585db92b6689f86a&amp;type=3#LayerExplorer" />
+
     <ui:VisualElement class="LayerBatch">
+
         <ui:Label name="BatchIndex" class="BatchIndexColumn Index" />
         <ui:VisualElement name="BatchColor" class="BatchColor" />
         <ui:VisualElement name="LayerNames" class="BatchNameColumn" />
+
     </ui:VisualElement>
+
 </ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
deleted file mode 100644
index 63bc1e7c447..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEditor.UIElements;
-
-
-public class LayerBatchView : EditorWindow
-{
-    [MenuItem("Window/UI Toolkit/LayerBatchView")]
-    public static void ShowExample()
-    {
-        LayerBatchView wnd = GetWindow<LayerBatchView>();
-        wnd.titleContent = new GUIContent("LayerBatchView");
-    }
-
-    public void CreateGUI()
-    {
-        // Each editor window contains a root VisualElement object
-        VisualElement root = rootVisualElement;
-
-        // VisualElements objects can contain other VisualElement following a tree hierarchy.
-        VisualElement label = new Label("Hello World! From C#");
-        root.Add(label);
-
-        // Import UXML
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchView.uxml");
-        VisualElement labelFromUXML = visualTree.Instantiate();
-        root.Add(labelFromUXML);
-
-        // A stylesheet can be added to a VisualElement.
-        // The style will be applied to the VisualElement and all of its children.
-        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerBatchView.uss");
-        VisualElement labelWithStyle = new Label("Hello World! With Style");
-        labelWithStyle.styleSheets.Add(styleSheet);
-        root.Add(labelWithStyle);
-    }
-}
\ No newline at end of file
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
deleted file mode 100644
index 231cac75be1..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ca724eecedc804d29a0d8f6ee3d05ae9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
deleted file mode 100644
index d637471f37c..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss
+++ /dev/null
@@ -1,5 +0,0 @@
-Label {
-    font-size: 20px;
-    -unity-font-style: bold;
-    color: rgb(68, 138, 255);
-}
\ No newline at end of file
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
deleted file mode 100644
index be3e9d46ccc..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uss.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7aae4af35b8c24425a2873f386a9287d
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
-  disableValidation: 0
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
deleted file mode 100644
index 3a05e350d7d..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ui:UXML
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ui="UnityEngine.UIElements"
-    xmlns:editor="UnityEditor.UIElements"
-    xsi:noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
->
-    <ui:VisualElement>
-        <ui:Label name="Title" class="InfoView Content"/>
-        <ui:Label name="Label1" class="InfoView Content"/>
-        <ui:VisualElement name="Bubble1" class="InfoView Content PillContainer"/>
-        <ui:Label name="Label2" class="InfoView Content"/>
-        <ui:VisualElement name="Bubble2" class="InfoView Content PillContainer"/>
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta
deleted file mode 100644
index f6b780ec599..00000000000
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchView.uxml.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: c3014e2f4b3ea49b9b83110b77353c6e
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index c7a382b2055..9b4e9f804e8 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -15,10 +15,11 @@ internal class LayerExplorer : EditorWindow
     public class LayerBatch
     {
         public string[] LayerNames;
+        public string[] Lights;
         public int batchId;
         public int color;
-    }
 
+    }
 
     [MenuItem("Window/2D/LayerExplorer")]
     public static void ShowExample()
@@ -27,37 +28,32 @@ public static void ShowExample()
         wnd.titleContent = new GUIContent("Layer Explorer");
     }
 
-    public void CreateGUI()
+    Color[] MakeColors()
     {
-        // Each editor window contains a root VisualElement object
-        var root = rootVisualElement;
-        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/LayerExplorer/LayerExplorer.uss");
-        root.styleSheets.Add(styleSheet);
-
-        // Import UXML
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
-        VisualElement templateRoot = visualTree.Instantiate();
-        templateRoot.style.flexGrow = 1;
-        // templateRoot.styleSheets.Add(styleSheet);
-        root.Add(templateRoot);
-
-        const int itemCount = 10;
-        var colors = new[]
+        return new[]
         {
             Color.black, Color.blue, Color.cyan,
             Color.gray, Color.green, Color.magenta,
             Color.red, Color.white, Color.yellow,
         };
-        var items = new List<LayerBatch>(itemCount);
+    }
+
+    private List<LayerBatch> batchList;
+
+    void MakeFakeData()
+    {
+        const int itemCount = 10;
+
+        batchList = new List<LayerBatch>(itemCount);
         for (var i = 0; i < itemCount; i++)
         {
-            items.Add(new LayerBatch
+            batchList.Add(new LayerBatch
             {
                 batchId = i
             });
         }
 
-        foreach (var batch in items)
+        foreach (var batch in batchList)
         {
             var count = Random.Range(1, 5);
             batch.LayerNames = new string[count];
@@ -67,6 +63,74 @@ public void CreateGUI()
             }
         }
 
+        foreach (var batch in batchList)
+        {
+            var count = Random.Range(1, 10);
+            batch.Lights = new string[count];
+            for (var j = 0; j < count; j++)
+            {
+                batch.Lights[j] = $"Light_{j}";
+            }
+        }
+    }
+
+    VisualElement MakeLightPill(string name)
+    {
+        var bubble = new Button();
+        bubble.AddToClassList("Pill");
+        bubble.Add(new Label{text = name});
+        return bubble;
+    }
+
+    void CompareBatch(int index1, int index2)
+    {
+        // Each editor window contains a root VisualElement object
+        var root = rootVisualElement;
+        var infoView = root.Query<ScrollView>("InfoScroller").First();
+
+        var batch1 = batchList[index1];
+        var batch2 = batchList[index2];
+
+        // populate
+        var title = infoView.Query<Label>("InfoTitle").First();
+        title.text = "Comparing Batch 2 and Batch 3";
+
+        var label1 = infoView.Query<Label>("InfoLabel1").First();
+        label1.text = "Lights in Batch 2 but not in Batch 3";
+
+        var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
+        foreach(var light in batch1.Lights)
+        {
+            bubble1.Add(MakeLightPill(light));
+        }
+
+        var label2 = infoView.Query<Label>("InfoLabel2").First();
+        label2.text = "Lights in Batch 3 but not in Batch 2";
+
+        var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
+        foreach(var light in batch2.Lights)
+        {
+            bubble2.Add(MakeLightPill(light));
+        }
+
+        var desc = root.Query<Label>("Description").First();
+        desc.text = "Layers 2 and 3 are not batched together because they do not share the same set of lights.";
+    }
+
+    public void CreateGUI()
+    {
+        // Each editor window contains a root VisualElement object
+        var root = rootVisualElement;
+
+        // Import UXML
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
+        var templateRoot = visualTree.Instantiate();
+        templateRoot.style.flexGrow = 1;
+        root.Add(templateRoot);
+
+        MakeFakeData();
+        var colors = MakeColors();
+
         var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatch.uxml");
         Func<VisualElement> makeItem = () => batchElement.Instantiate();
 
@@ -75,13 +139,13 @@ public void CreateGUI()
             // this line is required to make the child of the Listview vary in heights
             e.style.height = new StyleLength(StyleKeyword.Auto);
 
-            var batch = items[i];
+            var batch = batchList[i];
             var batchIndex = e.Query<Label>("BatchIndex").First();
             batchIndex.text = batch.batchId.ToString();
 
             var layers = e.Query<VisualElement>("LayerNames").First();
             layers.Clear();
-            foreach (var layerName in items[i].LayerNames)
+            foreach (var layerName in batchList[i].LayerNames)
             {
                 var label = new Label {text = layerName};
                 label.AddToClassList("LayerNameLabel");
@@ -93,49 +157,12 @@ public void CreateGUI()
         };
 
         var layerList = root.Query<ListView>("LayerList").First();
-        layerList.itemsSource = items;
+        layerList.itemsSource = batchList;
         layerList.makeItem = makeItem;
         layerList.bindItem = bindItem;
         layerList.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
 
+        CompareBatch(0, 1);
 
-        var batchViewAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchView.uxml");
-        var batchView = batchViewAsset.Instantiate();
-
-        // populate
-        var title = batchView.Query<Label>("Title").First();
-        title.text = "Comparing Batch 2 and Batch 3";
-
-        var label1 = batchView.Query<Label>("Label1").First();
-        label1.text = "Lights in Batch 2 but not in Batch 3";
-
-        var bubble1 = batchView.Query<VisualElement>("Bubble1").First();
-        for (var k = 0; k < 10; k++)
-        {
-            var bubble = new Button();
-            bubble.AddToClassList("Pill");
-            bubble.Add(new Label{text = $"Bubble{k}"});
-            bubble1.Add(bubble);
-        }
-
-
-        var label2 = batchView.Query<Label>("Label2").First();
-        label2.text = "Lights in Batch 3 but not in Batch 2";
-
-        var bubble2 = batchView.Query<VisualElement>("Bubble2").First();
-        for (var k = 0; k < 10; k++)
-        {
-            var bubble = new Button();
-            bubble.AddToClassList("Pill");
-            bubble.Add(new Label{text = $"Bubble{k}"});
-            bubble2.Add(bubble);
-        }
-
-        var desc = root.Query<Label>("Description").First();
-        desc.text = "Layers 2 and 3 are not batched together because they do not share the same set of lights.";
-
-        var infoView = root.Query<ScrollView>("InfoScroller").First();
-        // infoView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
-        infoView.Add(batchView);
     }
 }
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index 95386d243d8..684410d3508 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -18,11 +18,6 @@
     padding-left: 10px;
 }
 
-.LayerNamesList
-{
-
-}
-
 .BatchColor {
     width: 10px;
 }
@@ -68,7 +63,7 @@
 }
 
 .Pill {
-    border-left-color: rgba(161, 154, 154, 255);
+    border-left-color: rgb(161, 154, 154);
     border-right-color: rgba(161, 154, 154, 255);
     border-top-color: rgba(161, 154, 154, 255);
     border-bottom-color: rgba(161, 154, 154, 255);
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index ca012962a0f..d5dbda1aced 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -1,17 +1,33 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
         <ui:TwoPaneSplitView>
-            <ui:VisualElement name="LayerListContainer">
+            <Style src="LayerExplorer.uss" />
+
+            <ui:VisualElement>
+
                 <ui:VisualElement class="LayerBatch Header">
                     <ui:Label class="BatchIndexColumn" text="Batch ID"/>
                     <ui:VisualElement class="BatchColor"/>
                     <ui:Label class="BatchNameColumn" text="Layer Names"/>
                 </ui:VisualElement>
+
                 <ui:ListView name="LayerList"/>
+
             </ui:VisualElement>
+
             <ui:VisualElement>
+
                 <ui:VisualElement name="Header" class="InfoViewHeader"/>
-                <ui:ScrollView name="InfoScroller" class="InfoScroller"/>
+
+                <ui:ScrollView name="InfoScroller" class="InfoScroller">
+                    <ui:Label name="InfoTitle" class="InfoView Content"/>
+                    <ui:Label name="InfoLabel1" class="InfoView Content"/>
+                    <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>
+                    <ui:Label name="InfoLabel2" class="InfoView Content"/>
+                    <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>
+                </ui:ScrollView>
+
                 <ui:Label name="Description" class="InfoView Footer"/>
+
             </ui:VisualElement>
         </ui:TwoPaneSplitView>
 </ui:UXML>

From dced04a090383cd273a0ac85a9beba78d0ee3690 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 13 Jul 2021 13:34:51 +0800
Subject: [PATCH 06/19] wip

---
 .../Assets/LayerExplorer/LayerBatch.uxml      |  8 +--
 .../Assets/LayerExplorer/LayerExplorer.cs     |  4 +-
 .../Assets/LayerExplorer/LayerExplorer.uss    | 53 +++++++++++++------
 .../Assets/LayerExplorer/LayerExplorer.uxml   | 19 +++----
 4 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
index d2ce790a1be..8ab763a5643 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
@@ -1,11 +1,11 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/LayerExplorer/LayerExplorer.uss?fileID=7433441132597879392&amp;guid=fd5cb3dd3de574f1585db92b6689f86a&amp;type=3#LayerExplorer" />
 
-    <ui:VisualElement class="LayerBatch">
+    <ui:VisualElement class="BatchList BatchContainer">
 
-        <ui:Label name="BatchIndex" class="BatchIndexColumn Index" />
-        <ui:VisualElement name="BatchColor" class="BatchColor" />
-        <ui:VisualElement name="LayerNames" class="BatchNameColumn" />
+        <ui:Label name="BatchIndex"         class="BatchList IndexColumn Batch" />
+        <ui:VisualElement name="BatchColor" class="BatchList ColorColumn" />
+        <ui:VisualElement name="LayerNames" class="BatchList NameColumn Batch" />
 
     </ui:VisualElement>
 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index 9b4e9f804e8..0f080fe64cb 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -92,7 +92,7 @@ void CompareBatch(int index1, int index2)
         var batch2 = batchList[index2];
 
         // populate
-        var title = infoView.Query<Label>("InfoTitle").First();
+        var title = root.Query<Label>("InfoTitle").First();
         title.text = "Comparing Batch 2 and Batch 3";
 
         var label1 = infoView.Query<Label>("InfoLabel1").First();
@@ -122,7 +122,6 @@ public void CreateGUI()
         // Each editor window contains a root VisualElement object
         var root = rootVisualElement;
 
-        // Import UXML
         var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
         var templateRoot = visualTree.Instantiate();
         templateRoot.style.flexGrow = 1;
@@ -161,6 +160,7 @@ public void CreateGUI()
         layerList.makeItem = makeItem;
         layerList.bindItem = bindItem;
         layerList.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
+        layerList.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
 
         CompareBatch(0, 1);
 
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index 684410d3508..bc8ff761f34 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -1,33 +1,55 @@
-.LayerBatch {
-    flex-direction: row;
+.BatchList {
+
 }
 
-.LayerBatch.Header {
-    height: 20px;
+.BatchList.HeaderContainer {
+    flex-direction: row;
+    height: auto;
 }
 
-.BatchIndexColumn {
+.BatchList.IndexColumn {
+    margin-left: 5px;
     width: 60px;
 }
 
-.BatchIndexColumn.Index {
-    padding-left: 10px;
+.BatchList.ColorColumn {
+    width: 10px;
 }
 
-.BatchNameColumn {
-    padding-left: 10px;
+.BatchList.NameColumn {
+    flex-grow: 2;
+    margin-left: 5px;
 }
 
-.BatchColor {
-    width: 10px;
+.BatchList.BatchContainer {
+    flex-direction: row;
+}
+
+.BatchList.IndexColumn.Header {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.BatchList.NameColumn.Header {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.BatchList.IndexColumn.Batch {
+    margin-top: 5px;
+}
+
+.BatchList.NameColumn.Batch {
+    margin-top: 5px;
+    flex-direction: column;
 }
 
-#LayerList {
+.BatchList .List {
     flex-grow: 1;
 }
 
 .LayerNameLabel {
-    padding: 5px;
+    margin-bottom: 5px;
 }
 
 .InfoView {
@@ -52,8 +74,9 @@
     white-space: normal;
 }
 
-.InfoViewHeader {
-    height: 20px;
+.InfoView.Header {
+    margin: 5px;
+    height: auto;
 }
 
 .InfoScroller {
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index d5dbda1aced..e07f3501d03 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -1,25 +1,26 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-        <ui:TwoPaneSplitView>
+        <ui:TwoPaneSplitView fixed-pane-initial-dimension="200">
             <Style src="LayerExplorer.uss" />
 
             <ui:VisualElement>
 
-                <ui:VisualElement class="LayerBatch Header">
-                    <ui:Label class="BatchIndexColumn" text="Batch ID"/>
-                    <ui:VisualElement class="BatchColor"/>
-                    <ui:Label class="BatchNameColumn" text="Layer Names"/>
-                </ui:VisualElement>
+                <ui:Box     class="BatchList HeaderContainer">
+                    <ui:Label         class="BatchList IndexColumn Header" text="Batch ID"/>
+                    <ui:VisualElement class="BatchList ColorColumn"/>
+                    <ui:Label         class="BatchList NameColumn Header" text="Layer Names"/>
+                </ui:Box>
 
-                <ui:ListView name="LayerList"/>
+                <ui:ListView name="LayerList" class="BatchList List"/>
 
             </ui:VisualElement>
 
             <ui:VisualElement>
 
-                <ui:VisualElement name="Header" class="InfoViewHeader"/>
+                <ui:Box>
+                    <ui:Label name="InfoTitle" class="InfoView Header"/>
+                </ui:Box>
 
                 <ui:ScrollView name="InfoScroller" class="InfoScroller">
-                    <ui:Label name="InfoTitle" class="InfoView Content"/>
                     <ui:Label name="InfoLabel1" class="InfoView Content"/>
                     <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>
                     <ui:Label name="InfoLabel2" class="InfoView Content"/>

From ac9e7f0f5474c0867761ce59dc7e3008ce038245 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 13 Jul 2021 14:59:11 +0800
Subject: [PATCH 07/19] wip

---
 .../Assets/LayerExplorer/LayerExplorer.uss            | 11 ++++++++++-
 .../Assets/LayerExplorer/LayerExplorer.uxml           |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index bc8ff761f34..507db3f2f71 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -9,7 +9,7 @@
 
 .BatchList.IndexColumn {
     margin-left: 5px;
-    width: 60px;
+    width: 65px;
 }
 
 .BatchList.ColorColumn {
@@ -25,6 +25,15 @@
     flex-direction: row;
 }
 
+.BatchList.ColorColumn.Container {
+    align-items: center;
+}
+
+.BatchList.ColorColumn.Splitter {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
 .BatchList.IndexColumn.Header {
     margin-top: 5px;
     margin-bottom: 5px;
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index e07f3501d03..cec3f24302a 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -5,8 +5,10 @@
             <ui:VisualElement>
 
                 <ui:Box     class="BatchList HeaderContainer">
-                    <ui:Label         class="BatchList IndexColumn Header" text="Batch ID"/>
-                    <ui:VisualElement class="BatchList ColorColumn"/>
+                    <ui:Label     class="BatchList IndexColumn Header" text="Batch ID"/>
+                    <ui:VisualElement class="BatchList ColorColumn Container">
+                        <ui:Label text="|" class="BatchList ColorColumn Splitter"/>
+                    </ui:VisualElement>
                     <ui:Label         class="BatchList NameColumn Header" text="Layer Names"/>
                 </ui:Box>
 

From 3c0de1eede64fa5efed056c774614c6b51bca9f3 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Wed, 14 Jul 2021 17:47:18 +0800
Subject: [PATCH 08/19] added selection

---
 .../LayerExplorer/LayerBatchInfoView.uxml     |  11 ++
 .../LayerBatchInfoView.uxml.meta              |   3 +
 .../Assets/LayerExplorer/LayerExplorer.cs     | 106 ++++++++++++++++--
 .../Assets/LayerExplorer/LayerExplorer.uss    |  10 ++
 .../Assets/LayerExplorer/LayerExplorer.uxml   |  19 ++--
 5 files changed, 131 insertions(+), 18 deletions(-)
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml
 create mode 100644 TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml
new file mode 100644
index 00000000000..b4752c48c1d
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml
@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="project://database/Assets/LayerExplorer/LayerExplorer.uss?fileID=7433441132597879392&amp;guid=fd5cb3dd3de574f1585db92b6689f86a&amp;type=3#LayerExplorer" />
+
+    <ui:ScrollView name="InfoScroller" class="InfoScroller">
+        <ui:Label name="InfoLabel1" class="InfoView Content"/>
+        <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>
+        <ui:Label name="InfoLabel2" class="InfoView Content"/>
+        <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>
+    </ui:ScrollView>
+
+</ui:UXML>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta
new file mode 100644
index 00000000000..60a0224e0cd
--- /dev/null
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 00dfae39f4ff4d0daa568f0746dc709d
+timeCreated: 1626254709
\ No newline at end of file
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
index 0f080fe64cb..760e7924717 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
@@ -5,11 +5,17 @@
 using Unity.Mathematics;
 using UnityEditor;
 using UnityEditor.Build;
+using UnityEditor.TextCore.Text;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Random = UnityEngine.Random;
 
-
+/**
+ * Todos:
+ * - Live updated when layers are changed added
+ * - Hook up to the actual render pass (duh)
+ * - Move assets into package
+ */
 internal class LayerExplorer : EditorWindow
 {
     public class LayerBatch
@@ -39,6 +45,7 @@ Color[] MakeColors()
     }
 
     private List<LayerBatch> batchList;
+    private int primaryIndex;
 
     void MakeFakeData()
     {
@@ -78,15 +85,70 @@ VisualElement MakeLightPill(string name)
     {
         var bubble = new Button();
         bubble.AddToClassList("Pill");
-        bubble.Add(new Label{text = name});
+        bubble.text = name;
+        // bubble.Add(new Label{text = name});
+
+        bubble.clicked += () =>
+        {
+            Debug.Log($"Clicked {name}");
+        };
+
         return bubble;
     }
 
+    VisualElement GetOrCreateInfoView()
+    {
+        var root = rootVisualElement;
+        var infoView = root.Query<VisualElement>("InfoScroller").First();
+        if (infoView != null)
+            return infoView;
+
+        var infoContainer = root.Query<VisualElement>("InfoContainer").First();
+        infoContainer.Clear();
+
+        // load it
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchInfoView.uxml");
+        infoView = visualTree.Instantiate();
+        infoContainer.Add(infoView);
+
+        return infoView;
+    }
+
+    void ViewBatch(int index)
+    {
+        var root = rootVisualElement;
+        var infoView = GetOrCreateInfoView();
+
+        var batch1 = batchList[index];
+
+        var title = root.Query<Label>("InfoTitle").First();
+        title.text = $"Batch {batch1.batchId}";
+
+        var label1 = infoView.Query<Label>("InfoLabel1").First();
+        label1.text = $"Lights in Batch {batch1.batchId}";
+
+        var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
+        bubble1.Clear();
+        foreach(var light in batch1.Lights)
+        {
+            bubble1.Add(MakeLightPill(light));
+        }
+
+        var label2 = infoView.Query<Label>("InfoLabel2").First();
+        label2.text = "";
+
+        var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
+        bubble2.Clear();
+
+        var desc = root.Query<Label>("Description").First();
+        desc.text = "";
+    }
+
     void CompareBatch(int index1, int index2)
     {
         // Each editor window contains a root VisualElement object
         var root = rootVisualElement;
-        var infoView = root.Query<ScrollView>("InfoScroller").First();
+        var infoView = GetOrCreateInfoView();
 
         var batch1 = batchList[index1];
         var batch2 = batchList[index2];
@@ -99,6 +161,7 @@ void CompareBatch(int index1, int index2)
         label1.text = "Lights in Batch 2 but not in Batch 3";
 
         var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
+        bubble1.Clear();
         foreach(var light in batch1.Lights)
         {
             bubble1.Add(MakeLightPill(light));
@@ -108,6 +171,7 @@ void CompareBatch(int index1, int index2)
         label2.text = "Lights in Batch 3 but not in Batch 2";
 
         var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
+        bubble2.Clear();
         foreach(var light in batch2.Lights)
         {
             bubble2.Add(MakeLightPill(light));
@@ -155,14 +219,34 @@ public void CreateGUI()
             color.style.backgroundColor = new StyleColor(colors[i % colors.Length]);
         };
 
-        var layerList = root.Query<ListView>("LayerList").First();
-        layerList.itemsSource = batchList;
-        layerList.makeItem = makeItem;
-        layerList.bindItem = bindItem;
-        layerList.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
-        layerList.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
-
-        CompareBatch(0, 1);
+        var batchListView = root.Query<ListView>("BatchList").First();
+        batchListView.itemsSource = batchList;
+        batchListView.makeItem = makeItem;
+        batchListView.bindItem = bindItem;
+        batchListView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
+        batchListView.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
+        batchListView.selectionType = SelectionType.Multiple;
 
+        batchListView.onSelectionChange += objects =>
+        {
+            switch (batchListView.selectedIndices.Count())
+            {
+                case 1:
+                    primaryIndex = batchListView.selectedIndices.First();
+                    ViewBatch(primaryIndex);
+                    break;
+                case 2:
+                    // new indices are first in array!!??
+                    var secondIndex = batchListView.selectedIndices.First();
+                    CompareBatch(primaryIndex, secondIndex);
+                    break;
+                default:
+                    // assign new primary
+                    primaryIndex = batchListView.selectedIndices.First();
+                    ViewBatch(primaryIndex);
+                    batchListView.SetSelection(primaryIndex);
+                    break;
+            }
+        };
     }
 }
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
index 507db3f2f71..5217727d51e 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
@@ -91,7 +91,17 @@
 .InfoScroller {
     flex-grow: 1;
     padding: 10px;
+    align-self: flex-start;
+}
+
+.InfoContainer{
+    flex-grow: 1;
     background-color: #2A2A2A;
+    justify-content: center;
+}
+
+.InitialPrompt {
+    align-self: center;
 }
 
 .Pill {
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
index cec3f24302a..ba5ffcc5b4f 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
+++ b/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
@@ -12,7 +12,7 @@
                     <ui:Label         class="BatchList NameColumn Header" text="Layer Names"/>
                 </ui:Box>
 
-                <ui:ListView name="LayerList" class="BatchList List"/>
+                <ui:ListView name="BatchList" class="BatchList List"/>
 
             </ui:VisualElement>
 
@@ -22,12 +22,17 @@
                     <ui:Label name="InfoTitle" class="InfoView Header"/>
                 </ui:Box>
 
-                <ui:ScrollView name="InfoScroller" class="InfoScroller">
-                    <ui:Label name="InfoLabel1" class="InfoView Content"/>
-                    <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>
-                    <ui:Label name="InfoLabel2" class="InfoView Content"/>
-                    <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>
-                </ui:ScrollView>
+                <ui:VisualElement name="InfoContainer" class="InfoContainer">
+                    <ui:Label name="InitialPrompt" text="Select a batch to begin..." class="InitialPrompt"/>
+                </ui:VisualElement>
+
+
+<!--                <ui:ScrollView name="InfoScroller" class="InfoScroller">-->
+<!--                    <ui:Label name="InfoLabel1" class="InfoView Content"/>-->
+<!--                    <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>-->
+<!--                    <ui:Label name="InfoLabel2" class="InfoView Content"/>-->
+<!--                    <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>-->
+<!--                </ui:ScrollView>-->
 
                 <ui:Label name="Description" class="InfoView Footer"/>
 

From 7d6c261299fcfe437f3c77e0f472d9f17ecd68c1 Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Mon, 26 Jul 2021 11:28:20 +0800
Subject: [PATCH 09/19] move into package

---
 .../Editor/2D}/LayerExplorer.meta                         | 0
 .../Editor/2D}/LayerExplorer/LayerBatch.uxml              | 0
 .../Editor/2D}/LayerExplorer/LayerBatch.uxml.meta         | 0
 .../Editor/2D}/LayerExplorer/LayerBatchInfoView.uxml      | 0
 .../Editor/2D}/LayerExplorer/LayerBatchInfoView.uxml.meta | 0
 .../Editor/2D}/LayerExplorer/LayerExplorer.cs             | 8 +++++---
 .../Editor/2D}/LayerExplorer/LayerExplorer.cs.meta        | 0
 .../Editor/2D}/LayerExplorer/LayerExplorer.uss            | 0
 .../Editor/2D}/LayerExplorer/LayerExplorer.uss.meta       | 0
 .../Editor/2D}/LayerExplorer/LayerExplorer.uxml           | 0
 .../Editor/2D}/LayerExplorer/LayerExplorer.uxml.meta      | 0
 11 files changed, 5 insertions(+), 3 deletions(-)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer.meta (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerBatch.uxml (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerBatch.uxml.meta (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerBatchInfoView.uxml (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerBatchInfoView.uxml.meta (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.cs (96%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.cs.meta (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.uss (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.uss.meta (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.uxml (100%)
 rename {TestProjects/UniversalGraphicsTest_2D/Assets => com.unity.render-pipelines.universal/Editor/2D}/LayerExplorer/LayerExplorer.uxml.meta (100%)

diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer.meta
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatch.uxml
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatch.uxml
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatch.uxml.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatch.uxml.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatch.uxml.meta
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerBatchInfoView.uxml.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml.meta
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
similarity index 96%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 760e7924717..d20f3906276 100644
--- a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -18,6 +18,8 @@
  */
 internal class LayerExplorer : EditorWindow
 {
+    private const string ResourcePath = "Packages/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/";
+
     public class LayerBatch
     {
         public string[] LayerNames;
@@ -107,7 +109,7 @@ VisualElement GetOrCreateInfoView()
         infoContainer.Clear();
 
         // load it
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatchInfoView.uxml");
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatchInfoView.uxml");
         infoView = visualTree.Instantiate();
         infoContainer.Add(infoView);
 
@@ -186,7 +188,7 @@ public void CreateGUI()
         // Each editor window contains a root VisualElement object
         var root = rootVisualElement;
 
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerExplorer.uxml");
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerExplorer.uxml");
         var templateRoot = visualTree.Instantiate();
         templateRoot.style.flexGrow = 1;
         root.Add(templateRoot);
@@ -194,7 +196,7 @@ public void CreateGUI()
         MakeFakeData();
         var colors = MakeColors();
 
-        var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/LayerExplorer/LayerBatch.uxml");
+        var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
         Func<VisualElement> makeItem = () => batchElement.Instantiate();
 
         Action<VisualElement, int> bindItem = (e, i) =>
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.cs.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs.meta
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uss.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss.meta
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml
diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml.meta
similarity index 100%
rename from TestProjects/UniversalGraphicsTest_2D/Assets/LayerExplorer/LayerExplorer.uxml.meta
rename to com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml.meta

From da42ba887b4239c758358207a3271d0eb023c37f Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Mon, 26 Jul 2021 12:23:33 +0800
Subject: [PATCH 10/19] now with real batch, layer and light data

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs  | 65 ++++++++++---------
 .../Editor/2D/Light2DEditorUtility.cs         |  3 +
 .../Runtime/2D/Passes/Utility/LayerUtility.cs |  5 ++
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index d20f3906276..80630f07a1a 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -5,8 +5,10 @@
 using Unity.Mathematics;
 using UnityEditor;
 using UnityEditor.Build;
+using UnityEditor.Rendering.Universal;
 using UnityEditor.TextCore.Text;
 using UnityEngine;
+using UnityEngine.Rendering.Universal;
 using UnityEngine.UIElements;
 using Random = UnityEngine.Random;
 
@@ -20,10 +22,10 @@ internal class LayerExplorer : EditorWindow
 {
     private const string ResourcePath = "Packages/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/";
 
-    public class LayerBatch
+    private class LayerBatch
     {
-        public string[] LayerNames;
-        public string[] Lights;
+        public List<string> LayerNames = new List<string>();
+        public List<Light2D> Lights = new List<Light2D>();
         public int batchId;
         public int color;
 
@@ -36,7 +38,7 @@ public static void ShowExample()
         wnd.titleContent = new GUIContent("Layer Explorer");
     }
 
-    Color[] MakeColors()
+    private Color[] MakeColors()
     {
         return new[]
         {
@@ -49,56 +51,57 @@ Color[] MakeColors()
     private List<LayerBatch> batchList;
     private int primaryIndex;
 
-    void MakeFakeData()
+    private void PopulateData()
     {
-        const int itemCount = 10;
+        batchList = new List<LayerBatch>();
+        var renderer = Light2DEditorUtility.GetRenderer2DData();
+        if (renderer == null || renderer.lightCullResult == null)
+            return;
 
-        batchList = new List<LayerBatch>(itemCount);
-        for (var i = 0; i < itemCount; i++)
+        var layers = Light2DManager.GetCachedSortingLayer();
+        var batches = LayerUtility.CalculateBatches(renderer.lightCullResult, out var batchCount);
+
+        for (var i = 0; i < batchCount; i++)
         {
-            batchList.Add(new LayerBatch
+            var batchInfo = new LayerBatch
             {
                 batchId = i
-            });
-        }
+            };
 
-        foreach (var batch in batchList)
-        {
-            var count = Random.Range(1, 5);
-            batch.LayerNames = new string[count];
-            for (var j = 0; j < count; j++)
+            var batch = batches[i];
+            // get the lights
+            foreach (var light in renderer.lightCullResult.visibleLights)
             {
-                batch.LayerNames[j] = $"Batch{batch.batchId} Layer{j}";
+                // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch.
+                if (light.IsLitLayer(batch.startLayerID))
+                    batchInfo.Lights.Add(light);
             }
-        }
 
-        foreach (var batch in batchList)
-        {
-            var count = Random.Range(1, 10);
-            batch.Lights = new string[count];
-            for (var j = 0; j < count; j++)
+            for (var batchIndex = batch.startIndex; batchIndex <= batch.endIndex; batchIndex++)
             {
-                batch.Lights[j] = $"Light_{j}";
+                batchInfo.LayerNames.Add(layers[batchIndex].name);
             }
+
+            batchList.Add(batchInfo);
         }
     }
 
-    VisualElement MakeLightPill(string name)
+    private VisualElement MakeLightPill(Light2D light)
     {
         var bubble = new Button();
         bubble.AddToClassList("Pill");
-        bubble.text = name;
+        bubble.text = light.name;
         // bubble.Add(new Label{text = name});
 
         bubble.clicked += () =>
         {
-            Debug.Log($"Clicked {name}");
+            Selection.activeObject = light;
         };
 
         return bubble;
     }
 
-    VisualElement GetOrCreateInfoView()
+    private VisualElement GetOrCreateInfoView()
     {
         var root = rootVisualElement;
         var infoView = root.Query<VisualElement>("InfoScroller").First();
@@ -116,7 +119,7 @@ VisualElement GetOrCreateInfoView()
         return infoView;
     }
 
-    void ViewBatch(int index)
+    private void ViewBatch(int index)
     {
         var root = rootVisualElement;
         var infoView = GetOrCreateInfoView();
@@ -146,7 +149,7 @@ void ViewBatch(int index)
         desc.text = "";
     }
 
-    void CompareBatch(int index1, int index2)
+    private void CompareBatch(int index1, int index2)
     {
         // Each editor window contains a root VisualElement object
         var root = rootVisualElement;
@@ -193,7 +196,7 @@ public void CreateGUI()
         templateRoot.style.flexGrow = 1;
         root.Add(templateRoot);
 
-        MakeFakeData();
+        PopulateData();
         var colors = MakeColors();
 
         var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
diff --git a/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs b/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
index 4a03f072fd9..d46486e2b96 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
@@ -1,7 +1,10 @@
+using System.Runtime.CompilerServices;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
+
 namespace UnityEditor.Rendering.Universal
 {
     internal static class Light2DEditorUtility
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
index 04cb9e74224..f559f4486ed 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
@@ -4,6 +4,9 @@ namespace UnityEngine.Rendering.Universal
 {
     internal struct LayerBatch
     {
+        public int startIndex;
+        public int endIndex;
+
         public int startLayerID;
         public int endLayerValue;
         public SortingLayerRange layerRange;
@@ -139,6 +142,8 @@ public static LayerBatch[] CalculateBatches(ILight2DCullResult lightCullResult,
                 // Renderer within this range share the same set of lights so they should be rendered together.
                 var sortingLayerRange = new SortingLayerRange(lowerBound, upperBound);
 
+                layerBatch.startIndex = i;
+                layerBatch.endIndex = upperLayerInBatch;
                 layerBatch.startLayerID = layerToRender;
                 layerBatch.endLayerValue = endLayerValue;
                 layerBatch.layerRange = sortingLayerRange;

From 7ac1f3f92d21baa4703036f4e5552c4c14feca2a Mon Sep 17 00:00:00 2001
From: Paul Tham <paul@unity3d.com>
Date: Tue, 27 Jul 2021 12:26:56 +0800
Subject: [PATCH 11/19] working with compare and domain reload

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs  | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 80630f07a1a..3dbad38d109 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -1,16 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using NUnit.Framework;
-using Unity.Mathematics;
 using UnityEditor;
-using UnityEditor.Build;
 using UnityEditor.Rendering.Universal;
-using UnityEditor.TextCore.Text;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
 using UnityEngine.UIElements;
-using Random = UnityEngine.Random;
 
 /**
  * Todos:
@@ -50,13 +45,14 @@ private Color[] MakeColors()
 
     private List<LayerBatch> batchList;
     private int primaryIndex;
+    private bool isDataPopulated;
 
-    private void PopulateData()
+    private bool PopulateData()
     {
         batchList = new List<LayerBatch>();
         var renderer = Light2DEditorUtility.GetRenderer2DData();
         if (renderer == null || renderer.lightCullResult == null)
-            return;
+            return false;
 
         var layers = Light2DManager.GetCachedSortingLayer();
         var batches = LayerUtility.CalculateBatches(renderer.lightCullResult, out var batchCount);
@@ -84,6 +80,9 @@ private void PopulateData()
 
             batchList.Add(batchInfo);
         }
+
+        isDataPopulated = true;
+        return true;
     }
 
     private VisualElement MakeLightPill(Light2D light)
@@ -155,48 +154,84 @@ private void CompareBatch(int index1, int index2)
         var root = rootVisualElement;
         var infoView = GetOrCreateInfoView();
 
-        var batch1 = batchList[index1];
-        var batch2 = batchList[index2];
+        LayerBatch batch1;
+        LayerBatch batch2;
+
+        if (batchList[index1].batchId < batchList[index2].batchId)
+        {
+            batch1 = batchList[index1];
+            batch2 = batchList[index2];
+        }
+        else
+        {
+            batch1 = batchList[index2];
+            batch2 = batchList[index1];
+        }
+
+        var lightSet1 = new HashSet<Light2D>();
+        foreach(var light in batch1.Lights)
+            lightSet1.Add(light);
+
+        var lightSet2 = new HashSet<Light2D>();
+        foreach(var light in batch2.Lights)
+            lightSet2.Add(light);
+
 
         // populate
         var title = root.Query<Label>("InfoTitle").First();
-        title.text = "Comparing Batch 2 and Batch 3";
+        title.text = $"Comparing Batch {batch1.batchId} and Batch {batch2.batchId}";
 
         var label1 = infoView.Query<Label>("InfoLabel1").First();
-        label1.text = "Lights in Batch 2 but not in Batch 3";
+        label1.text = $"Lights in Batch {batch1.batchId} but not in Batch {batch2.batchId}";
 
         var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
         bubble1.Clear();
         foreach(var light in batch1.Lights)
         {
-            bubble1.Add(MakeLightPill(light));
+            if(!lightSet2.Contains(light))
+                bubble1.Add(MakeLightPill(light));
         }
 
         var label2 = infoView.Query<Label>("InfoLabel2").First();
-        label2.text = "Lights in Batch 3 but not in Batch 2";
+        label2.text = $"Lights in Batch {batch2.batchId} but not in Batch {batch1.batchId}";
 
         var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
         bubble2.Clear();
         foreach(var light in batch2.Lights)
         {
-            bubble2.Add(MakeLightPill(light));
+            if(!lightSet1.Contains(light))
+                bubble2.Add(MakeLightPill(light));
         }
 
         var desc = root.Query<Label>("Description").First();
-        desc.text = "Layers 2 and 3 are not batched together because they do not share the same set of lights.";
+        desc.text = $"Batch {batch1.batchId} and {batch2.batchId} are not batched together because they do not share the same set of lights.";
+    }
+
+    void OnEnable()
+    {
+        AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload;
+    }
+
+    private void OnAfterAssemblyReload()
+    {
+        isDataPopulated = false;
     }
 
     public void CreateGUI()
     {
-        // Each editor window contains a root VisualElement object
+
+        if (!PopulateData())
+            return;
+
         var root = rootVisualElement;
+        root.Clear();
 
         var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerExplorer.uxml");
         var templateRoot = visualTree.Instantiate();
         templateRoot.style.flexGrow = 1;
         root.Add(templateRoot);
 
-        PopulateData();
+
         var colors = MakeColors();
 
         var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
@@ -254,4 +289,10 @@ public void CreateGUI()
             }
         };
     }
+
+    private void OnGUI()
+    {
+        if(!isDataPopulated)
+            CreateGUI();
+    }
 }

From 9ec6f761c674df8ce84819c417e546e3b9faa1f7 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Wed, 4 Aug 2021 15:47:18 +0800
Subject: [PATCH 12/19] Fix a bug with layer selection

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 3dbad38d109..317c3ffd446 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -276,8 +276,8 @@ public void CreateGUI()
                     ViewBatch(primaryIndex);
                     break;
                 case 2:
-                    // new indices are first in array!!??
-                    var secondIndex = batchListView.selectedIndices.First();
+                    // new indices are at end of the list
+                    var secondIndex = batchListView.selectedIndices.Last();
                     CompareBatch(primaryIndex, secondIndex);
                     break;
                 default:

From a161405af2fd5a2c07cbde0c475fb6a8d8f75f24 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Thu, 12 Aug 2021 14:02:59 +0800
Subject: [PATCH 13/19] fix layer compare bug

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 317c3ffd446..d4a71b465b7 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -44,7 +44,6 @@ private Color[] MakeColors()
     }
 
     private List<LayerBatch> batchList;
-    private int primaryIndex;
     private bool isDataPopulated;
 
     private bool PopulateData()
@@ -272,11 +271,12 @@ public void CreateGUI()
             switch (batchListView.selectedIndices.Count())
             {
                 case 1:
-                    primaryIndex = batchListView.selectedIndices.First();
+                    int primaryIndex = batchListView.selectedIndices.First();
                     ViewBatch(primaryIndex);
                     break;
                 case 2:
-                    // new indices are at end of the list
+                    // order of new indices isn't deterministic
+                    primaryIndex = batchListView.selectedIndices.First();
                     var secondIndex = batchListView.selectedIndices.Last();
                     CompareBatch(primaryIndex, secondIndex);
                     break;

From d8fb4a996d77959aed2fa56a54c68016106e0f2d Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Tue, 31 Aug 2021 18:21:21 +0800
Subject: [PATCH 14/19] Update batch on layer change or target sorting layer
 change + new batch selection

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs  | 444 ++++++++++--------
 .../Editor/2D/SortingLayerDropDown.cs         |   7 +
 2 files changed, 245 insertions(+), 206 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index d4a71b465b7..38a809efe29 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -13,261 +13,265 @@
  * - Hook up to the actual render pass (duh)
  * - Move assets into package
  */
-internal class LayerExplorer : EditorWindow
+namespace UnityEditor.Rendering.Universal
 {
-    private const string ResourcePath = "Packages/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/";
-
-    private class LayerBatch
+    internal class LayerExplorer : EditorWindow
     {
-        public List<string> LayerNames = new List<string>();
-        public List<Light2D> Lights = new List<Light2D>();
-        public int batchId;
-        public int color;
+        private const string ResourcePath = "Packages/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/";
 
-    }
+        private class LayerBatch
+        {
+            public List<string> LayerNames = new List<string>();
+            public List<Light2D> Lights = new List<Light2D>();
+            public int batchId;
+            public int color;
 
-    [MenuItem("Window/2D/LayerExplorer")]
-    public static void ShowExample()
-    {
-        LayerExplorer wnd = GetWindow<LayerExplorer>();
-        wnd.titleContent = new GUIContent("Layer Explorer");
-    }
+        }
 
-    private Color[] MakeColors()
-    {
-        return new[]
+        [MenuItem("Window/2D/LayerExplorer")]
+        public static void ShowExample()
         {
+            LayerExplorer wnd = GetWindow<LayerExplorer>();
+            wnd.titleContent = new GUIContent("Layer Explorer");
+        }
+
+        private static Color[] BatchColors = new[] {
             Color.black, Color.blue, Color.cyan,
             Color.gray, Color.green, Color.magenta,
-            Color.red, Color.white, Color.yellow,
+            Color.red, Color.white, Color.yellow
         };
-    }
-
-    private List<LayerBatch> batchList;
-    private bool isDataPopulated;
-
-    private bool PopulateData()
-    {
-        batchList = new List<LayerBatch>();
-        var renderer = Light2DEditorUtility.GetRenderer2DData();
-        if (renderer == null || renderer.lightCullResult == null)
-            return false;
 
-        var layers = Light2DManager.GetCachedSortingLayer();
-        var batches = LayerUtility.CalculateBatches(renderer.lightCullResult, out var batchCount);
+        private List<LayerBatch> batchList;
+        private ListView batchListView;
 
-        for (var i = 0; i < batchCount; i++)
+        private bool PopulateData()
         {
-            var batchInfo = new LayerBatch
-            {
-                batchId = i
-            };
+            batchList = new List<LayerBatch>();
+            var renderer = Light2DEditorUtility.GetRenderer2DData();
+            if (renderer == null || renderer.lightCullResult == null)
+                return false;
 
-            var batch = batches[i];
-            // get the lights
-            foreach (var light in renderer.lightCullResult.visibleLights)
-            {
-                // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch.
-                if (light.IsLitLayer(batch.startLayerID))
-                    batchInfo.Lights.Add(light);
-            }
+            var layers = Light2DManager.GetCachedSortingLayer();
+            var batches = LayerUtility.CalculateBatches(renderer.lightCullResult, out var batchCount);
 
-            for (var batchIndex = batch.startIndex; batchIndex <= batch.endIndex; batchIndex++)
+            for (var i = 0; i < batchCount; i++)
             {
-                batchInfo.LayerNames.Add(layers[batchIndex].name);
+                var batchInfo = new LayerBatch
+                {
+                    batchId = i
+                };
+
+                var batch = batches[i];
+                // get the lights
+                foreach (var light in renderer.lightCullResult.visibleLights)
+                {
+                    // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch.
+                    if (light.IsLitLayer(batch.startLayerID))
+                        batchInfo.Lights.Add(light);
+                }
+
+                for (var batchIndex = batch.startIndex; batchIndex <= batch.endIndex; batchIndex++)
+                {
+                    batchInfo.LayerNames.Add(layers[batchIndex].name);
+                }
+
+                batchList.Add(batchInfo);
             }
 
-            batchList.Add(batchInfo);
+            return true;
         }
 
-        isDataPopulated = true;
-        return true;
-    }
+        private VisualElement MakeLightPill(Light2D light)
+        {
+            var bubble = new Button();
+            bubble.AddToClassList("Pill");
+            bubble.text = light.name;
+            // bubble.Add(new Label{text = name});
 
-    private VisualElement MakeLightPill(Light2D light)
-    {
-        var bubble = new Button();
-        bubble.AddToClassList("Pill");
-        bubble.text = light.name;
-        // bubble.Add(new Label{text = name});
+            bubble.clicked += () =>
+            {
+                Selection.activeObject = light;
+            };
 
-        bubble.clicked += () =>
+            return bubble;
+        }
+
+        private VisualElement GetOrCreateInfoView()
         {
-            Selection.activeObject = light;
-        };
+            var root = rootVisualElement;
+            var infoView = root.Query<VisualElement>("InfoScroller").First();
+            if (infoView != null)
+                return infoView;
 
-        return bubble;
-    }
+            var infoContainer = root.Query<VisualElement>("InfoContainer").First();
+            infoContainer.Clear();
+
+            // load it
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatchInfoView.uxml");
+            infoView = visualTree.Instantiate();
+            infoContainer.Add(infoView);
 
-    private VisualElement GetOrCreateInfoView()
-    {
-        var root = rootVisualElement;
-        var infoView = root.Query<VisualElement>("InfoScroller").First();
-        if (infoView != null)
             return infoView;
+        }
 
-        var infoContainer = root.Query<VisualElement>("InfoContainer").First();
-        infoContainer.Clear();
+        private void ViewBatch(int index)
+        {
+            if (index >= batchList.Count())
+                return;
 
-        // load it
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatchInfoView.uxml");
-        infoView = visualTree.Instantiate();
-        infoContainer.Add(infoView);
+            var root = rootVisualElement;
+            var infoView = GetOrCreateInfoView();
 
-        return infoView;
-    }
+            var batch1 = batchList[index];
 
-    private void ViewBatch(int index)
-    {
-        var root = rootVisualElement;
-        var infoView = GetOrCreateInfoView();
+            var title = root.Query<Label>("InfoTitle").First();
+            title.text = $"Batch {batch1.batchId}";
+
+            var label1 = infoView.Query<Label>("InfoLabel1").First();
+            label1.text = $"Lights in Batch {batch1.batchId}";
 
-        var batch1 = batchList[index];
+            var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
+            bubble1.Clear();
+            foreach (var light in batch1.Lights)
+            {
+                bubble1.Add(MakeLightPill(light));
+            }
 
-        var title = root.Query<Label>("InfoTitle").First();
-        title.text = $"Batch {batch1.batchId}";
+            var label2 = infoView.Query<Label>("InfoLabel2").First();
+            label2.text = "";
 
-        var label1 = infoView.Query<Label>("InfoLabel1").First();
-        label1.text = $"Lights in Batch {batch1.batchId}";
+            var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
+            bubble2.Clear();
 
-        var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
-        bubble1.Clear();
-        foreach(var light in batch1.Lights)
-        {
-            bubble1.Add(MakeLightPill(light));
+            var desc = root.Query<Label>("Description").First();
+            desc.text = "";
         }
 
-        var label2 = infoView.Query<Label>("InfoLabel2").First();
-        label2.text = "";
+        private void CompareBatch(int index1, int index2)
+        {
+            // Each editor window contains a root VisualElement object
+            var root = rootVisualElement;
+            var infoView = GetOrCreateInfoView();
 
-        var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
-        bubble2.Clear();
+            LayerBatch batch1;
+            LayerBatch batch2;
 
-        var desc = root.Query<Label>("Description").First();
-        desc.text = "";
-    }
+            if (batchList[index1].batchId < batchList[index2].batchId)
+            {
+                batch1 = batchList[index1];
+                batch2 = batchList[index2];
+            }
+            else
+            {
+                batch1 = batchList[index2];
+                batch2 = batchList[index1];
+            }
 
-    private void CompareBatch(int index1, int index2)
-    {
-        // Each editor window contains a root VisualElement object
-        var root = rootVisualElement;
-        var infoView = GetOrCreateInfoView();
+            var lightSet1 = new HashSet<Light2D>();
+            foreach (var light in batch1.Lights)
+                lightSet1.Add(light);
 
-        LayerBatch batch1;
-        LayerBatch batch2;
+            var lightSet2 = new HashSet<Light2D>();
+            foreach (var light in batch2.Lights)
+                lightSet2.Add(light);
 
-        if (batchList[index1].batchId < batchList[index2].batchId)
-        {
-            batch1 = batchList[index1];
-            batch2 = batchList[index2];
-        }
-        else
-        {
-            batch1 = batchList[index2];
-            batch2 = batchList[index1];
-        }
 
-        var lightSet1 = new HashSet<Light2D>();
-        foreach(var light in batch1.Lights)
-            lightSet1.Add(light);
+            // populate
+            var title = root.Query<Label>("InfoTitle").First();
+            title.text = $"Comparing Batch {batch1.batchId} and Batch {batch2.batchId}";
 
-        var lightSet2 = new HashSet<Light2D>();
-        foreach(var light in batch2.Lights)
-            lightSet2.Add(light);
+            var label1 = infoView.Query<Label>("InfoLabel1").First();
+            label1.text = $"Lights in Batch {batch1.batchId} but not in Batch {batch2.batchId}";
 
+            var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
+            bubble1.Clear();
+            foreach (var light in batch1.Lights)
+            {
+                if (!lightSet2.Contains(light))
+                    bubble1.Add(MakeLightPill(light));
+            }
 
-        // populate
-        var title = root.Query<Label>("InfoTitle").First();
-        title.text = $"Comparing Batch {batch1.batchId} and Batch {batch2.batchId}";
+            var label2 = infoView.Query<Label>("InfoLabel2").First();
+            label2.text = $"Lights in Batch {batch2.batchId} but not in Batch {batch1.batchId}";
 
-        var label1 = infoView.Query<Label>("InfoLabel1").First();
-        label1.text = $"Lights in Batch {batch1.batchId} but not in Batch {batch2.batchId}";
+            var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
+            bubble2.Clear();
+            foreach (var light in batch2.Lights)
+            {
+                if (!lightSet1.Contains(light))
+                    bubble2.Add(MakeLightPill(light));
+            }
 
-        var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
-        bubble1.Clear();
-        foreach(var light in batch1.Lights)
-        {
-            if(!lightSet2.Contains(light))
-                bubble1.Add(MakeLightPill(light));
+            var desc = root.Query<Label>("Description").First();
+            desc.text = $"Batch {batch1.batchId} and {batch2.batchId} are not batched together because they do not share the same set of lights.";
         }
 
-        var label2 = infoView.Query<Label>("InfoLabel2").First();
-        label2.text = $"Lights in Batch {batch2.batchId} but not in Batch {batch1.batchId}";
-
-        var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
-        bubble2.Clear();
-        foreach(var light in batch2.Lights)
+        void OnEnable()
         {
-            if(!lightSet1.Contains(light))
-                bubble2.Add(MakeLightPill(light));
+            CreateGUI();
         }
 
-        var desc = root.Query<Label>("Description").First();
-        desc.text = $"Batch {batch1.batchId} and {batch2.batchId} are not batched together because they do not share the same set of lights.";
-    }
-
-    void OnEnable()
-    {
-        AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload;
-    }
-
-    private void OnAfterAssemblyReload()
-    {
-        isDataPopulated = false;
-    }
-
-    public void CreateGUI()
-    {
-
-        if (!PopulateData())
-            return;
-
-        var root = rootVisualElement;
-        root.Clear();
-
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerExplorer.uxml");
-        var templateRoot = visualTree.Instantiate();
-        templateRoot.style.flexGrow = 1;
-        root.Add(templateRoot);
-
-
-        var colors = MakeColors();
+        // Create once, initialize
+        private void CreateGUI()
+        {
+            if (!PopulateData())
+                return;
 
-        var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
-        Func<VisualElement> makeItem = () => batchElement.Instantiate();
+            var root = rootVisualElement;
+            root.Clear();
 
-        Action<VisualElement, int> bindItem = (e, i) =>
-        {
-            // this line is required to make the child of the Listview vary in heights
-            e.style.height = new StyleLength(StyleKeyword.Auto);
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerExplorer.uxml");
+            var templateRoot = visualTree.Instantiate();
+            templateRoot.style.flexGrow = 1;
+            root.Add(templateRoot);
 
-            var batch = batchList[i];
-            var batchIndex = e.Query<Label>("BatchIndex").First();
-            batchIndex.text = batch.batchId.ToString();
+            var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
+            Func<VisualElement> makeItem = () => batchElement.Instantiate();
 
-            var layers = e.Query<VisualElement>("LayerNames").First();
-            layers.Clear();
-            foreach (var layerName in batchList[i].LayerNames)
+            Action<VisualElement, int> bindItem = (e, i) =>
             {
-                var label = new Label {text = layerName};
-                label.AddToClassList("LayerNameLabel");
-                layers.Add(label);
-            }
+                if (i >= batchList.Count())
+                    return;
+
+                // this line is required to make the child of the Listview vary in heights
+                e.style.height = new StyleLength(StyleKeyword.Auto);
+
+                var batch = batchList[i];
+                var batchIndex = e.Query<Label>("BatchIndex").First();
+                batchIndex.text = batch.batchId.ToString();
+
+                var layers = e.Query<VisualElement>("LayerNames").First();
+                layers.Clear();
+                foreach (var layerName in batchList[i].LayerNames)
+                {
+                    var label = new Label { text = layerName };
+                    label.AddToClassList("LayerNameLabel");
+                    layers.Add(label);
+                }
+
+                var color = e.Query<VisualElement>("BatchColor").First();
+                color.style.backgroundColor = new StyleColor(BatchColors[i % BatchColors.Length]);
+            };
 
-            var color = e.Query<VisualElement>("BatchColor").First();
-            color.style.backgroundColor = new StyleColor(colors[i % colors.Length]);
-        };
+            batchListView = root.Query<ListView>("BatchList").First();
+            batchListView.itemsSource = batchList;
+            batchListView.makeItem = makeItem;
+            batchListView.bindItem = bindItem;
+            batchListView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
+            batchListView.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
+            batchListView.selectionType = SelectionType.Multiple;
 
-        var batchListView = root.Query<ListView>("BatchList").First();
-        batchListView.itemsSource = batchList;
-        batchListView.makeItem = makeItem;
-        batchListView.bindItem = bindItem;
-        batchListView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
-        batchListView.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
-        batchListView.selectionType = SelectionType.Multiple;
+            batchListView.onSelectionChange += objects =>
+            {
+                OnSelectionChange();
+            };
+        }
 
-        batchListView.onSelectionChange += objects =>
+        private void OnSelectionChange()
         {
+            if (batchListView == null)
+                return;
+
             switch (batchListView.selectedIndices.Count())
             {
                 case 1:
@@ -278,21 +282,49 @@ public void CreateGUI()
                     // order of new indices isn't deterministic
                     primaryIndex = batchListView.selectedIndices.First();
                     var secondIndex = batchListView.selectedIndices.Last();
-                    CompareBatch(primaryIndex, secondIndex);
+                    if (secondIndex == primaryIndex + 1 || secondIndex == primaryIndex - 1)
+                        CompareBatch(primaryIndex, secondIndex);
+                    else
+                    {
+                        secondIndex = Mathf.Clamp(secondIndex, primaryIndex - 1, primaryIndex + 1);
+                        secondIndex = Mathf.Clamp(secondIndex, 0, batchList.Count());
+                        batchListView.selectedIndex = primaryIndex;
+                        batchListView.AddToSelection(secondIndex);
+                    }
                     break;
                 default:
-                    // assign new primary
-                    primaryIndex = batchListView.selectedIndices.First();
-                    ViewBatch(primaryIndex);
-                    batchListView.SetSelection(primaryIndex);
+                    if (batchListView.selectedIndices.Count() > 2)
+                        batchListView.RemoveFromSelection(batchListView.selectedIndices.Last());
                     break;
             }
-        };
-    }
+        }
 
-    private void OnGUI()
-    {
-        if(!isDataPopulated)
-            CreateGUI();
+        public void RefreshBatchView()
+        {
+            PopulateData();
+            batchListView.itemsSource = batchList;
+            batchListView.Rebuild();
+
+            OnSelectionChange();
+        }
+
+        private void OnGUI()
+        {
+            if(batchList.Any())
+            {
+                // Default select first index
+                if (!batchListView.selectedIndices.Any())
+                    batchListView.selectedIndex = 0;
+
+                // Refresh if layers are added or removed
+                bool needsRefresh = false;
+
+                var layers = Light2DManager.GetCachedSortingLayer();
+                needsRefresh = layers.Count() != batchList.Sum(x => x.LayerNames.Count());
+
+                if (needsRefresh)
+                    RefreshBatchView();
+            }
+        }
     }
 }
diff --git a/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs b/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
index 509a3f15474..a3bbacfd8d2 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
@@ -95,6 +95,13 @@ void OnSortingLayerSelected(object layerSelectionDataObject)
                 m_ApplyToSortingLayersList.Add(layerID);
 
             UpdateApplyToSortingLayersArray(layerSelectionDataObject);
+
+            if(EditorWindow.HasOpenInstances<LayerExplorer>())
+            {
+                LayerExplorer layerExplorer = EditorWindow.GetWindow<LayerExplorer>();
+                if (layerExplorer != null)
+                    layerExplorer.RefreshBatchView();
+            }
         }
 
         public void OnTargetSortingLayers(SerializedObject serializedObject, Object[] targets, GUIContent labelContent, System.Action<SerializedObject> selectionChangedCallback)

From 459eeb8f89c2ce01e009246e4195477cc785d5e7 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Wed, 1 Sep 2021 16:41:27 +0800
Subject: [PATCH 15/19] Move infoview header to the top and added bold text

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs  | 39 ++++++--------
 .../Editor/2D/LayerExplorer/LayerExplorer.uss |  9 ++--
 .../2D/LayerExplorer/LayerExplorer.uxml       | 54 ++++++++-----------
 .../Editor/2D/SortingLayerDropDown.cs         |  2 +-
 4 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 38a809efe29..cf4150f67b2 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEditor;
-using UnityEditor.Rendering.Universal;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
 using UnityEngine.UIElements;
 
 /**
  * Todos:
- * - Live updated when layers are changed added
  * - Hook up to the actual render pass (duh)
  * - Move assets into package
  */
@@ -25,14 +22,13 @@ private class LayerBatch
             public List<Light2D> Lights = new List<Light2D>();
             public int batchId;
             public int color;
-
         }
 
-        [MenuItem("Window/2D/LayerExplorer")]
+        [MenuItem("Window/2D/Sorting Layer Explorer")]
         public static void ShowExample()
         {
             LayerExplorer wnd = GetWindow<LayerExplorer>();
-            wnd.titleContent = new GUIContent("Layer Explorer");
+            wnd.titleContent = new GUIContent("Sorting Layer Explorer");
         }
 
         private static Color[] BatchColors = new[] {
@@ -86,7 +82,6 @@ private VisualElement MakeLightPill(Light2D light)
             var bubble = new Button();
             bubble.AddToClassList("Pill");
             bubble.text = light.name;
-            // bubble.Add(new Label{text = name});
 
             bubble.clicked += () =>
             {
@@ -125,7 +120,10 @@ private void ViewBatch(int index)
             var batch1 = batchList[index];
 
             var title = root.Query<Label>("InfoTitle").First();
-            title.text = $"Batch {batch1.batchId}";
+            title.text = $"<b>Batch {batch1.batchId}</b>" + " selected.";
+
+            var title2 = root.Query<Label>("InfoTitle2").First();
+            title2.text = "Select any two adjacent batches to compare.";
 
             var label1 = infoView.Query<Label>("InfoLabel1").First();
             label1.text = $"Lights in Batch {batch1.batchId}";
@@ -142,9 +140,6 @@ private void ViewBatch(int index)
 
             var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
             bubble2.Clear();
-
-            var desc = root.Query<Label>("Description").First();
-            desc.text = "";
         }
 
         private void CompareBatch(int index1, int index2)
@@ -175,13 +170,15 @@ private void CompareBatch(int index1, int index2)
             foreach (var light in batch2.Lights)
                 lightSet2.Add(light);
 
-
             // populate
             var title = root.Query<Label>("InfoTitle").First();
-            title.text = $"Comparing Batch {batch1.batchId} and Batch {batch2.batchId}";
+            title.text = $"Comparing <b>Batch {batch1.batchId}</b> and <b>Batch {batch2.batchId}</b>";
+
+            var title2 = root.Query<Label>("InfoTitle2").First();
+            title2.text = $"To batch <b>Batch {batch1.batchId}</b> and <b>Batch {batch2.batchId}</b>, ensure that the Sorting Layers in both batches share the same set of Lights.";
 
             var label1 = infoView.Query<Label>("InfoLabel1").First();
-            label1.text = $"Lights in Batch {batch1.batchId} but not in Batch {batch2.batchId}";
+            label1.text = $"Lights only in <b>Batch {batch1.batchId}</b>";
 
             var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
             bubble1.Clear();
@@ -192,7 +189,7 @@ private void CompareBatch(int index1, int index2)
             }
 
             var label2 = infoView.Query<Label>("InfoLabel2").First();
-            label2.text = $"Lights in Batch {batch2.batchId} but not in Batch {batch1.batchId}";
+            label2.text = $"Lights only in <b>Batch {batch2.batchId}</b>";
 
             var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
             bubble2.Clear();
@@ -201,9 +198,6 @@ private void CompareBatch(int index1, int index2)
                 if (!lightSet1.Contains(light))
                     bubble2.Add(MakeLightPill(light));
             }
-
-            var desc = root.Query<Label>("Description").First();
-            desc.text = $"Batch {batch1.batchId} and {batch2.batchId} are not batched together because they do not share the same set of lights.";
         }
 
         void OnEnable()
@@ -223,6 +217,7 @@ private void CreateGUI()
             var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerExplorer.uxml");
             var templateRoot = visualTree.Instantiate();
             templateRoot.style.flexGrow = 1;
+            templateRoot.Q("ParentElement").StretchToParentSize();
             root.Add(templateRoot);
 
             var batchElement = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(ResourcePath + "LayerBatch.uxml");
@@ -265,6 +260,9 @@ private void CreateGUI()
             {
                 OnSelectionChange();
             };
+
+            // Select first index by default
+            batchListView.selectedIndex = 0;
         }
 
         private void OnSelectionChange()
@@ -287,7 +285,6 @@ private void OnSelectionChange()
                     else
                     {
                         secondIndex = Mathf.Clamp(secondIndex, primaryIndex - 1, primaryIndex + 1);
-                        secondIndex = Mathf.Clamp(secondIndex, 0, batchList.Count());
                         batchListView.selectedIndex = primaryIndex;
                         batchListView.AddToSelection(secondIndex);
                     }
@@ -312,10 +309,6 @@ private void OnGUI()
         {
             if(batchList.Any())
             {
-                // Default select first index
-                if (!batchListView.selectedIndices.Any())
-                    batchListView.selectedIndex = 0;
-
                 // Refresh if layers are added or removed
                 bool needsRefresh = false;
 
diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss
index 5217727d51e..1fd3631be00 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uss
@@ -13,7 +13,7 @@
 }
 
 .BatchList.ColorColumn {
-    width: 10px;
+    width: 3px;
 }
 
 .BatchList.NameColumn {
@@ -32,6 +32,7 @@
 .BatchList.ColorColumn.Splitter {
     margin-top: 5px;
     margin-bottom: 5px;
+    margin-right: 5px;
 }
 
 .BatchList.IndexColumn.Header {
@@ -84,8 +85,10 @@
 }
 
 .InfoView.Header {
-    margin: 5px;
-    height: auto;
+    padding: 5px;
+    flex-basis: 60px;
+    align-items: flex-start;
+    justify-content: space-around;
 }
 
 .InfoScroller {
diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml
index ba5ffcc5b4f..da5f972ae15 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.uxml
@@ -1,41 +1,31 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-        <ui:TwoPaneSplitView fixed-pane-initial-dimension="200">
-            <Style src="LayerExplorer.uss" />
-
-            <ui:VisualElement>
-
-                <ui:Box     class="BatchList HeaderContainer">
-                    <ui:Label     class="BatchList IndexColumn Header" text="Batch ID"/>
-                    <ui:VisualElement class="BatchList ColorColumn Container">
-                        <ui:Label text="|" class="BatchList ColorColumn Splitter"/>
-                    </ui:VisualElement>
-                    <ui:Label         class="BatchList NameColumn Header" text="Layer Names"/>
-                </ui:Box>
 
-                <ui:ListView name="BatchList" class="BatchList List"/>
+        <ui:VisualElement name="ParentElement" style="flex-direction:column">
+            <Style src="LayerExplorer.uss" />
 
+            <ui:VisualElement class="InfoView Header">
+                <ui:Label name="InfoTitle"/>
+                <ui:Label name="InfoTitle2"/>
             </ui:VisualElement>
 
-            <ui:VisualElement>
-
-                <ui:Box>
-                    <ui:Label name="InfoTitle" class="InfoView Header"/>
-                </ui:Box>
-
-                <ui:VisualElement name="InfoContainer" class="InfoContainer">
-                    <ui:Label name="InitialPrompt" text="Select a batch to begin..." class="InitialPrompt"/>
+            <ui:TwoPaneSplitView fixed-pane-initial-dimension="200">                          
+                <ui:VisualElement>
+                    <ui:Box class="BatchList HeaderContainer">
+                        <ui:Label class="BatchList IndexColumn Header" text="Batch ID"/>
+                        <ui:VisualElement class="BatchList ColorColumn Container">
+                            <ui:Label text="|" class="BatchList ColorColumn Splitter"/>
+                        </ui:VisualElement>
+                        <ui:Label class="BatchList NameColumn Header" text="Layer Names"/>
+                    </ui:Box>
+                    <ui:ListView name="BatchList" class="BatchList List"/>
                 </ui:VisualElement>
 
+                <ui:VisualElement>
+                    <ui:VisualElement name="InfoContainer" class="InfoContainer">
+                        <ui:Label name="InitialPrompt" text="Select a batch to begin..." class="InitialPrompt"/>
+                    </ui:VisualElement>
+                </ui:VisualElement>
+            </ui:TwoPaneSplitView>
 
-<!--                <ui:ScrollView name="InfoScroller" class="InfoScroller">-->
-<!--                    <ui:Label name="InfoLabel1" class="InfoView Content"/>-->
-<!--                    <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>-->
-<!--                    <ui:Label name="InfoLabel2" class="InfoView Content"/>-->
-<!--                    <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>-->
-<!--                </ui:ScrollView>-->
-
-                <ui:Label name="Description" class="InfoView Footer"/>
-
-            </ui:VisualElement>
-        </ui:TwoPaneSplitView>
+        </ui:VisualElement>
 </ui:UXML>
diff --git a/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs b/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
index a3bbacfd8d2..c57aa10801b 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/SortingLayerDropDown.cs
@@ -98,7 +98,7 @@ void OnSortingLayerSelected(object layerSelectionDataObject)
 
             if(EditorWindow.HasOpenInstances<LayerExplorer>())
             {
-                LayerExplorer layerExplorer = EditorWindow.GetWindow<LayerExplorer>();
+                var layerExplorer = EditorWindow.GetWindow<LayerExplorer>();
                 if (layerExplorer != null)
                     layerExplorer.RefreshBatchView();
             }

From 76b76235b185faf1a61d3bd5899851cc53542fe3 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Wed, 1 Sep 2021 16:50:44 +0800
Subject: [PATCH 16/19] reorder colors

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index cf4150f67b2..ef056ded982 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -32,9 +32,15 @@ public static void ShowExample()
         }
 
         private static Color[] BatchColors = new[] {
-            Color.black, Color.blue, Color.cyan,
-            Color.gray, Color.green, Color.magenta,
-            Color.red, Color.white, Color.yellow
+            Color.green,
+            Color.magenta,
+            Color.yellow,
+            Color.red,
+            Color.cyan,
+            Color.white,
+            Color.gray,
+            Color.blue,
+            Color.black,
         };
 
         private List<LayerBatch> batchList;

From 56e72d4918ac0267481283dcffed3576e7895f54 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Tue, 7 Sep 2021 11:19:15 +0800
Subject: [PATCH 17/19] Update text to bold + change to linq operation

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index ef056ded982..0d47813fcd6 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -132,7 +132,7 @@ private void ViewBatch(int index)
             title2.text = "Select any two adjacent batches to compare.";
 
             var label1 = infoView.Query<Label>("InfoLabel1").First();
-            label1.text = $"Lights in Batch {batch1.batchId}";
+            label1.text = $"Lights in <b>Batch {batch1.batchId}</b>";
 
             var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
             bubble1.Clear();
@@ -188,22 +188,16 @@ private void CompareBatch(int index1, int index2)
 
             var bubble1 = infoView.Query<VisualElement>("InfoBubble1").First();
             bubble1.Clear();
-            foreach (var light in batch1.Lights)
-            {
-                if (!lightSet2.Contains(light))
-                    bubble1.Add(MakeLightPill(light));
-            }
+            foreach (var light in lightSet1.Except(lightSet2))
+                bubble1.Add(MakeLightPill(light));
 
             var label2 = infoView.Query<Label>("InfoLabel2").First();
             label2.text = $"Lights only in <b>Batch {batch2.batchId}</b>";
 
             var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
             bubble2.Clear();
-            foreach (var light in batch2.Lights)
-            {
-                if (!lightSet1.Contains(light))
-                    bubble2.Add(MakeLightPill(light));
-            }
+            foreach (var light in lightSet2.Except(lightSet1))
+                bubble2.Add(MakeLightPill(light));
         }
 
         void OnEnable()

From 7fd8aee4ba65e24ae3670b9c68840dc6e11f671e Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Tue, 7 Sep 2021 17:52:21 +0800
Subject: [PATCH 18/19] refresh layer explorer if new scene is opened

---
 .../Editor/2D/LayerExplorer/LayerExplorer.cs               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 0d47813fcd6..06e7271e612 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
+using UnityEngine.SceneManagement;
 using UnityEngine.UIElements;
 
 /**
@@ -45,6 +46,7 @@ public static void ShowExample()
 
         private List<LayerBatch> batchList;
         private ListView batchListView;
+        private int cachedSceneHandle;
 
         private bool PopulateData()
         {
@@ -53,6 +55,7 @@ private bool PopulateData()
             if (renderer == null || renderer.lightCullResult == null)
                 return false;
 
+            cachedSceneHandle = SceneManager.GetActiveScene().handle;
             var layers = Light2DManager.GetCachedSortingLayer();
             var batches = LayerUtility.CalculateBatches(renderer.lightCullResult, out var batchCount);
 
@@ -312,8 +315,8 @@ private void OnGUI()
                 // Refresh if layers are added or removed
                 bool needsRefresh = false;
 
-                var layers = Light2DManager.GetCachedSortingLayer();
-                needsRefresh = layers.Count() != batchList.Sum(x => x.LayerNames.Count());
+                needsRefresh |= Light2DManager.GetCachedSortingLayer().Count() != batchList.Sum(x => x.LayerNames.Count());
+                needsRefresh |= cachedSceneHandle != SceneManager.GetActiveScene().handle;
 
                 if (needsRefresh)
                     RefreshBatchView();

From 0553a680295059c64ecd4f113f119d928128e8a5 Mon Sep 17 00:00:00 2001
From: Kenny Tan <kenny.tan@unity3d.com>
Date: Sat, 12 Mar 2022 00:30:29 +0800
Subject: [PATCH 19/19] Re-architecture passes - Break up into normal,
 lighting, transparency

---
 .../2D/LayerExplorer/LayerBatchInfoView.uxml  |   2 +
 .../Editor/2D/LayerExplorer/LayerExplorer.cs  |  26 ++-
 .../Runtime/2D/Light2DCullResult.cs           |  24 ++-
 .../Runtime/2D/Passes/LightingPass.cs         |  75 ++++++++
 .../Runtime/2D/Passes/LightingPass.cs.meta    |  11 ++
 .../Runtime/2D/Passes/NormalPass.cs           |  56 ++++++
 .../Runtime/2D/Passes/NormalPass.cs.meta      |  11 ++
 .../Runtime/2D/Passes/Render2DLightingPass.cs |  68 ++-----
 .../Runtime/2D/Passes/TransparencyPass.cs     | 116 ++++++++++++
 .../2D/Passes/TransparencyPass.cs.meta        |  11 ++
 .../Runtime/2D/Passes/Utility/LayerUtility.cs |  49 ++++-
 .../2D/Passes/Utility/RendererLighting.cs     |  45 +++--
 .../Runtime/2D/Renderer2D.cs                  |  41 +++-
 .../Runtime/2D/Renderer2DData.cs              |   3 +
 .../Runtime/2D/Shadows/ShadowRendering.cs     | 176 +++++++-----------
 15 files changed, 521 insertions(+), 193 deletions(-)
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs.meta
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs.meta
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs
 create mode 100644 com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs.meta

diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml
index b4752c48c1d..a6f22a67914 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerBatchInfoView.uxml
@@ -6,6 +6,8 @@
         <ui:VisualElement name="InfoBubble1" class="InfoView Content PillContainer"/>
         <ui:Label name="InfoLabel2" class="InfoView Content"/>
         <ui:VisualElement name="InfoBubble2" class="InfoView Content PillContainer"/>
+        <ui:Label name="InfoLabel3" class="InfoView Content"/>
+        <ui:VisualElement name="InfoBubble3" class="InfoView Content PillContainer"/>
     </ui:ScrollView>
 
 </ui:UXML>
diff --git a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
index 06e7271e612..bbe69de7965 100644
--- a/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
+++ b/com.unity.render-pipelines.universal/Editor/2D/LayerExplorer/LayerExplorer.cs
@@ -21,6 +21,7 @@ private class LayerBatch
         {
             public List<string> LayerNames = new List<string>();
             public List<Light2D> Lights = new List<Light2D>();
+            public List<ShadowCaster2D> Shadows = new List<ShadowCaster2D>();
             public int batchId;
             public int color;
         }
@@ -67,12 +68,25 @@ private bool PopulateData()
                 };
 
                 var batch = batches[i];
+
                 // get the lights
                 foreach (var light in renderer.lightCullResult.visibleLights)
                 {
                     // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch.
                     if (light.IsLitLayer(batch.startLayerID))
+                    {
                         batchInfo.Lights.Add(light);
+                    }
+                }
+
+                if (ShadowCasterGroup2DManager.shadowCasterGroups != null)
+                {
+                    var allShadows = ShadowCasterGroup2DManager.shadowCasterGroups.SelectMany(x => x.GetShadowCasters());
+                    foreach (var shadowCaster in allShadows)
+                    {
+                        if (shadowCaster.IsShadowedLayer(batch.startLayerID))
+                            batchInfo.Shadows.Add(shadowCaster);
+                    }
                 }
 
                 for (var batchIndex = batch.startIndex; batchIndex <= batch.endIndex; batchIndex++)
@@ -86,7 +100,7 @@ private bool PopulateData()
             return true;
         }
 
-        private VisualElement MakeLightPill(Light2D light)
+        private VisualElement MakeLightPill(UnityEngine.Object light)
         {
             var bubble = new Button();
             bubble.AddToClassList("Pill");
@@ -149,6 +163,16 @@ private void ViewBatch(int index)
 
             var bubble2 = infoView.Query<VisualElement>("InfoBubble2").First();
             bubble2.Clear();
+
+            var label3 = infoView.Query<Label>("InfoLabel3").First();
+            label3.text = $"Shadows in <b>Batch {batch1.batchId}</b>";
+
+            var bubble3 = infoView.Query<VisualElement>("InfoBubble3").First();
+            bubble3.Clear();
+            foreach (var shadow in batch1.Shadows)
+            {
+                bubble3.Add(MakeLightPill(shadow));
+            }
         }
 
         private void CompareBatch(int index1, int index2)
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs b/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs
index 41b00587703..6abd604e58d 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs
@@ -7,6 +7,7 @@ namespace UnityEngine.Rendering.Universal
     internal struct LightStats
     {
         public int totalLights;
+        public int totalShadowCasters;
         public int totalNormalMapUsage;
         public int totalVolumetricUsage;
         public uint blendStylesUsed;
@@ -27,7 +28,7 @@ internal class Light2DCullResult : ILight2DCullResult
 
         public bool IsSceneLit()
         {
-            if (visibleLights.Count > 0)
+            /*if (visibleLights.Count > 0)
                 return true;
 
             foreach (var light in Light2DManager.lights)
@@ -36,7 +37,8 @@ public bool IsSceneLit()
                     return true;
             }
 
-            return false;
+            return false;*/
+            return Light2DManager.lights.Count > 0;
         }
 
         public LightStats GetLightStatsByLayer(int layer)
@@ -58,6 +60,23 @@ public LightStats GetLightStatsByLayer(int layer)
                     returnStats.blendStylesWithLights |= (uint)(1 << light.blendStyleIndex);
             }
 
+            if(ShadowCasterGroup2DManager.shadowCasterGroups != null)
+            {
+                foreach (var shadowGroup in ShadowCasterGroup2DManager.shadowCasterGroups)
+                {
+                    if (shadowGroup != null)
+                    {
+                        foreach (var shadowCaster in shadowGroup.GetShadowCasters())
+                        {
+                            if (shadowCaster != null && !shadowCaster.IsShadowedLayer(layer))
+                                continue;
+
+                            returnStats.totalShadowCasters++;
+                        }
+                    }
+                }
+            }
+
             return returnStats;
         }
 
@@ -65,6 +84,7 @@ public void SetupCulling(ref ScriptableCullingParameters cullingParameters, Came
         {
             Profiler.BeginSample("Cull 2D Lights");
             m_VisibleLights.Clear();
+
             foreach (var light in Light2DManager.lights)
             {
                 if ((camera.cullingMask & (1 << light.gameObject.layer)) == 0)
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs
new file mode 100644
index 00000000000..2cf62241ce1
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs
@@ -0,0 +1,75 @@
+namespace UnityEngine.Rendering.Universal
+{
+    internal class LightingPass : ScriptableRenderPass, IRenderPass2D
+    {
+        private static readonly int k_HDREmulationScaleID = Shader.PropertyToID("_HDREmulationScale");
+        private static readonly int k_InverseHDREmulationScaleID = Shader.PropertyToID("_InverseHDREmulationScale");
+        private static readonly int k_UseSceneLightingID = Shader.PropertyToID("_UseSceneLighting");
+        private static readonly int k_RendererColorID = Shader.PropertyToID("_RendererColor");
+        private readonly Renderer2DData m_Renderer2DData;
+
+        Renderer2DData IRenderPass2D.rendererData
+        {
+            get { return m_Renderer2DData; }
+        }
+
+        public LightingPass(Renderer2DData rendererData)
+        {
+            profilingSampler = new ProfilingSampler(nameof(LightingPass));
+            m_Renderer2DData = rendererData;
+        }
+
+        public void Setup()
+        {
+        }
+
+        public override void OnCameraCleanup(CommandBuffer cmd)
+        {
+            this.ReleaseRenderTextures(cmd);
+        }
+
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
+        {
+            var rtCount = 0U;
+            var cmd = renderingData.commandBuffer;
+            using (new ProfilingScope(cmd, profilingSampler))
+            {
+                ref var layerBatch = ref m_Renderer2DData.layerBatches[m_Renderer2DData.currLayerBatch];
+
+                var blendStyleMask = layerBatch.lightStats.blendStylesUsed;
+                var blendStyleCount = 0U;
+                while (blendStyleMask > 0)
+                {
+                    blendStyleCount += blendStyleMask & 1;
+                    blendStyleMask >>= 1;
+                }
+
+                rtCount += blendStyleCount;
+
+                if (rtCount > LayerUtility.maxTextureCount)
+                    return;
+
+                var isLitView = true;
+
+#if UNITY_EDITOR
+                if (renderingData.cameraData.isSceneViewCamera)
+                    isLitView = UnityEditor.SceneView.currentDrawingSceneView.sceneLighting;
+
+                if (renderingData.cameraData.camera.cameraType == CameraType.Preview)
+                    isLitView = false;
+#endif
+
+                cmd.SetGlobalFloat(k_HDREmulationScaleID, m_Renderer2DData.hdrEmulationScale);
+                cmd.SetGlobalFloat(k_InverseHDREmulationScaleID, 1.0f / m_Renderer2DData.hdrEmulationScale);
+                cmd.SetGlobalFloat(k_UseSceneLightingID, isLitView ? 1.0f : 0.0f);
+                cmd.SetGlobalColor(k_RendererColorID, Color.white);
+                this.SetShapeLightShaderGlobals(cmd);
+
+                var desc = this.GetBlendStyleRenderTextureDesc(renderingData);
+                this.RenderLights(renderingData, cmd, ref layerBatch, ref desc);
+
+                ++m_Renderer2DData.currLayerBatch;
+            }
+        }
+    }
+}
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs.meta b/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs.meta
new file mode 100644
index 00000000000..48296bc6d84
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/LightingPass.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 69ca647472556a34a865b592b6e7dad6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs
new file mode 100644
index 00000000000..1ebeaba1541
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs
@@ -0,0 +1,56 @@
+namespace UnityEngine.Rendering.Universal
+{
+    internal class NormalPass : ScriptableRenderPass, IRenderPass2D
+    {
+        private static readonly ShaderTagId k_NormalsRenderingPassName = new ShaderTagId("NormalsRendering");
+
+        private readonly Renderer2DData m_Renderer2DData;
+        private bool m_NeedsDepth;
+
+        Renderer2DData IRenderPass2D.rendererData
+        {
+            get { return m_Renderer2DData; }
+        }
+
+        public NormalPass(Renderer2DData rendererData)
+        {
+            profilingSampler = new ProfilingSampler(nameof(NormalPass));
+            m_Renderer2DData = rendererData;
+        }
+
+        public void Setup(bool needsDepth)
+        {
+            m_NeedsDepth = needsDepth;
+        }
+
+        public override void OnCameraCleanup(CommandBuffer cmd)
+        {
+            //this.ReleaseNormalMap(cmd);
+        }
+
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
+        {
+            var cmd = renderingData.commandBuffer;
+            using (new ProfilingScope(cmd, profilingSampler))
+            {
+                ref LayerBatch layerBatch = ref m_Renderer2DData.layerBatches[m_Renderer2DData.currLayerBatch];
+            
+                if (layerBatch.lightStats.totalNormalMapUsage > 0)
+                {
+                    var filterSettings = new FilteringSettings();
+                    filterSettings.renderQueueRange = RenderQueueRange.all;
+                    filterSettings.layerMask = -1;
+                    filterSettings.renderingLayerMask = 0xFFFFFFFF;
+                    filterSettings.sortingLayerRange = layerBatch.layerRange;
+
+                    var camera = renderingData.cameraData.camera;
+                    var normalsDrawSettings = CreateDrawingSettings(k_NormalsRenderingPassName, ref renderingData, SortingCriteria.CommonTransparent);
+                    LayerUtility.SetTransparencySortingMode(camera, m_Renderer2DData, ref normalsDrawSettings);
+
+                    var depthTarget = m_NeedsDepth ? depthAttachmentHandle.nameID : BuiltinRenderTextureType.None;
+                    this.RenderNormals(context, renderingData, normalsDrawSettings, filterSettings, depthTarget, layerBatch.lightStats);
+                }
+            }
+        }
+    }
+}
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs.meta b/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs.meta
new file mode 100644
index 00000000000..3abb06ebfd1
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/NormalPass.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3b169a4b8285b4d459a7c75737490261
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Render2DLightingPass.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Render2DLightingPass.cs
index df0c4e714ba..a11fee633e5 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Render2DLightingPass.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Render2DLightingPass.cs
@@ -50,30 +50,6 @@ internal void Setup(bool useDepth)
             m_NeedsDepth = useDepth;
         }
 
-        private void GetTransparencySortingMode(Camera camera, ref SortingSettings sortingSettings)
-        {
-            var mode = m_Renderer2DData.transparencySortMode;
-
-            if (mode == TransparencySortMode.Default)
-            {
-                mode = camera.orthographic ? TransparencySortMode.Orthographic : TransparencySortMode.Perspective;
-            }
-
-            switch (mode)
-            {
-                case TransparencySortMode.Perspective:
-                    sortingSettings.distanceMetric = DistanceMetric.Perspective;
-                    break;
-                case TransparencySortMode.Orthographic:
-                    sortingSettings.distanceMetric = DistanceMetric.Orthographic;
-                    break;
-                default:
-                    sortingSettings.distanceMetric = DistanceMetric.CustomAxis;
-                    sortingSettings.customAxis = m_Renderer2DData.transparencySortAxis;
-                    break;
-            }
-        }
-
         private void CopyCameraSortingLayerRenderTexture(ScriptableRenderContext context, RenderingData renderingData, RenderBufferStoreAction mainTargetStoreAction)
         {
             var cmd = renderingData.commandBuffer;
@@ -152,24 +128,6 @@ private void DetermineWhenToResolve(int startIndex, int batchesDrawn, int batchC
             }
         }
 
-        private void Render(ScriptableRenderContext context, CommandBuffer cmd, ref RenderingData renderingData, ref FilteringSettings filterSettings, DrawingSettings drawSettings)
-        {
-            var activeDebugHandler = GetActiveDebugHandler(renderingData);
-            if (activeDebugHandler != null)
-            {
-                RenderStateBlock renderStateBlock = new RenderStateBlock();
-                activeDebugHandler.DrawWithDebugRenderState(context, cmd, ref renderingData, ref drawSettings, ref filterSettings, ref renderStateBlock,
-                    (ScriptableRenderContext ctx, ref RenderingData data, ref DrawingSettings ds, ref FilteringSettings fs, ref RenderStateBlock rsb) =>
-                    {
-                        ctx.DrawRenderers(data.cullResults, ref ds, ref fs, ref rsb);
-                    });
-            }
-            else
-            {
-                context.DrawRenderers(renderingData.cullResults, ref drawSettings, ref filterSettings);
-            }
-        }
-
         private int DrawLayerBatches(
             LayerBatch[] layerBatches,
             int batchCount,
@@ -218,7 +176,7 @@ private int DrawLayerBatches(
 
                     using (new ProfilingScope(cmd, m_ProfilingDrawLightTextures))
                     {
-                        this.RenderLights(renderingData, cmd, layerBatch.startLayerID, ref layerBatch, ref desc);
+                        this.RenderLights(renderingData, cmd, ref layerBatch, ref desc);
                     }
                 }
             }
@@ -292,16 +250,16 @@ private int DrawLayerBatches(
                         if (cameraSortingLayerBoundsIndex >= layerBatch.layerRange.lowerBound && cameraSortingLayerBoundsIndex < layerBatch.layerRange.upperBound && m_Renderer2DData.useCameraSortingLayerTexture)
                         {
                             filterSettings.sortingLayerRange = new SortingLayerRange(layerBatch.layerRange.lowerBound, cameraSortingLayerBoundsIndex);
-                            Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
+                            this.Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
                             CopyCameraSortingLayerRenderTexture(context, renderingData, copyStoreAction);
 
                             filterSettings.sortingLayerRange = new SortingLayerRange((short)(cameraSortingLayerBoundsIndex + 1), layerBatch.layerRange.upperBound);
-                            Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
+                            this.Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
                         }
                         else
                         {
                             filterSettings.sortingLayerRange = new SortingLayerRange(layerBatch.layerRange.lowerBound, layerBatch.layerRange.upperBound);
-                            Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
+                            this.Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
 
                             if (cameraSortingLayerBoundsIndex == layerBatch.layerRange.upperBound && m_Renderer2DData.useCameraSortingLayerTexture)
                                 CopyCameraSortingLayerRenderTexture(context, renderingData, copyStoreAction);
@@ -318,7 +276,7 @@ private int DrawLayerBatches(
                                 storeAction = resolveDuringBatch == i && !resolveIsAfterCopy ? RenderBufferStoreAction.Resolve : RenderBufferStoreAction.StoreAndResolve;
                             else
                                 storeAction = RenderBufferStoreAction.Store;
-                            this.RenderLightVolumes(renderingData, cmd, layerBatch.startLayerID, layerBatch.endLayerValue, colorAttachmentHandle.nameID, depthAttachmentHandle.nameID,
+                            this.RenderLightVolumes(renderingData, cmd, ref layerBatch, colorAttachmentHandle.nameID, depthAttachmentHandle.nameID,
                                 RenderBufferStoreAction.Store, storeAction, false, m_Renderer2DData.lightCullResult.visibleLights);
 
                             cmd.EndSample(sampleName);
@@ -363,10 +321,8 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                 var combinedDrawSettings = CreateDrawingSettings(k_ShaderTags, ref renderingData, SortingCriteria.CommonTransparent);
                 var normalsDrawSettings = CreateDrawingSettings(k_NormalsRenderingPassName, ref renderingData, SortingCriteria.CommonTransparent);
 
-                var sortSettings = combinedDrawSettings.sortingSettings;
-                GetTransparencySortingMode(camera, ref sortSettings);
-                combinedDrawSettings.sortingSettings = sortSettings;
-                normalsDrawSettings.sortingSettings = sortSettings;
+                LayerUtility.SetTransparencySortingMode(camera, m_Renderer2DData, ref combinedDrawSettings);
+                normalsDrawSettings.sortingSettings = combinedDrawSettings.sortingSettings;
 
                 var cmd = renderingData.commandBuffer;
                 cmd.SetGlobalFloat(k_HDREmulationScaleID, m_Renderer2DData.hdrEmulationScale);
@@ -394,9 +350,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                 var msaaEnabled = renderingData.cameraData.cameraTargetDescriptor.msaaSamples > 1;
                 var storeAction = msaaEnabled ? RenderBufferStoreAction.Resolve : RenderBufferStoreAction.Store;
 
-                var sortSettings = unlitDrawSettings.sortingSettings;
-                GetTransparencySortingMode(camera, ref sortSettings);
-                unlitDrawSettings.sortingSettings = sortSettings;
+                LayerUtility.SetTransparencySortingMode(camera, m_Renderer2DData, ref unlitDrawSettings);
 
                 var cmd = renderingData.commandBuffer;
                 using (new ProfilingScope(cmd, m_ProfilingSamplerUnlit))
@@ -426,16 +380,16 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                 if (m_Renderer2DData.useCameraSortingLayerTexture)
                 {
                     filterSettings.sortingLayerRange = new SortingLayerRange(short.MinValue, m_CameraSortingLayerBoundsIndex);
-                    Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
+                    this.Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
 
                     CopyCameraSortingLayerRenderTexture(context, renderingData, storeAction);
 
                     filterSettings.sortingLayerRange = new SortingLayerRange(m_CameraSortingLayerBoundsIndex, short.MaxValue);
-                    Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
+                    this.Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
                 }
                 else
                 {
-                    Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
+                    this.Render(context, cmd, ref renderingData, ref filterSettings, unlitDrawSettings);
                 }
                 Profiler.EndSample();
             }
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs
new file mode 100644
index 00000000000..751fd977b77
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs
@@ -0,0 +1,116 @@
+using System.Collections.Generic;
+
+namespace UnityEngine.Rendering.Universal
+{
+    internal class TransparencyPass : ScriptableRenderPass, IRenderPass2D
+    {
+        private static readonly ShaderTagId k_CombinedRenderingPassName = new ShaderTagId("Universal2D");
+        private static readonly ShaderTagId k_LegacyPassName = new ShaderTagId("SRPDefaultUnlit");
+        private static readonly List<ShaderTagId> k_ShaderTags = new List<ShaderTagId>() { k_LegacyPassName, k_CombinedRenderingPassName };
+
+        private static readonly int[] k_ShapeLightTextureIDs =
+        {
+            Shader.PropertyToID("_ShapeLightTexture0"),
+            Shader.PropertyToID("_ShapeLightTexture1"),
+            Shader.PropertyToID("_ShapeLightTexture2"),
+            Shader.PropertyToID("_ShapeLightTexture3")
+        };
+
+        private readonly Renderer2DData m_Renderer2DData;
+        Renderer2DData IRenderPass2D.rendererData
+        {
+            get { return m_Renderer2DData;}
+        }
+
+        int m_BatchCount;
+
+        public TransparencyPass(Renderer2DData rendererData)
+        {
+            profilingSampler = new ProfilingSampler(nameof(TransparencyPass));
+            m_Renderer2DData = rendererData;
+        }
+
+        public void Setup(int batchCount)
+        {
+            m_BatchCount = batchCount;
+        }
+
+        public override void OnCameraCleanup(CommandBuffer cmd)
+        {
+            for (int i = 0; i < m_BatchCount; ++i)
+            {
+                ref var layerBatch = ref m_Renderer2DData.layerBatches[i];
+                layerBatch.ReleaseRT(cmd);
+            }
+
+            this.DisableAllKeywords(cmd);
+        }
+
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
+        {
+            var cmd = renderingData.commandBuffer;
+            using (new ProfilingScope(cmd, profilingSampler))
+            {
+                var isSceneLit = m_Renderer2DData.lightCullResult.IsSceneLit();
+
+                for (int i = 0; i < m_BatchCount; ++i)
+                {
+                    ref var layerBatch = ref m_Renderer2DData.layerBatches[i];
+
+                    var blendStylesCount = m_Renderer2DData.lightBlendStyles.Length;
+                    var desc = this.GetBlendStyleRenderTextureDesc(renderingData);
+
+                    if (layerBatch.lightStats.totalLights > 0)
+                    {
+                        for (var blendStyleIndex = 0; blendStyleIndex < blendStylesCount; blendStyleIndex++)
+                        {
+                            var blendStyleMask = (uint)(1 << blendStyleIndex);
+                            var blendStyleUsed = (layerBatch.lightStats.blendStylesUsed & blendStyleMask) > 0;
+
+                            if (blendStyleUsed)
+                            {
+                                var identifier = layerBatch.GetRTId(cmd, desc, blendStyleIndex);
+                                cmd.SetGlobalTexture(k_ShapeLightTextureIDs[blendStyleIndex], identifier);
+                            }
+
+                            RendererLighting.EnableBlendStyle(cmd, blendStyleIndex, blendStyleUsed);
+                        }
+                    }
+                    else
+                    {
+                        for (var blendStyleIndex = 0; blendStyleIndex < k_ShapeLightTextureIDs.Length; blendStyleIndex++)
+                        {
+                            cmd.SetGlobalTexture(k_ShapeLightTextureIDs[blendStyleIndex], Texture2D.blackTexture);
+                            RendererLighting.EnableBlendStyle(cmd, blendStyleIndex, blendStyleIndex == 0);
+                        }
+                    }
+
+                    if (!isSceneLit)
+                        this.DisableAllKeywords(cmd);
+
+                    context.ExecuteCommandBuffer(cmd);
+                    cmd.Clear();
+
+                    var filterSettings = new FilteringSettings();
+                    filterSettings.renderQueueRange = RenderQueueRange.all;
+                    filterSettings.layerMask = -1;
+                    filterSettings.renderingLayerMask = 0xFFFFFFFF;
+                    filterSettings.sortingLayerRange = isSceneLit ? new SortingLayerRange(layerBatch.layerRange.lowerBound, layerBatch.layerRange.upperBound) : SortingLayerRange.all;
+
+                    var camera = renderingData.cameraData.camera;
+                    var drawSettings = CreateDrawingSettings(k_ShaderTags, ref renderingData, SortingCriteria.CommonTransparent);
+                    LayerUtility.SetTransparencySortingMode(camera, m_Renderer2DData, ref drawSettings);
+
+                    this.Render(context, cmd, ref renderingData, ref filterSettings, drawSettings);
+
+                    RenderBufferStoreAction storeAction = RenderBufferStoreAction.Store;
+                    this.RenderLightVolumes(renderingData, cmd, ref layerBatch, colorAttachmentHandle.nameID, depthAttachmentHandle.nameID,
+                              RenderBufferStoreAction.Store, storeAction, false, m_Renderer2DData.lightCullResult.visibleLights);
+
+                    if (!isSceneLit)
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs.meta b/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs.meta
new file mode 100644
index 00000000000..5707bc5441e
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/TransparencyPass.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ad49863672fcfe4a881b38c8d5f73e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
index 9c95a4c7e3c..c889b79de80 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Unity.Mathematics;
 
 namespace UnityEngine.Rendering.Universal
@@ -69,13 +70,30 @@ private static bool CanBatchLightsInLayer(int layerIndex1, int layerIndex2, Sort
         {
             var layerId1 = sortingLayers[layerIndex1].id;
             var layerId2 = sortingLayers[layerIndex2].id;
+
             foreach (var light in lightCullResult.visibleLights)
             {
                 // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch.
-                bool lightCastsShadows = (light.lightType != Light2D.LightType.Global && light.shadowsEnabled);
-                if ((light.IsLitLayer(layerId1) != light.IsLitLayer(layerId2)) || (light.IsLitLayer(layerId1) && lightCastsShadows))
+                //bool lightCastsShadows = (light.lightType != Light2D.LightType.Global && light.shadowsEnabled);
+                if (light.IsLitLayer(layerId1) != light.IsLitLayer(layerId2))
                     return false;
             }
+
+            if (ShadowCasterGroup2DManager.shadowCasterGroups != null)
+            {
+                foreach (var group in ShadowCasterGroup2DManager.shadowCasterGroups)
+                {
+                    if (group != null)
+                    {
+                        foreach (var shadowCaster in group.GetShadowCasters())
+                        {
+                            if (shadowCaster.IsShadowedLayer(layerId1) != shadowCaster.IsShadowedLayer(layerId2))
+                                return false;
+                        }
+                    }
+                }
+            }
+
             return true;
         }
 
@@ -155,5 +173,32 @@ public static LayerBatch[] CalculateBatches(ILight2DCullResult lightCullResult,
 
             return s_LayerBatches;
         }
+
+        public static void SetTransparencySortingMode(Camera camera, Renderer2DData data, ref DrawingSettings drawingSettings)
+        {
+            var sortingSettings = drawingSettings.sortingSettings;
+            var mode = data.transparencySortMode;
+
+            if (mode == TransparencySortMode.Default)
+            {
+                mode = camera.orthographic ? TransparencySortMode.Orthographic : TransparencySortMode.Perspective;
+            }
+
+            switch (mode)
+            {
+                case TransparencySortMode.Perspective:
+                    sortingSettings.distanceMetric = DistanceMetric.Perspective;
+                    break;
+                case TransparencySortMode.Orthographic:
+                    sortingSettings.distanceMetric = DistanceMetric.Orthographic;
+                    break;
+                default:
+                    sortingSettings.distanceMetric = DistanceMetric.CustomAxis;
+                    sortingSettings.customAxis = data.transparencySortAxis;
+                    break;
+            }
+
+            drawingSettings.sortingSettings = sortingSettings;
+        }
     }
 }
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs
index 204f14751c6..e783142e359 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs
@@ -191,7 +191,7 @@ private static bool CanCastVolumetricShadows(Light2D light, int endLayerValue)
         }
 
 
-        private static void RenderLightSet(IRenderPass2D pass, RenderingData renderingData, int blendStyleIndex, CommandBuffer cmd, int layerToRender, RenderTargetIdentifier renderTexture, List<Light2D> lights)
+        private static void RenderLightSet(IRenderPass2D pass, RenderingData renderingData, int blendStyleIndex, CommandBuffer cmd, ref LayerBatch layerBatch, RenderTargetIdentifier renderTexture)
         {
             var maxShadowLightCount = ShadowRendering.maxTextureCount * 4;
             var requiresRTInit = true;
@@ -203,7 +203,8 @@ private static void RenderLightSet(IRenderPass2D pass, RenderingData renderingDa
                 return;
             }
 
-
+            int layerToRender = layerBatch.startLayerID;
+            var lights = pass.rendererData.lightCullResult.visibleLights;
             NativeArray<bool> doesLightAtIndexHaveShadows = new NativeArray<bool>(lights.Count, Allocator.Temp);
 
             // Break up light rendering into batches for the purpose of shadow casting
@@ -222,7 +223,7 @@ private static void RenderLightSet(IRenderPass2D pass, RenderingData renderingDa
                     if (CanCastShadows(light, layerToRender))
                     {
                         doesLightAtIndexHaveShadows[curLightIndex] = false;
-                        if (ShadowRendering.PrerenderShadows(pass, renderingData, cmd, layerToRender, light, shadowLightCount, light.shadowIntensity))
+                        if (ShadowRendering.PrerenderShadows(pass, renderingData, cmd, ref layerBatch, light, shadowLightCount, light.shadowIntensity))
                         {
                             doesLightAtIndexHaveShadows[curLightIndex] = true;
                             shadowLightCount++;
@@ -296,7 +297,7 @@ private static void RenderLightSet(IRenderPass2D pass, RenderingData renderingDa
             doesLightAtIndexHaveShadows.Dispose();
         }
 
-        public static void RenderLightVolumes(this IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmd, int layerToRender, int endLayerValue,
+        public static void RenderLightVolumes(this IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmd, ref LayerBatch layerBatch,
             RenderTargetIdentifier renderTexture, RenderTargetIdentifier depthTexture, RenderBufferStoreAction intermediateStoreAction,
             RenderBufferStoreAction finalStoreAction, bool requiresRTInit, List<Light2D> lights)
         {
@@ -339,10 +340,10 @@ public static void RenderLightVolumes(this IRenderPass2D pass, RenderingData ren
                     int curLightIndex = lightIndex + batchedLights;
                     var light = lights[curLightIndex];
 
-                    if (CanCastVolumetricShadows(light, endLayerValue))
+                    if (CanCastVolumetricShadows(light, layerBatch.endLayerValue))
                     {
                         doesLightAtIndexHaveShadows[curLightIndex] = false;
-                        if (ShadowRendering.PrerenderShadows(pass, renderingData, cmd, layerToRender, light, shadowLightCount, light.shadowVolumeIntensity))
+                        if (ShadowRendering.PrerenderShadows(pass, renderingData, cmd, ref layerBatch, light, shadowLightCount, light.shadowVolumeIntensity))
                         {
                             doesLightAtIndexHaveShadows[curLightIndex] = true;
                             shadowLightCount++;
@@ -372,7 +373,7 @@ public static void RenderLightVolumes(this IRenderPass2D pass, RenderingData ren
                         continue;
 
                     var topMostLayerValue = light.GetTopMostLitLayer();
-                    if (endLayerValue == topMostLayerValue) // this implies the layer is correct
+                    if (layerBatch.endLayerValue == topMostLayerValue) // this implies the layer is correct
                     {
                         var lightVolumeMaterial = pass.rendererData.GetLightMaterial(light, true);
                         var lightMesh = light.lightMesh;
@@ -508,6 +509,24 @@ public static void ClearDirtyLighting(this IRenderPass2D pass, CommandBuffer cmd
             }
         }
 
+        public static void Render(this ScriptableRenderPass pass, ScriptableRenderContext context, CommandBuffer cmd, ref RenderingData renderingData, ref FilteringSettings filterSettings, DrawingSettings drawSettings)
+        {
+            var activeDebugHandler = pass.GetActiveDebugHandler(renderingData);
+            if (activeDebugHandler != null)
+            {
+                RenderStateBlock renderStateBlock = new RenderStateBlock();
+                activeDebugHandler.DrawWithDebugRenderState(context, cmd, ref renderingData, ref drawSettings, ref filterSettings, ref renderStateBlock,
+                    (ScriptableRenderContext ctx, ref RenderingData data, ref DrawingSettings ds, ref FilteringSettings fs, ref RenderStateBlock rsb) =>
+                    {
+                        ctx.DrawRenderers(data.cullResults, ref ds, ref fs, ref rsb);
+                    });
+            }
+            else
+            {
+                context.DrawRenderers(renderingData.cullResults, ref drawSettings, ref filterSettings);
+            }
+        }
+
         public static void RenderNormals(this IRenderPass2D pass, ScriptableRenderContext context, RenderingData renderingData, DrawingSettings drawSettings, FilteringSettings filterSettings, RenderTargetIdentifier depthTarget, LightStats lightStats)
         {
             var cmd = renderingData.commandBuffer;
@@ -523,7 +542,6 @@ public static void RenderNormals(this IRenderPass2D pass, ScriptableRenderContex
 
                 pass.CreateNormalMapRenderTexture(renderingData, cmd, normalRTScale);
 
-
                 var msaaEnabled = renderingData.cameraData.cameraTargetDescriptor.msaaSamples > 1;
                 var storeAction = msaaEnabled ? RenderBufferStoreAction.Resolve : RenderBufferStoreAction.Store;
                 var clearFlag = pass.rendererData.useDepthStencilBuffer ? ClearFlag.All : ClearFlag.Color;
@@ -540,12 +558,11 @@ public static void RenderNormals(this IRenderPass2D pass, ScriptableRenderContex
                 context.ExecuteCommandBuffer(cmd);
                 cmd.Clear();
 
-                drawSettings.SetShaderPassName(0, k_NormalsRenderingPassName);
                 context.DrawRenderers(renderingData.cullResults, ref drawSettings, ref filterSettings);
             }
         }
 
-        public static void RenderLights(this IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmd, int layerToRender, ref LayerBatch layerBatch, ref RenderTextureDescriptor rtDesc)
+        public static void RenderLights(this IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmd, ref LayerBatch layerBatch, ref RenderTextureDescriptor rtDesc)
         {
             // Before rendering the lights cache some values that are expensive to get/calculate
             var culledLights = pass.rendererData.lightCullResult.visibleLights;
@@ -556,7 +573,6 @@ public static void RenderLights(this IRenderPass2D pass, RenderingData rendering
 
             ShadowCasterGroup2DManager.CacheValues();
 
-
             var blendStyles = pass.rendererData.lightBlendStyles;
 
             for (var i = 0; i < blendStyles.Length; ++i)
@@ -567,7 +583,7 @@ public static void RenderLights(this IRenderPass2D pass, RenderingData rendering
                 var sampleName = blendStyles[i].name;
                 cmd.BeginSample(sampleName);
 
-                if (!Light2DManager.GetGlobalColor(layerToRender, i, out var clearColor))
+                if (!Light2DManager.GetGlobalColor(layerBatch.startLayerID, i, out var clearColor))
                     clearColor = Color.black;
 
                 var anyLights = (layerBatch.lightStats.blendStylesWithLights & (uint)(1 << i)) != 0;
@@ -590,9 +606,8 @@ public static void RenderLights(this IRenderPass2D pass, RenderingData rendering
                         pass, renderingData,
                         i,
                         cmd,
-                        layerToRender,
-                        identifier,
-                        pass.rendererData.lightCullResult.visibleLights
+                        ref layerBatch,
+                        identifier
                     );
                 }
 
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Renderer2D.cs b/com.unity.render-pipelines.universal/Runtime/2D/Renderer2D.cs
index 351aed06384..4e5a7b7121d 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Renderer2D.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Renderer2D.cs
@@ -6,6 +6,10 @@ namespace UnityEngine.Rendering.Universal
 {
     internal class Renderer2D : ScriptableRenderer
     {
+        NormalPass m_NormalPass;
+        LightingPass m_LightingPass;
+        TransparencyPass m_TransparencyPass;
+
         Render2DLightingPass m_Render2DLightingPass;
         PixelPerfectBackgroundPass m_PixelPerfectBackgroundPass;
         UpscalePass m_UpscalePass;
@@ -49,6 +53,10 @@ public Renderer2D(Renderer2DData data) : base(data)
             m_BlitMaterial = CoreUtils.CreateEngineMaterial(data.blitShader);
             m_SamplingMaterial = CoreUtils.CreateEngineMaterial(data.samplingShader);
 
+            m_NormalPass = new NormalPass(data);
+            m_LightingPass = new LightingPass(data);
+            m_TransparencyPass = new TransparencyPass(data);
+
             m_Render2DLightingPass = new Render2DLightingPass(data, m_BlitMaterial, m_SamplingMaterial);
             // we should determine why clearing the camera target is set so late in the events... sounds like it could be earlier
             m_PixelPerfectBackgroundPass = new PixelPerfectBackgroundPass(RenderPassEvent.AfterRenderingTransparents);
@@ -227,9 +235,36 @@ public override void Setup(ScriptableRenderContext context, ref RenderingData re
             }
 
             var needsDepth = m_CreateDepthTexture || m_UseDepthStencilBuffer;
-            m_Render2DLightingPass.Setup(needsDepth);
-            m_Render2DLightingPass.ConfigureTarget(colorTargetHandle, depthTargetHandle);
-            EnqueuePass(m_Render2DLightingPass);
+
+            // New Passes - For each layer in layer batches do NORMAL, LIGHTING, TRANSPARENCY
+            bool newPass = true;
+            //bool newPass = false;
+
+            if (newPass)
+            {
+                LayerUtility.InitializeBudget(m_Renderer2DData.lightRenderTextureMemoryBudget);
+                ShadowRendering.InitializeBudget(m_Renderer2DData.shadowRenderTextureMemoryBudget);
+
+                m_Renderer2DData.currLayerBatch = 0;
+                m_Renderer2DData.layerBatches = LayerUtility.CalculateBatches(m_Renderer2DData.lightCullResult, out var batchCount);
+                for (int i = 0; i < batchCount; ++i)
+                {
+                    m_NormalPass.Setup(needsDepth);
+                    m_NormalPass.ConfigureTarget(colorTargetHandle, depthTargetHandle);
+                    EnqueuePass(m_NormalPass);
+                    EnqueuePass(m_LightingPass);
+                }
+
+                m_TransparencyPass.Setup(batchCount);
+                m_TransparencyPass.ConfigureTarget(colorTargetHandle, depthTargetHandle);
+                EnqueuePass(m_TransparencyPass);
+            }
+            else
+            {
+                m_Render2DLightingPass.Setup(needsDepth);
+                m_Render2DLightingPass.ConfigureTarget(colorTargetHandle, depthTargetHandle);
+                EnqueuePass(m_Render2DLightingPass);
+            }
 
             // When using Upscale Render Texture on a Pixel Perfect Camera, we want all post-processing effects done with a low-res RT,
             // and only upscale the low-res RT to fullscreen when blitting it to camera target. Also, final post processing pass is not run in this case,
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Renderer2DData.cs b/com.unity.render-pipelines.universal/Runtime/2D/Renderer2DData.cs
index 148aca84c43..519534764e6 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Renderer2DData.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Renderer2DData.cs
@@ -191,5 +191,8 @@ protected override void OnEnable()
 
         // this shouldn've been in RenderingData along with other cull results
         internal ILight2DCullResult lightCullResult { get; set; }
+        internal LayerBatch[] layerBatches { get; set; }
+        internal int currLayerBatch { get; set; }
+
     }
 }
diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowRendering.cs b/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowRendering.cs
index 72646b24940..38b5cfac27d 100644
--- a/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowRendering.cs
+++ b/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowRendering.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using UnityEngine.Experimental.Rendering;
 
@@ -130,7 +129,7 @@ public static void CreateShadowRenderTexture(IRenderPass2D pass, RenderingData r
             CreateShadowRenderTexture(pass, m_RenderTargetIds[shadowIndex], renderingData, cmdBuffer);
         }
 
-        public static bool PrerenderShadows(IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmdBuffer, int layerToRender, Light2D light, int shadowIndex, float shadowIntensity)
+        public static bool PrerenderShadows(IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmdBuffer, ref LayerBatch layerBatch, Light2D light, int shadowIndex, float shadowIntensity)
         {
             var colorChannel = shadowIndex % 4;
             var textureIndex = shadowIndex / 4;
@@ -138,7 +137,7 @@ public static bool PrerenderShadows(IRenderPass2D pass, RenderingData renderingD
             if (colorChannel == 0)
                 ShadowRendering.CreateShadowRenderTexture(pass, renderingData, cmdBuffer, textureIndex);
 
-            bool hadShadowsToRender = RenderShadows(pass, renderingData, cmdBuffer, layerToRender, light, shadowIntensity, m_RenderTargets[textureIndex].nameID, colorChannel);
+            bool hadShadowsToRender = RenderShadows(pass, renderingData, cmdBuffer, ref layerBatch, light, shadowIntensity, m_RenderTargets[textureIndex].nameID, colorChannel);
 
             m_LightInputTextures[textureIndex] = m_RenderTargets[textureIndex].nameID;
 
@@ -195,138 +194,89 @@ public static void SetShadowProjectionGlobals(CommandBuffer cmdBuffer, ShadowCas
             cmdBuffer.SetGlobalMatrix(k_ShadowModelInvMatrixID, shadowCaster.m_CachedInverseShadowMatrix);
         }
 
-        public static bool RenderShadows(IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmdBuffer, int layerToRender, Light2D light, float shadowIntensity, RenderTargetIdentifier renderTexture, int colorBit)
+        public static bool RenderShadows(IRenderPass2D pass, RenderingData renderingData, CommandBuffer cmdBuffer, ref LayerBatch layerBatch, Light2D light, float shadowIntensity, RenderTargetIdentifier renderTexture, int colorBit)
         {
             using (new ProfilingScope(cmdBuffer, m_ProfilingSamplerShadows))
             {
-                bool hasShadow = false;
-                var shadowCasterGroups = ShadowCasterGroup2DManager.shadowCasterGroups;
-                if (shadowCasterGroups != null && shadowCasterGroups.Count > 0)
+                int layerToRender = layerBatch.startLayerID;
+                var shadowGroups = ShadowCasterGroup2DManager.shadowCasterGroups;
+                bool hasShadow = layerBatch.lightStats.totalShadowCasters > 0;
+
+                if (hasShadow && shadowGroups != null)
                 {
-                    // Before doing anything check to see if any of the shadow casters are visible to this light
-                    for (var group = 0; group < shadowCasterGroups.Count; group++)
-                    {
-                        var shadowCasterGroup = shadowCasterGroups[group];
-                        var shadowCasters = shadowCasterGroup.GetShadowCasters();
+                    cmdBuffer.SetRenderTarget(renderTexture, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare);
 
-                        if (shadowCasters != null)
+                    using (new ProfilingScope(cmdBuffer, m_ProfilingSamplerShadowColorsLookup[colorBit]))
+                    {
+                        if (colorBit == 0)
+                            cmdBuffer.ClearRenderTarget(true, true, Color.clear);
+                        else
+                            cmdBuffer.ClearRenderTarget(true, false, Color.clear);
+
+                        var shadowRadius = light.boundingSphere.radius;
+
+                        cmdBuffer.SetGlobalVector(k_LightPosID, light.transform.position);
+                        cmdBuffer.SetGlobalFloat(k_ShadowRadiusID, shadowRadius);
+                        cmdBuffer.SetGlobalColor(k_ShadowColorMaskID, k_ColorLookup[colorBit]);
+                        var unshadowGeometryMaterial = pass.rendererData.GetGeometryUnshadowMaterial(colorBit);
+                        var projectedShadowsMaterial = pass.rendererData.GetProjectedShadowMaterial(colorBit);
+                        var selfShadowMaterial = pass.rendererData.GetSpriteSelfShadowMaterial(colorBit);
+                        var unshadowMaterial = pass.rendererData.GetSpriteUnshadowMaterial(colorBit);
+                        var setGlobalStencilMaterial = pass.rendererData.GetStencilOnlyShadowMaterial(colorBit);
+
+                        foreach (var shadowGroup in shadowGroups)
                         {
-                            // Draw the projected shadows for the shadow caster group. Writing into the group stencil buffer bit
-                            for (var i = 0; i < shadowCasters.Count; i++)
+                            var shadowCasters = shadowGroup.GetShadowCasters();
+
+                            foreach (var shadowCaster in shadowCasters)
                             {
-                                var shadowCaster = shadowCasters[i];
-                                if (shadowCaster != null && shadowCaster.IsLit(light) && shadowCaster.IsShadowedLayer(layerToRender))
+                                if (projectedShadowsMaterial != null && shadowCaster.IsLit(light) && shadowCaster.IsShadowedLayer(layerToRender))
                                 {
-                                    hasShadow = true;
-                                    break;
+                                    SetShadowProjectionGlobals(cmdBuffer, shadowCaster);
+
+                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, unshadowGeometryMaterial, 0, 0);
+                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, projectedShadowsMaterial, 0, 0);
+                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, unshadowGeometryMaterial, 0, 1);
                                 }
                             }
-                        }
-                    }
-
-                    if (hasShadow)
-                    {
-                        cmdBuffer.SetRenderTarget(renderTexture, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare);
-
-                        using (new ProfilingScope(cmdBuffer, m_ProfilingSamplerShadowColorsLookup[colorBit]))
-                        {
-                            if (colorBit == 0)
-                                cmdBuffer.ClearRenderTarget(true, true, Color.clear);
-                            else
-                                cmdBuffer.ClearRenderTarget(true, false, Color.clear);
-
-                            var shadowRadius = light.boundingSphere.radius;
-
-                            cmdBuffer.SetGlobalVector(k_LightPosID, light.transform.position);
-                            cmdBuffer.SetGlobalFloat(k_ShadowRadiusID, shadowRadius);
-
 
-                            cmdBuffer.SetGlobalColor(k_ShadowColorMaskID, k_ColorLookup[colorBit]);
-                            var unshadowGeometryMaterial = pass.rendererData.GetGeometryUnshadowMaterial(colorBit);
-                            var projectedShadowsMaterial = pass.rendererData.GetProjectedShadowMaterial(colorBit);
-                            var selfShadowMaterial = pass.rendererData.GetSpriteSelfShadowMaterial(colorBit);
-                            var unshadowMaterial = pass.rendererData.GetSpriteUnshadowMaterial(colorBit);
-                            var setGlobalStencilMaterial = pass.rendererData.GetStencilOnlyShadowMaterial(colorBit);
-
-                            for (var group = 0; group < shadowCasterGroups.Count; group++)
+                            // Draw the sprites, either as self shadowing or unshadowing
+                            foreach (var shadowCaster in shadowCasters)
                             {
-                                var shadowCasterGroup = shadowCasterGroups[group];
-                                var shadowCasters = shadowCasterGroup.GetShadowCasters();
-
-                                if (shadowCasters != null)
+                                if (shadowCaster.IsLit(light) && shadowCaster.IsShadowedLayer(layerToRender))
                                 {
-                                    for (var i = 0; i < shadowCasters.Count; i++)
+                                    if (shadowCaster.useRendererSilhouette)
                                     {
-                                        var shadowCaster = shadowCasters[i];
+                                        // Draw using the sprite renderer
+                                        var renderer = (Renderer)null;
+                                        shadowCaster.TryGetComponent<Renderer>(out renderer);
 
-                                        if (shadowCaster.IsLit(light))
+                                        if (renderer != null)
                                         {
-                                            if (shadowCaster != null && projectedShadowsMaterial != null && shadowCaster.IsShadowedLayer(layerToRender))
-                                            {
-                                                if (shadowCaster.castsShadows)
-                                                {
-                                                    SetShadowProjectionGlobals(cmdBuffer, shadowCaster);
-
-                                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, unshadowGeometryMaterial, 0, 0);
-                                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, projectedShadowsMaterial, 0, 0);
-                                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, unshadowGeometryMaterial, 0, 1);
-                                                }
-                                            }
+                                            var material = shadowCaster.selfShadows ? selfShadowMaterial : unshadowMaterial;
+                                            if (material != null)
+                                                cmdBuffer.DrawRenderer(renderer, material);
                                         }
                                     }
-
-                                    // Draw the sprites, either as self shadowing or unshadowing
-                                    for (var i = 0; i < shadowCasters.Count; i++)
+                                    else
                                     {
-                                        var shadowCaster = shadowCasters[i];
+                                        var meshMat = shadowCaster.m_CachedLocalToWorldMatrix;
+                                        var material = shadowCaster.selfShadows ? selfShadowMaterial : unshadowMaterial;
 
-                                        if (shadowCaster.IsLit(light))
-                                        {
-                                            if (shadowCaster != null && shadowCaster.IsShadowedLayer(layerToRender))
-                                            {
-                                                if (shadowCaster.useRendererSilhouette)
-                                                {
-                                                    // Draw using the sprite renderer
-                                                    var renderer = (Renderer)null;
-                                                    shadowCaster.TryGetComponent<Renderer>(out renderer);
-
-                                                    if (renderer != null)
-                                                    {
-                                                        var material = shadowCaster.selfShadows ? selfShadowMaterial : unshadowMaterial;
-                                                        if (material != null)
-                                                            cmdBuffer.DrawRenderer(renderer, material);
-                                                    }
-                                                }
-                                                else
-                                                {
-                                                    var meshMat = shadowCaster.m_CachedLocalToWorldMatrix;
-                                                    var material = shadowCaster.selfShadows ? selfShadowMaterial : unshadowMaterial;
-
-                                                    // Draw using the shadow mesh
-                                                    if (material != null)
-                                                        cmdBuffer.DrawMesh(shadowCaster.mesh, meshMat, material);
-                                                }
-                                            }
-                                        }
+                                        // Draw using the shadow mesh
+                                        if (material != null)
+                                            cmdBuffer.DrawMesh(shadowCaster.mesh, meshMat, material);
                                     }
+                                }
+                            }
 
-                                    // Draw the projected shadows for the shadow caster group. Writing clearing the group stencil bit, and setting the global bit
-                                    for (var i = 0; i < shadowCasters.Count; i++)
-                                    {
-                                        var shadowCaster = shadowCasters[i];
-
-                                        if (shadowCaster.IsLit(light))
-                                        {
-                                            if (shadowCaster != null && projectedShadowsMaterial != null && shadowCaster.IsShadowedLayer(layerToRender))
-                                            {
-                                                if (shadowCaster.castsShadows)
-                                                {
-                                                    SetShadowProjectionGlobals(cmdBuffer, shadowCaster);
-                                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, projectedShadowsMaterial, 0, 1);
-                                                }
-                                            }
-                                        }
-                                    }
+                            // Draw the projected shadows for the shadow caster group. Writing clearing the group stencil bit, and setting the global bit
+                            foreach (var shadowCaster in shadowCasters)
+                            {
+                                if (projectedShadowsMaterial != null && shadowCaster.IsLit(light) && shadowCaster.IsShadowedLayer(layerToRender))
+                                {
+                                    SetShadowProjectionGlobals(cmdBuffer, shadowCaster);
+                                    cmdBuffer.DrawMesh(shadowCaster.mesh, shadowCaster.m_CachedLocalToWorldMatrix, projectedShadowsMaterial, 0, 1);
                                 }
                             }
                         }