Multiplayer fixes and Improvments

Assets/Editor/BrushLister.cs

@@ -109,4 +109,4 @@ public static void AppendValidBrushString(BrushDescriptor brush, bool experiment
         }
 
     }
-}
+}

Assets/Editor/ConvertNormalMaps.cs

@@ -91,4 +91,4 @@ private static bool RemoveConversion(string assetPath)
         }
         return true;
     }
-}
+}

Assets/Editor/MultiplayerManagerEditor.cs

@@ -11,6 +11,8 @@ public class MultiplayerManagerInspector : Editor
 {
     private MultiplayerManager multiplayerManager;
     private string roomName = "1234";
+    private string nickname = "PlayerNickname";
+    private string oldNickname = "PlayerNickname";
     private bool isPrivate = false;
     private int maxPlayers = 4;
     private bool voiceDisabled = false;
@@ -25,7 +27,16 @@ public override void OnInspectorGUI()
         EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
         GUILayout.Space(10);
 
+
         roomName = EditorGUILayout.TextField("Room Name", roomName);
+        nickname = EditorGUILayout.TextField("Nickname", nickname);
+        if (nickname != oldNickname)
+        {
+            SetNickname();
+            oldNickname = nickname;
+            EditorUtility.SetDirty(target);
+        }
+        maxPlayers = EditorGUILayout.IntField("MaxPlayers", maxPlayers);
 
         //State
         string connectionState = "";
@@ -98,10 +109,10 @@ public override void OnInspectorGUI()
 
         //Remote Users
         string remoteUsersRegistered = "";
-        if (multiplayerManager.m_RemotePlayers != null && multiplayerManager.m_RemotePlayers.Count > 0)
+        if (multiplayerManager.m_RemotePlayers != null && multiplayerManager.m_RemotePlayers.List.Count > 0)
         {
             remoteUsersRegistered = "UserIds:[ ";
-            foreach (var remotePlayer in multiplayerManager.m_RemotePlayers)
+            foreach (var remotePlayer in multiplayerManager.m_RemotePlayers.List)
             {
                 remoteUsersRegistered += remotePlayer.PlayerId.ToString() + ",";
             }
@@ -116,19 +127,6 @@ public override void OnInspectorGUI()
         EditorGUILayout.LabelField($"{remoteUsersRegistered}");
         EditorGUILayout.EndHorizontal();
 
-        // Display and edit Nickname
-        GUILayout.Space(10);
-        EditorGUILayout.LabelField("Nickname", GUI.skin.horizontalSlider);
-        string currentNickname = multiplayerManager.UserInfo.Nickname;
-        GUILayout.Label("Nickname", EditorStyles.boldLabel);
-        string newNickname = EditorGUILayout.TextField("Edit Nickname", currentNickname);
-        if (newNickname != currentNickname)
-        {
-            ConnectionUserInfo updatedUserInfo = multiplayerManager.UserInfo;
-            updatedUserInfo.Nickname = newNickname;
-            multiplayerManager.UserInfo = updatedUserInfo;
-            EditorUtility.SetDirty(target); // Mark the target as dirty to apply changes
-        }
 
 
         Repaint();
@@ -160,6 +158,21 @@ private async void ConnectToRoom()
         }
     }
 
