Fix displaying SceneDetails for disabled scenes; fix minor issues while loading empty SceneAssets

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/SerializedSceneDrawer.cs

@@ -103,16 +103,24 @@ public static SceneData GetSceneData(SerializedProperty property)
                 var sceneAsset = property.objectReferenceValue as SceneAsset;
                 var scenePath = AssetDatabase.GetAssetPath(sceneAsset);
                 var sceneGuid = AssetDatabase.AssetPathToGUID(scenePath);
+                var sceneIndex = -1;
                 for (var i = 0; i < EditorBuildSettings.scenes.Length; i++)
                 {
                     var sceneSettings = EditorBuildSettings.scenes[i];
+                    var isEnabled = sceneSettings.enabled;
+                    if (isEnabled)
+                    {
+                        sceneIndex++;
+                    }
+
                     var guid = sceneSettings.guid;
                     if (guid.Equals(new GUID(sceneGuid)))
                     {
-                        sceneData.index = i;
-                        sceneData.enabled = sceneSettings.enabled;
+                        sceneData.index = isEnabled ? sceneIndex : -1;
+                        sceneData.enabled = isEnabled;
                         sceneData.guid = guid;
                         sceneData.inBuild = true;
+                        break;
                     }
                 }
 

Assets/Editor Toolbox/Runtime/Serialization/SceneSerializationUtility.cs

@@ -2,14 +2,13 @@
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
-using UnityEngine;
 
 namespace Toolbox.Serialization
 {
     internal static class SceneSerializationUtility
     {
 #if UNITY_EDITOR
-        private readonly static Dictionary<SceneAsset, SceneData> cachedScenes = new Dictionary<SceneAsset, SceneData>();
+        private static readonly Dictionary<SceneAsset, SceneData> cachedScenes = new Dictionary<SceneAsset, SceneData>();
         private static bool isInitialized;
 
 
@@ -21,18 +20,25 @@ private static void Initialize()
                 return;
             }
 
-            UnityEngine.Debug.Log("INIT");
-            UpdateAllIndexes();
-
-            EditorBuildSettings.sceneListChanged -= UpdateAllIndexes;
-            EditorBuildSettings.sceneListChanged += UpdateAllIndexes;
+            ConfirmCache();
+            EditorBuildSettings.sceneListChanged -= RefreshCache;
+            EditorBuildSettings.sceneListChanged += RefreshCache;
             isInitialized = true;
         }
 
-        private static void UpdateAllIndexes()
+        private static void ConfirmCache()
+        {
+            //NOTE: refresh data only if the cache is empty,
+            //it probably means that it's our first time when we are updating it
+            if (cachedScenes.Count == 0)
+            {
+                RefreshCache();
+            }
+        }
+
+        private static void RefreshCache()
         {
             cachedScenes.Clear();
-            UnityEngine.Debug.Log("UPDATE INDEXES");
             var buildIndex = -1;
             foreach (var scene in EditorBuildSettings.scenes)
             {
@@ -42,7 +48,7 @@ private static void UpdateAllIndexes()
                 }
 
                 buildIndex++;
-                var sceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(scene.path);
+                var sceneAsset = EditorGUIUtility.Load(scene.path) as SceneAsset;
                 if (sceneAsset != null)
                 {
                     cachedScenes.Add(sceneAsset, new SceneData()
@@ -58,6 +64,7 @@ private static void UpdateAllIndexes()
 
         public static bool TryGetSceneData(SceneAsset sceneAsset, out SceneData data)
         {
+            ConfirmCache();
             if (!sceneAsset || !cachedScenes.TryGetValue(sceneAsset, out data))
             {
                 data = null;

Assets/Editor Toolbox/Runtime/Serialization/SerializedScene.cs

@@ -1,5 +1,7 @@
 using System;
+
 using Toolbox.Serialization;
+
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -26,30 +28,24 @@ public class SerializedScene : ISerializationCallbackReceiver
 
         void ISerializationCallbackReceiver.OnBeforeSerialize()
         {
-            UnityEngine.Debug.Log("BEFORE");
             UpdateProperties();
         }
 
         void ISerializationCallbackReceiver.OnAfterDeserialize()
-        {
-            UnityEngine.Debug.Log("AFTER");
-            UpdateProperties();
-        }
+        { }
 
 
         private void UpdateProperties()
         {
-#if UNITY_EDITOR
+#if UNITY_EDITOR       
             if (SceneSerializationUtility.TryGetSceneData(sceneReference, out var sceneData))
             {
-                UnityEngine.Debug.Log("UPDATE");
                 SceneName = sceneData.SceneName;
                 ScenePath = sceneData.ScenePath;
                 BuildIndex = sceneData.BuildIndex;
             }
             else
             {
-                UnityEngine.Debug.Log("RESET");
                 SceneName = string.Empty;
                 ScenePath = string.Empty;
                 BuildIndex = -1;