Multiplayer Beta

Assets/Scripts/GUI/MultiplayerPanel.cs

@@ -16,18 +16,24 @@
 using OpenBrush.Multiplayer;
 using TMPro;
 using UnityEngine;
+using static TiltBrush.SketchControlsScript;
 
 namespace TiltBrush
 {
     public class MultiplayerPanel : BasePanel
     {
         [SerializeField] private TextMeshPro m_RoomNumberTextLobby;
         [SerializeField] private TextMeshPro m_RoomNumberTextRoomSettings;
+        private PanelManager m_PanelManager;
 
-        public void SetRoomName(string roomName)
+        public string RoomName
         {
-            data.roomName = roomName;
-            UpdateRoomNumberDisplay();
+            get { return data.roomName; }
+            set
+            {
+                data.roomName = value;
+                UpdateRoomNumberDisplay(); 
+            }
         }
 
         private RoomCreateData data = new RoomCreateData
@@ -60,16 +66,11 @@ public enum Mode
         {
             Null,
             Lobby,
-            Joined,
-            //Create,
-            //RoomSettings,
-            //GeneralSettings
+            Joined
         }
 
         [SerializeField] private GameObject m_LobbyElements;
         [SerializeField] private GameObject m_JoinedElements;
-        //[SerializeField] private GameObject m_RoomSettingsElements;
-        //[SerializeField] private GameObject m_GeneralSettingsElements;
 
         private Mode m_CurrentMode;
 
@@ -115,8 +116,6 @@ private void UpdateMode(Mode newMode)
             m_CurrentMode = newMode;
             m_LobbyElements.SetActive(m_CurrentMode == Mode.Lobby);
             m_JoinedElements.SetActive(m_CurrentMode == Mode.Joined);
-            //m_RoomSettingsElements.SetActive(m_CurrentMode == Mode.RoomSettings);
-            //m_GeneralSettingsElements.SetActive(m_CurrentMode == Mode.GeneralSettings);
 
             // Update room number display if switching to a mode that shows it
             if (m_CurrentMode == Mode.Lobby || m_CurrentMode == Mode.Joined)
@@ -153,7 +152,6 @@ public void OnMultiplayerPanelButtonPressed(MultiplayerPanelButton button)
                     break;
                 case SketchControlsScript.GlobalCommands.MultiplayerJoinRoom:
                     JoinRoom();
-                    Debug.Log("Joining room");
                     break;
             }
         }

Assets/Scripts/GUI/MultiplayerPanelButton.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using UnityEngine;
+using static UnityEditor.Experimental.GraphView.GraphView;
 
 namespace TiltBrush
 {
@@ -21,15 +22,23 @@ public class MultiplayerPanelButton : OptionButton
         [SerializeField] private bool m_CommandIgnored = false;
 
         override protected void OnButtonPressed()
-        {
+        {   
+
+            MultiplayerPanel popup = m_Manager.GetComponent<MultiplayerPanel>();
+
             // For some circumstances on mobile, we want to ignore the command, but still
             // notify the popup that we were pressed.  Which happens below.
             if (!m_CommandIgnored)
             {
+                if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomName)
+                {
+                    KeyboardPopUpWindow.m_InitialText = popup.RoomName;
+                }
+
                 base.OnButtonPressed();
             }
 
-            MultiplayerPanel popup = m_Manager.GetComponent<MultiplayerPanel>();
+
             Debug.Assert(popup != null);
             popup.OnMultiplayerPanelButtonPressed(this);
         }

Assets/Scripts/SketchControlsScript.cs

@@ -4514,11 +4514,10 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1,
                 case GlobalCommands.EditMultiplayerRoomName:
                     {
                         var panel = (MultiplayerPanel)m_PanelManager.GetActivePanelByType(BasePanel.PanelType.Multiplayer);
-                        panel.SetRoomName(KeyboardPopUpWindow.m_LastInput);
+                        panel.RoomName = KeyboardPopUpWindow.m_LastInput;
                         DismissPopupOnCurrentGazeObject(false);
                         break;
                     }
-
                 case GlobalCommands.ShowWindowGUI:
                     break;
                 case GlobalCommands.Disco: