feat: Scene Registration Refactoring - New UIX Features

com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs

@@ -44,6 +44,7 @@ public class NetworkManagerEditor : UnityEditor.Editor
         private SerializedProperty m_LoadSceneTimeOutProperty;
         private SerializedProperty m_EnableMessageBufferingProperty;
         private SerializedProperty m_MessageBufferTimeoutProperty;
+        private SerializedProperty m_SceneRegistrationProperty;
 
         private ReorderableList m_NetworkPrefabsList;
         private ReorderableList m_RegisteredScenesList;
@@ -157,6 +158,7 @@ private void CheckNullProperties()
             m_LoadSceneTimeOutProperty = m_NetworkConfigProperty.FindPropertyRelative("LoadSceneTimeOut");
             m_EnableMessageBufferingProperty = m_NetworkConfigProperty.FindPropertyRelative("EnableMessageBuffering");
             m_MessageBufferTimeoutProperty = m_NetworkConfigProperty.FindPropertyRelative("MessageBufferTimeout");
+            m_SceneRegistrationProperty = m_NetworkConfigProperty.FindPropertyRelative("SceneRegistration");
         }
 
         private void OnEnable()
@@ -269,13 +271,17 @@ public override void OnInspectorGUI()
                 m_NetworkPrefabsList.DoLayoutList();
                 EditorGUILayout.Space();
 
+
+
                 using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.EnableSceneManagement))
                 {
                     m_RegisteredScenesList.DoLayoutList();
                     EditorGUILayout.Space();
                 }
 
 
+
+
                 EditorGUILayout.LabelField("General", EditorStyles.boldLabel);
                 EditorGUILayout.PropertyField(m_ProtocolVersionProperty);
 
@@ -358,6 +364,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_RpcHashSizeProperty);
 
                 EditorGUILayout.LabelField("Scene Management", EditorStyles.boldLabel);
+                EditorGUILayout.PropertyField(m_SceneRegistrationProperty);
                 EditorGUILayout.PropertyField(m_EnableSceneManagementProperty);
 
                 using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.EnableSceneManagement))

com.unity.multiplayer.mlapi/Editor/ReadOnlyPropertyDrawer.cs

@@ -0,0 +1,62 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using MLAPI.SceneManagement;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace MLAPI.Editor
+{
+    [CustomPropertyDrawer(typeof(ReadOnlyPropertyAttribute))]
+    public class ReadOnlyPropertyDrawer : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+            // Disable the read only field
+            GUI.enabled = false;
+            EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, position.height), property, label);
+            GUI.enabled = true;
+            EditorGUI.EndProperty();
+        }
+    }
+
+    [CustomPropertyDrawer(typeof(SceneReadOnlyPropertyAttribute))]
+    public class SceneRegistrationReadOnlyPropertyDrawer : PropertyDrawer
+    {
+        private const int k_ButtonWidth = 140;
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+            // Disable the read only field
+            GUI.enabled = false;
+            try
+            {
+                EditorGUI.PropertyField(new Rect(position.x + k_ButtonWidth + 3, position.y, position.width - (k_ButtonWidth + 3), position.height), property);
+            }
+            catch (System.Exception ex)
+            {
+                Debug.LogError(ex);
+            }
+
+            GUI.enabled = true;
+            EditorGUI.EndProperty();
+
+            // Add a button to open the scene containing the network manager referencing the SceneRegistration
+            if (GUI.Button(new Rect(position.x, position.y, k_ButtonWidth, 20), "Load Referencing NetworkManager Scene"))
+            {
+                var value = property.objectReferenceValue as SceneAsset;
+                if (value != null)
+                {
+                    EditorSceneManager.OpenScene(AssetDatabase.GetAssetPath(value), OpenSceneMode.Single);
+                }
+            }
+        }
+    }
+
+
+
+
+}

com.unity.multiplayer.mlapi/Editor/SceneHierarchyMonitor.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace MLAPI.Editor
+{
+    [InitializeOnLoad]
+    public static class SceneHierarchyMonitor
+    {
+        static SceneHierarchyMonitor()
+        {
+            EditorApplication.hierarchyChanged += OnHierarchyChanged;
+        }
+
+        public static readonly List<SceneAsset> CurrentScenesInHierarchy = new List<SceneAsset>();
+
+        public static  void RefreshHierarchy()
+        {
+            OnHierarchyChanged();
+        }
+
+
+
+        static private void OnHierarchyChanged()
+        {
+            var all = Resources.FindObjectsOfTypeAll(typeof(SceneAsset));
+            if (all.Count() != CurrentScenesInHierarchy.Count())
+            {
+                CurrentScenesInHierarchy.Clear();
+                foreach (var sceneAsset in all)
+                {
+                    if (!CurrentScenesInHierarchy.Contains(sceneAsset))
+                    {
+                        CurrentScenesInHierarchy.Add(sceneAsset as SceneAsset);
+                    }
+                }
+            }
+        }
+    }
+}