Merge pull request #43 from mdwigley/master

#42 Added isolated baking

Author: mdwigley

Editor/PrefabLightmapTool.cs

@@ -49,7 +49,16 @@ protected class PrefabLightmapDataItem
     /// <summary>
     /// Internal value for determining if the bake was started as a result of this tool
     /// </summary>
-    protected bool StartedBaking;
+    protected bool BakingStarted;
+
+    /// <summary>
+    /// Index into the baking queue that is currently being processed
+    /// </summary>
+    protected int BakingIndex;
+    /// <summary>
+    /// The queue of objects to be baked in the current run
+    /// </summary>
+    protected List<PrefabLightmapData> BakingItems;
 
     /// <summary>
     /// Export path text field
@@ -88,6 +97,8 @@ protected class PrefabLightmapDataItem
     /// </summary>
     protected Button ButtonBake;
 
+    protected Button ButtonCancel;
+
     /// <summary>
     /// Static function for registering with the Editor interface
     /// </summary>
@@ -141,6 +152,7 @@ public void CreateGUI()
         this.ToggleAll = this.rootVisualElement.Q<Toggle>(name = "ToggleAll");
         this.ButtonClear = this.rootVisualElement.Q<Button>(name = "ButtonClear");
         this.ButtonBake = this.rootVisualElement.Q<Button>(name = "ButtonBake");
+        this.ButtonCancel = this.rootVisualElement.Q<Button>(name = "ButtonCancel");
 
         this.TextFieldPath.SetEnabled(false);
         this.TextFieldName.SetEnabled(false);
@@ -156,6 +168,7 @@ public void CreateGUI()
         this.ToggleAll.RegisterValueChangedCallback(this.ToggleAllChangedEventHandler);
         this.ButtonClear.clicked += this.ButtonClearClicked;
         this.ButtonBake.clicked += this.ButtonBakeClicked;
+        this.ButtonCancel.clicked += this.ButtonCancelClicked;
 
         this.TextFieldPath.value = this.LastTextPath;
         this.ToggleDefault.value = this.LastDefault;
@@ -230,10 +243,41 @@ protected void ButtonBakeClicked()
             return;
         }
 
-        this.StartedBaking = true;
+        this.BakingStarted = true;
+        this.BakingItems = new List<PrefabLightmapData>();
+
+        foreach (PrefabLightmapDataItem item in this.ListViewBehaviours.itemsSource)
+            if (item.Selected == true)
+                this.BakingItems.Add(item.PrefabLightmap);
 
         Lightmapping.bakeCompleted += this.UpdatePrefabs;
-        Lightmapping.BakeAsync();
+
+        this.ListViewBehaviours.SetEnabled(false);
+        this.ButtonBake.style.display = DisplayStyle.None;
+        this.ButtonCancel.style.display = DisplayStyle.Flex;
+
+        this.BakingIndex = -1;
+        this.ProcessNextPrefab();
+    }
+    /// <summary>
+    /// Cacnel the previously started bake of the selected items
+    /// </summary>
+    protected void ButtonCancelClicked()
+    {
+        Lightmapping.bakeCompleted -= this.UpdatePrefabs;
+        Lightmapping.Cancel();
+        Lightmapping.ClearLightingDataAsset();
+
+        this.BakingStarted = false;
+        this.BakingIndex = -1;
+        this.BakingItems.Clear();
+
+        this.ButtonCancel.style.display = DisplayStyle.None;
+        this.ButtonBake.style.display = DisplayStyle.Flex;
+        this.ListViewBehaviours.SetEnabled(true);
+
+        foreach (PrefabLightmapDataItem item in this.ListViewBehaviours.itemsSource)
+            item.PrefabLightmap.gameObject.SetActive(true);
     }
 
     /// <summary>
@@ -319,7 +363,7 @@ protected void ToggleAllChangedEventHandler(ChangeEvent<bool> changeEvent)
     /// </summary>
     protected void UpdateListView()
     {
-        if (this.ListViewBehaviours == null)
+        if (this.ListViewBehaviours == null || this.ListViewBehaviours.enabledSelf == false)
             return;
 
         List<PrefabLightmapDataItem> items = this.FindPrefabLightmapItems();
@@ -380,27 +424,42 @@ protected void UpdateListView()
 
         this.ListViewBehaviours.Rebuild();
     }
+
     /// <summary>
-    /// UPdate the prefab with the lighting data and save the prefab to the file system
+    /// Check for and process the next PrefabLightmapData item
     /// </summary>
