feat: additive scene loading and networkscenemanager refactoring

com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

@@ -37,7 +37,7 @@ public class NetworkManagerEditor : UnityEditor.Editor
         private SerializedProperty m_LoadSceneTimeOutProperty;
 
         private ReorderableList m_NetworkPrefabsList;
-        private ReorderableList m_RegisteredScenesList;
+        private ReorderableList m_RegisteredSceneAssetsList;
 
         private NetworkManager m_NetworkManager;
         private bool m_Initialized;
@@ -145,7 +145,7 @@ private void OnEnable()
                 var networkOverrideProp = networkPrefab.FindPropertyRelative(nameof(NetworkPrefab.Override));
                 var networkOverrideInt = networkOverrideProp.enumValueIndex;
 
-                return 10 + (networkOverrideInt == 0 ? EditorGUIUtility.singleLineHeight : (EditorGUIUtility.singleLineHeight * 2) + 5);
+                return 8 + (networkOverrideInt == 0 ? EditorGUIUtility.singleLineHeight : (EditorGUIUtility.singleLineHeight * 2) + 5);
             };
             m_NetworkPrefabsList.drawElementCallback = (rect, index, isActive, isFocused) =>
             {
@@ -201,17 +201,29 @@ private void OnEnable()
             };
             m_NetworkPrefabsList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "NetworkPrefabs");
 
-            m_RegisteredScenesList = new ReorderableList(serializedObject, serializedObject.FindProperty(nameof(NetworkManager.NetworkConfig)).FindPropertyRelative(nameof(NetworkConfig.RegisteredScenes)), true, true, true, true);
-            m_RegisteredScenesList.drawElementCallback = (rect, index, isActive, isFocused) =>
+            m_RegisteredSceneAssetsList = new ReorderableList(serializedObject, serializedObject.FindProperty(nameof(NetworkManager.NetworkConfig)).FindPropertyRelative(nameof(NetworkConfig.RegisteredSceneAssets)), true, true, true, true);
+            m_RegisteredSceneAssetsList.elementHeightCallback = index =>
             {
-                var element = m_RegisteredScenesList.serializedProperty.GetArrayElementAtIndex(index);
-                int firstLabelWidth = 50;
-                int padding = 20;
+                return EditorGUIUtility.singleLineHeight + 8;
+            };
+            m_RegisteredSceneAssetsList.drawElementCallback = (rect, index, isActive, isFocused) =>
+            {
+                rect.y += 5;
 
-                EditorGUI.LabelField(new Rect(rect.x, rect.y, firstLabelWidth, EditorGUIUtility.singleLineHeight), "Name");
-                EditorGUI.PropertyField(new Rect(rect.x + firstLabelWidth, rect.y, rect.width - firstLabelWidth - padding, EditorGUIUtility.singleLineHeight), element, GUIContent.none);
+                var sceneAsset = m_RegisteredSceneAssetsList.serializedProperty.GetArrayElementAtIndex(index);
+                int firstLabelWidth = 24;
+                int padding = 2;
+
+                EditorGUI.LabelField(new Rect(rect.x, rect.y, firstLabelWidth, EditorGUIUtility.singleLineHeight), index.ToString());
+                EditorGUI.PropertyField(new Rect(rect.x + firstLabelWidth, rect.y, rect.width - firstLabelWidth - padding, EditorGUIUtility.singleLineHeight), sceneAsset, GUIContent.none);
+            };
+
+            m_RegisteredSceneAssetsList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "NetworkScenes");
+
+            m_RegisteredSceneAssetsList.onAddCallback = (registeredList) =>
+            {
+                m_NetworkManager.NetworkConfig.RegisteredSceneAssets.Add(null);
             };
-            m_RegisteredScenesList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "Registered Scene Names");
         }
 
         public override void OnInspectorGUI()
@@ -231,7 +243,6 @@ public override void OnInspectorGUI()
                 }
             }
 
-
             if (!m_NetworkManager.IsServer && !m_NetworkManager.IsClient)
             {
                 serializedObject.Update();
@@ -248,7 +259,7 @@ public override void OnInspectorGUI()
 
                 using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.EnableSceneManagement))
                 {
-                    m_RegisteredScenesList.DoLayoutList();
+                    m_RegisteredSceneAssetsList.DoLayoutList();
                     EditorGUILayout.Space();
                 }
 

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using System.Linq;
 
 namespace Unity.Netcode
@@ -24,11 +27,16 @@ public class NetworkConfig
         public NetworkTransport NetworkTransport = null;
 
         /// <summary>
-        /// A list of SceneNames that can be used during networked games.
+        /// The list of SceneNames built from the RegisteredSceneAssets list
         /// </summary>
-        [Tooltip("The Scenes that can be switched to by the server")]
+        [HideInInspector]
         public List<string> RegisteredScenes = new List<string>();
 
+#if UNITY_EDITOR
+        [Tooltip("The Scenes that can be switched to by the server")]
+        public List<SceneAsset> RegisteredSceneAssets = new List<SceneAsset>();
+#endif
+
         /// <summary>
         /// Whether or not runtime scene changes should be allowed and expected.
         /// If this is true, clients with different initial configurations will not work together.
@@ -44,7 +52,7 @@ public class NetworkConfig
         public GameObject PlayerPrefab;
 
         /// <summary>
-        /// A list of spawnable prefabs
+        /// A list of prefabs that can be dynamically spawned.
         /// </summary>
         [SerializeField]
         [Tooltip("The prefabs that can be spawned across the network")]
@@ -142,9 +150,9 @@ public class NetworkConfig
         public HashSize RpcHashSize = HashSize.VarIntFourBytes;
 
         /// <summary>
-        /// The amount of seconds to wait on all clients to load requested scene before the SwitchSceneProgress onComplete callback, that waits for all clients to complete loading, is called anyway.
+        /// The amount of seconds to wait for all clients to load or unload a requested scene
         /// </summary>
-        [Tooltip("The amount of seconds to wait for all clients to load a requested scene")]
+        [Tooltip("The amount of seconds to wait for all clients to load or unload a requested scene (only when EnableSceneManagement is enabled)")]
         public int LoadSceneTimeOut = 120;
 
         /// <summary>
@@ -315,3 +323,4 @@ public bool CompareConfig(ulong hash)
         }
     }
 }
+