Added registered scenes as a ordered list

Author: TwoTenPvP

MLAPI-Editor/NetworkingManagerEditor.cs

@@ -91,17 +91,20 @@ private void OnEnable()
 
 
             int firstLabelWidth = 50;
-            int secondLabelWidth = 90;
-            float secondFieldWidth = 10;
-            int reduceFirstWidth = 45;
+            int secondLabelWidth = networkingManager.NetworkConfig.AllowPassthroughMessages ? 90 : 0;
+            float secondFieldWidth = networkingManager.NetworkConfig.AllowPassthroughMessages ? 10 : 0;
+            int reduceFirstWidth = networkingManager.NetworkConfig.AllowPassthroughMessages ? 45 : 20;
 
             EditorGUI.LabelField(new Rect(rect.x, rect.y, firstLabelWidth, EditorGUIUtility.singleLineHeight), "Name");
             EditorGUI.PropertyField(new Rect(rect.x + firstLabelWidth, rect.y, rect.width - firstLabelWidth - secondLabelWidth - secondFieldWidth - reduceFirstWidth,
                 EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Name"), GUIContent.none);
 
-            EditorGUI.LabelField(new Rect(rect.width - secondLabelWidth - secondFieldWidth, rect.y, secondLabelWidth, EditorGUIUtility.singleLineHeight), "Passthrough");
-            EditorGUI.PropertyField(new Rect(rect.width - secondFieldWidth, rect.y, secondFieldWidth,
-                EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Passthrough"), GUIContent.none);
+            if (networkingManager.NetworkConfig.AllowPassthroughMessages)
+            {
+                EditorGUI.LabelField(new Rect(rect.width - secondLabelWidth - secondFieldWidth, rect.y, secondLabelWidth, EditorGUIUtility.singleLineHeight), "Passthrough");
+                EditorGUI.PropertyField(new Rect(rect.width - secondFieldWidth, rect.y, secondFieldWidth,
+                    EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Passthrough"), GUIContent.none);
+            }
         };
 
         messageTypesList.drawHeaderCallback = (Rect rect) => {
@@ -118,10 +121,10 @@ private void OnEnable()
             int firstLabelWidth = 50;
             int secondLabelWidth = 40;
             int secondFieldWidth = 150;
-            int thirdLabelWidth = 70;
-            int thirdFieldWidth = 10;
+            int thirdLabelWidth = networkingManager.NetworkConfig.EnableEncryption ? 70 : 0;
+            int thirdFieldWidth = networkingManager.NetworkConfig.EnableEncryption ? 10 : 0;
             int reduceFirstWidth = 45;
-            int reduceSecondWidth = 10;
+            int reduceSecondWidth = networkingManager.NetworkConfig.EnableEncryption ? 10 : 0;
 
             EditorGUI.LabelField(new Rect(rect.x, rect.y, firstLabelWidth, EditorGUIUtility.singleLineHeight), "Name");
             EditorGUI.PropertyField(new Rect(rect.x + firstLabelWidth, rect.y, rect.width - firstLabelWidth - secondLabelWidth - secondFieldWidth - thirdFieldWidth - thirdLabelWidth - reduceFirstWidth,
@@ -132,14 +135,35 @@ private void OnEnable()
             EditorGUI.PropertyField(new Rect(rect.width - secondFieldWidth - thirdLabelWidth - thirdFieldWidth, rect.y, secondFieldWidth - reduceSecondWidth,
                 EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Type"), GUIContent.none);
 
-            EditorGUI.LabelField(new Rect(rect.width - thirdFieldWidth - thirdLabelWidth, rect.y, thirdLabelWidth, EditorGUIUtility.singleLineHeight), "Encrypted");
-            EditorGUI.PropertyField(new Rect(rect.width - thirdFieldWidth, rect.y, secondFieldWidth,
-                EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Encrypted"), GUIContent.none);
+            if (networkingManager.NetworkConfig.EnableEncryption)
+            {
+                EditorGUI.LabelField(new Rect(rect.width - thirdFieldWidth - thirdLabelWidth, rect.y, thirdLabelWidth, EditorGUIUtility.singleLineHeight), "Encrypted");
+                EditorGUI.PropertyField(new Rect(rect.width - thirdFieldWidth, rect.y, secondFieldWidth,
+                    EditorGUIUtility.singleLineHeight), element.FindPropertyRelative("Encrypted"), GUIContent.none);
+            }
         };
 
         channelsList.drawHeaderCallback = (Rect rect) => {
             EditorGUI.LabelField(rect, "Channels (Auto Sorted)");
         };
+
+
+        registeredScenesList = new ReorderableList(serializedObject, serializedObject.FindProperty("NetworkConfig").FindPropertyRelative("RegisteredScenes"), true, true, true, true);
+        registeredScenesList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) =>
+        {
+            SerializedProperty element = registeredScenesList.serializedProperty.GetArrayElementAtIndex(index);
+            int firstLabelWidth = 50;
+            int padding = 20;
+
+            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);
+
+        };
+
+        registeredScenesList.drawHeaderCallback = (Rect rect) => {
+            EditorGUI.LabelField(rect, "Registered Scene Names (Auto Sorted)");
+        };
     }
 
     public override void OnInspectorGUI()
@@ -153,13 +177,21 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(RunInBackgroundProperty);
             EditorGUILayout.PropertyField(LogLevelProperty);
 
-            EditorGUILayout.Space();
-            networkPrefabsList.DoLayoutList();
+            if (networkingManager.NetworkConfig.HandleObjectSpawning)
+            {
+                EditorGUILayout.Space();
+                networkPrefabsList.DoLayoutList();
+            }
             EditorGUILayout.Space();
             messageTypesList.DoLayoutList();
             EditorGUILayout.Space();
             channelsList.DoLayoutList();
             EditorGUILayout.Space();
+            if (networkingManager.NetworkConfig.EnableSceneSwitching)
+            {
+                registeredScenesList.DoLayoutList();
+                EditorGUILayout.Space();
+            }
 
             serializedObject.ApplyModifiedProperties();
             base.OnInspectorGUI();

MLAPI/Data/NetworkConfig.cs

@@ -55,6 +55,7 @@ public class NetworkConfig
         /// <summary>
         /// A list of SceneNames that can be used during networked games.
         /// </summary>
+        [HideInInspector]
         public List<string> RegisteredScenes = new List<string>();
         /// <summary>
         /// A list of spawnable prefabs