-    protected void UpdatePrefabs()
+    protected void ProcessNextPrefab()
     {
-        if (this.StartedBaking == false)
-            return;
+        this.BakingIndex++;
 
-        int counter = 0;
-
-        foreach (PrefabLightmapDataItem item in this.ListViewBehaviours.itemsSource)
+        if (this.BakingItems.Count > this.BakingIndex)
         {
-            counter++;
+            foreach (PrefabLightmapDataItem item in this.ListViewBehaviours.itemsSource)
+                item.PrefabLightmap.gameObject.SetActive(false);
 
-            string itemName = item.PrefabLightmap.gameObject.name + "-" + counter;
+            this.BakingItems[this.BakingIndex].gameObject.SetActive(true);
 
-            if (item.Selected == false) continue;
+            Lightmapping.ClearLightingDataAsset();
+            Lightmapping.BakeAsync();
+        }
+        else this.ButtonCancelClicked();
+    }
+    /// <summary>
+    /// Update the prefab with the lighting data and save the prefab to the file system
+    /// </summary>
+    protected void UpdatePrefabs()
+    {
+        if (this.BakingStarted == false)
+            return;
 
-            PrefabLightmapInfo data = PrefabLightmapTool.GatherLightmapData(item.PrefabLightmap.gameObject, this.TextFieldPath.value, itemName, this.TextFieldName.value);
+        if (this.BakingIndex < 0 || this.BakingIndex >= this.BakingItems.Count)
+            return;
 
-            PrefabLightmapData prefabLightmap = item.PrefabLightmap as PrefabLightmapData;
+        PrefabLightmapData prefabLightmap = this.BakingItems[this.BakingIndex];
+
+        if (prefabLightmap.gameObject.activeInHierarchy == true)
+        {
+            PrefabLightmapInfo data = PrefabLightmapTool.GatherLightmapData(prefabLightmap.gameObject, this.TextFieldPath.value, prefabLightmap.gameObject.name, this.TextFieldName.value);
 
             if (prefabLightmap != null)
             {
@@ -430,23 +489,23 @@ protected void UpdatePrefabs()
                     Data = data
                 };
 
-                GameObject targetPrefab = PrefabUtility.GetCorrespondingObjectFromOriginalSource(item.PrefabLightmap.gameObject) as GameObject;
+                GameObject targetPrefab = PrefabUtility.GetCorrespondingObjectFromOriginalSource(prefabLightmap.gameObject) as GameObject;
 
                 if (targetPrefab != null)
                 {
-                    GameObject root = PrefabUtility.GetOutermostPrefabInstanceRoot(item.PrefabLightmap.gameObject);
+                    GameObject root = PrefabUtility.GetOutermostPrefabInstanceRoot(prefabLightmap.gameObject);
 
                     if (root != null)
                     {
-                        GameObject rootPrefab = PrefabUtility.GetCorrespondingObjectFromSource(item.PrefabLightmap.gameObject);
+                        GameObject rootPrefab = PrefabUtility.GetCorrespondingObjectFromSource(prefabLightmap.gameObject);
 
                         string rootPath = AssetDatabase.GetAssetPath(rootPrefab);
 
                         PrefabUtility.UnpackPrefabInstanceAndReturnNewOutermostRoots(root, PrefabUnpackMode.OutermostRoot);
 
                         try
                         {
-                            PrefabUtility.ApplyPrefabInstance(item.PrefabLightmap.gameObject, InteractionMode.AutomatedAction);
+                            PrefabUtility.ApplyPrefabInstance(prefabLightmap.gameObject, InteractionMode.AutomatedAction);
                         }
                         catch
                         {
@@ -458,13 +517,13 @@ protected void UpdatePrefabs()
                     }
                     else
                     {
-                        PrefabUtility.ApplyPrefabInstance(item.PrefabLightmap.gameObject, InteractionMode.AutomatedAction);
+                        PrefabUtility.ApplyPrefabInstance(prefabLightmap.gameObject, InteractionMode.AutomatedAction);
                     }
                 }
             }
         }
 
-        this.StartedBaking = false;
+        this.ProcessNextPrefab();
     }
 
     /// <summary>

Editor/UXML/PrefabLightmapTool.uxml

@@ -16,5 +16,6 @@
         <ui:VisualElement style="flex-direction: row; flex-shrink: 0; flex-grow: 1;" />
         <ui:Button text="Clear" display-tooltip-when-elided="true" name="ButtonClear" enable-rich-text="false" focusable="false" tooltip="Clear the selected PrefabLightmaps" />
         <ui:Button text="Bake" display-tooltip-when-elided="true" name="ButtonBake" enable-rich-text="false" focusable="false" tooltip="Bake the selected PrefabLightmaps" />
+        <ui:Button text="Cancel" display-tooltip-when-elided="true" name="ButtonCancel" tooltip="Cancel the current bake" focusable="false" enable-rich-text="false" style="display: none;" />
     </ui:VisualElement>
 </ui:UXML>