Nickname

Nickname is empty by default in editor mode hence for testing purposes this changeset enable the nickname to be set from editor.
icosa-foundation · Jan 20, 2025 · 24ac381 · 24ac381
1 parent 91f3ab4
commit 24ac381
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 12 deletions.
diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/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;
@@ -26,6 +28,14 @@ public override void OnInspectorGUI()
         GUILayout.Space(10);
 
         roomName = EditorGUILayout.TextField("Room Name", roomName);
+        nickname = EditorGUILayout.TextField("Nickname", nickname);
+
+        if (nickname != oldNickname)
+        {
+            SetNickname();
+            oldNickname = nickname;
+            EditorUtility.SetDirty(target);
+        }
 
         //State
         string connectionState = "";
@@ -160,6 +170,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)

diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs
@@ -26,7 +26,7 @@ public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow
         public Vector2 PlayerGuiPrefabSize;
         public Vector2 PlayerListOffset;
         public Vector2 PlayerListArea;
-        private List<GameObject> m_instantiatedGuiPrefabs;
+        private List<GameObject> m_instantiatedGuiPrefabs = new List<GameObject>();
 
         public RemotePlayers m_RemotePlayers
         {
@@ -70,6 +70,7 @@ override protected void BaseUpdate()
         protected override void UpdateOpening()
         {
             base.UpdateOpening();
+            GeneratePlayerList();
         }
 
         protected override void UpdateClosing()
@@ -111,20 +112,21 @@ public void GeneratePlayerList(List<RemotePlayer> playersList = null)
 
             List<RemotePlayer> playersToDisplay = playersList ?? m_RemotePlayers.List;
 
-            Vector3 basePosition = transform.position + new Vector3(-PlayerListArea.x / 2 + PlayerGuiPrefabSize.x / 2, PlayerListOffset.y + PlayerListArea.y / 2 - PlayerGuiPrefabSize.y / 2, 0);
+            Vector3 basePosition = new Vector3(
+                -PlayerListArea.x / 2 + PlayerGuiPrefabSize.x / 2,
+                PlayerListOffset.y + PlayerListArea.y / 2 - PlayerGuiPrefabSize.y / 2,
+                0
+            );
             float yOffset = PlayerGuiPrefabSize.y;
 
             foreach (var remotePlayer in playersToDisplay)
             {
-                GameObject playerListItem = Instantiate(m_playerGuiPrefab, basePosition, Quaternion.identity, transform);
+                GameObject playerListItem = Instantiate(m_playerGuiPrefab, basePosition, transform.rotation, transform);
                 playerListItem.name = $"Player_{remotePlayer.PlayerId}";
                 playerListItem.transform.localPosition = basePosition;
 
                 PlayerListItemPrefab playerGuiComponent = playerListItem.GetComponent<PlayerListItemPrefab>();
-                if (playerGuiComponent != null)
-                {
-                    playerGuiComponent.SetRemotePlayer(remotePlayer);
-                }
+                if (playerGuiComponent != null) playerGuiComponent.SetRemotePlayer(remotePlayer);
 
                 basePosition -= new Vector3(0, yOffset, 0);
                 playerListItem.SetActive(true);

diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs
@@ -42,7 +42,7 @@ public class MultiplayerManager : MonoBehaviour
         private IVoiceConnectionHandler m_VoiceManager;
 
         public ITransientData<PlayerRigData> m_LocalPlayer;
-        public RemotePlayers m_RemotePlayers;
+        [HideInInspector] public RemotePlayers m_RemotePlayers;
 
         public Action<int, ITransientData<PlayerRigData>> localPlayerJoined;
         public Action<RemotePlayer> remotePlayerJoined;

diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs
@@ -107,7 +107,6 @@ public void Update()
             }
         }
 
-
         #region IConnectionHandler Methods
 
         public async Task<bool> Connect()
@@ -287,8 +286,8 @@ public string GetPlayerNickname(int playerId)
                 .FirstOrDefault(playerRig => playerRig != null && playerRig.PlayerId == playerId);
 
             if (remotePlayer != null && remotePlayer.Object != null && remotePlayer.Object.IsValid)
-                return remotePlayer.Nickname;
-            else return "default";
+                return remotePlayer.PersistentNickname;
+            else return "";
         }
 
         public GameObject GetPlayerPrefab(int playerId)

diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs b/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs
@@ -40,6 +40,9 @@ public class PhotonPlayerRig : NetworkBehaviour, ITransientData<PlayerRigData>
         [Networked] public float SceneScale { get; set; }
         [Networked] public bool isReceivingVoiceTransmission { get; set; }
         [Networked] public string Nickname { get; set; }
+
+        public string PersistentNickname = "";
+
 
         PointerScript transientPointer;
         // The offset transforms.
@@ -130,6 +133,7 @@ public PlayerRigData ReceiveData()
                 {
                     data.Nickname = this.Nickname;
                     NicknameText.text = this.Nickname;
+                    PersistentNickname = this.Nickname;
                 }
 
             }

diff --git a/Assets/Scripts/Multiplayer/RemotePlayer.cs b/Assets/Scripts/Multiplayer/RemotePlayer.cs
@@ -24,14 +24,35 @@ namespace OpenBrush.Multiplayer
     public class RemotePlayer
     {
         public int PlayerId;
-        public string Nickname;
+        private string _nickname;
+        public string Nickname
+        {
+
+            get
+            {
+                if (_nickname == "") _nickname = RetrieveNickNameFromRig();
+                return _nickname;
+            }
+            set { _nickname = value; }
+
+        }
 
         // send/receive rig data interface
         public ITransientData<PlayerRigData> TransientData;
 
         // The underlying GameObjects in the scene that represents this player 
         public GameObject PlayerGameObject;
         public GameObject VoiceGameObject;
+
+        private string RetrieveNickNameFromRig()
+        {
+
+            if (PlayerGameObject == null) return "";
+            PhotonPlayerRig Rig = PlayerGameObject.GetComponent<PhotonPlayerRig>();
+            if (Rig == null) return "";
+            return Rig.PersistentNickname;
+
+        }
     }