+    private async void SetNickname()
+    {
+        if (multiplayerManager != null)
+        {
+
+            ConnectionUserInfo ui = new ConnectionUserInfo
+            {
+                Nickname = nickname,
+                UserId = MultiplayerManager.m_Instance.UserInfo.UserId,
+                Role = MultiplayerManager.m_Instance.UserInfo.Role
+            };
+            MultiplayerManager.m_Instance.UserInfo = ui;
+        }
+    }
+
     private async void DisconnectFromRoom()
     {
         if (multiplayerManager != null)

Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs

@@ -0,0 +1,80 @@
+#if UNITY_EDITOR
+using OpenBrush.Multiplayer;
+using TiltBrush;
+using UnityEditor;
+using UnityEngine;
+
+[CustomEditor(typeof(MultiplayerRoomOptionsPopUpWindow))]
+public class MultiplayerRoomOptionsPopUpWindowEditor : Editor
+{
+    RemotePlayers remotePlayers = new RemotePlayers { };
+
+    public override void OnInspectorGUI()
+    {
+        base.OnInspectorGUI();
+
+        MultiplayerRoomOptionsPopUpWindow popupWindow = (MultiplayerRoomOptionsPopUpWindow)target;
+
+        if (GUILayout.Button("Add Player"))
+            if (!Application.isPlaying) 
+                AddPlayer(popupWindow);
+
+        if (GUILayout.Button("Remove Player"))
+           if (!Application.isPlaying) 
+                RemovePlayer(popupWindow);
+
+        if (GUILayout.Button("Populate Players list"))
+            if (!Application.isPlaying)
+                RegeneratePlayerList(popupWindow);
+
+    }
+
+    private void AddPlayer(MultiplayerRoomOptionsPopUpWindow popupWindow)
+    {
+        if (popupWindow.m_playerGuiPrefab == null)
+        {
+            Debug.LogWarning("Player GUI Prefab is not assigned!");
+            return;
+        }
+
+        int newIndex = remotePlayers.List.Count > 0 
+            ? remotePlayers.List[remotePlayers.List.Count - 1].PlayerId + 1 
+            : 0; 
+
+        remotePlayers.AddPlayer(new RemotePlayer
+        {
+            PlayerId = newIndex,
+            Nickname = $"testPlayer{newIndex}",
+        });
+
+    }
+
+    private void RemovePlayer(MultiplayerRoomOptionsPopUpWindow popupWindow)
+    {
+        if (popupWindow.m_playerGuiPrefab == null)
+        {
+            Debug.LogWarning("Player GUI Prefab is not assigned!");
+            return;
+        }
+
+        int RemoveIndex = remotePlayers.List[remotePlayers.List.Count-1].PlayerId;
+
+        remotePlayers.RemovePlayerById(RemoveIndex);
+
+    }
+
+
+
+    private void RegeneratePlayerList(MultiplayerRoomOptionsPopUpWindow popupWindow)
+    {
+
+        if (popupWindow.m_playerGuiPrefab == null)
+        {
+            Debug.LogWarning("Player GUI Prefab is not assigned!");
+            return;
+        }
+
+        popupWindow.GeneratePlayerList(remotePlayers.List);
+    }
+}
+#endif

Assets/Editor/PanelLister.cs

@@ -57,4 +57,4 @@ static void ListPopups()
         Debug.Log($"{popupList}");
     }
 
-}
+}

Assets/Fonts/NotoSansCJK-Light SDF.asset

@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: NotoSansCJK-Light SDF Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -70,9 +73,9 @@ Material:
     - _OutlineWidth: 0
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 1
-    - _ScaleRatioB: 1
-    - _ScaleRatioC: 1
+    - _ScaleRatioA: 0.8333333
+    - _ScaleRatioB: 0.6770833
+    - _ScaleRatioC: 0.6770833
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
@@ -117,9 +120,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
   m_Name: NotoSansCJK-Light SDF
   m_EditorClassIdentifier: 
-  hashCode: 0
+  hashCode: 1416160341
   material: {fileID: -3903529720270446558}
-  materialHashCode: 0
+  materialHashCode: -1938541483
   m_Version: 1.1.0
   m_SourceFontFileGUID: 501eea5417f248044ac830eb146b46cb
   m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 501eea5417f248044ac830eb146b46cb,
@@ -38758,7 +38761,8 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 0
   m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
+  m_IgnoreMipmapLimit: 0
+  m_MipmapLimitGroupName: 
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_VTOnly: 0

Assets/Fonts/Oswald-Bold SDF.asset

@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Oswald-Bold SDF Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 5
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -128,7 +131,8 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
+  m_IgnoreMipmapLimit: 0
+  m_MipmapLimitGroupName: 
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_VTOnly: 0
@@ -2897,8 +2901,7 @@ MonoBehaviour:
   m_FontFeatureTable:
     m_GlyphPairAdjustmentRecords: []
   fallbackFontAssets: []
-  m_FallbackFontAssetTable:
-  - {fileID: 0}
+  m_FallbackFontAssetTable: []
   m_CreationSettings:
     sourceFontFileName: 
     sourceFontFileGUID: 

Assets/Plugins/CSharp/ColorExtensions.cs

@@ -27,4 +27,4 @@ public static class Colors
     public static readonly Color lightpurple = new Color(0.75f, 0, 1, 1);
     public static readonly Color fuscia = new Color(1, 0, 0.75f, 1);
     public static readonly Color rose = new Color(1, 0, 0.05f, 1);
-}
+}