-
-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/pure-openxr
# Conflicts: # Assets/Plugins/Android/AndroidManifest.xml # Assets/Scripts/GUI/LightingPopUpWindow.cs # Assets/Scripts/Multiplayer/MultiplayerManager.cs
- Loading branch information
Showing
104 changed files
with
16,483 additions
and
1,666 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| // MultiplayerManagerInspector.cs | ||
| using UnityEditor; | ||
| using UnityEngine; | ||
| using OpenBrush.Multiplayer; | ||
| using System.Threading.Tasks; | ||
| using System.ComponentModel.Composition; | ||
|
|
||
| #if UNITY_EDITOR | ||
| [CustomEditor(typeof(MultiplayerManager))] | ||
| public class MultiplayerManagerInspector : Editor | ||
| { | ||
| private MultiplayerManager multiplayerManager; | ||
| private string roomName = "1234"; | ||
| private bool isPrivate = false; | ||
| private int maxPlayers = 4; | ||
| private bool voiceDisabled = false; | ||
|
|
||
| public override void OnInspectorGUI() | ||
| { | ||
| multiplayerManager = (MultiplayerManager)target; | ||
|
|
||
| DrawDefaultInspector(); | ||
|
|
||
| GUILayout.Space(10); | ||
| EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); | ||
| GUILayout.Space(10); | ||
|
|
||
| roomName = EditorGUILayout.TextField("Room Name", roomName); | ||
|
|
||
| //State | ||
| string connectionState = ""; | ||
| if (multiplayerManager != null) connectionState = multiplayerManager.State.ToString(); | ||
| else connectionState = "Not Assigned"; | ||
|
|
||
| GUILayout.Space(10); | ||
| EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); | ||
| EditorGUILayout.BeginHorizontal(); | ||
| GUILayout.Label("Connection State: ", EditorStyles.boldLabel); | ||
| EditorGUILayout.LabelField($"{connectionState}"); | ||
| EditorGUILayout.EndHorizontal(); | ||
| GUILayout.Space(5); | ||
|
|
||
| if (GUILayout.Button("Connect")) | ||
| { | ||
| ConnectToLobby(); | ||
| EditorUtility.SetDirty(target); | ||
| } | ||
|
|
||
|
|
||
| if (GUILayout.Button("Join Room")) | ||
| { | ||
| ConnectToRoom(); | ||
| EditorUtility.SetDirty(target); | ||
| } | ||
|
|
||
|
|
||
| if (GUILayout.Button("Exit Room")) | ||
| { | ||
| DisconnectFromRoom(); | ||
| EditorUtility.SetDirty(target); | ||
| } | ||
|
|
||
|
|
||
| if (GUILayout.Button("Disconnect")) | ||
| { | ||
| Disconnect(); | ||
| EditorUtility.SetDirty(target); | ||
| } | ||
|
|
||
| if (GUILayout.Button("Refresh Room List")) | ||
| { | ||
| CheckIfRoomExists(); | ||
| EditorUtility.SetDirty(target); | ||
| } | ||
|
|
||
| //Local Player Id | ||
| string localPlayerId = ""; | ||
| if (multiplayerManager.m_LocalPlayer != null) localPlayerId = multiplayerManager.m_LocalPlayer.PlayerId.ToString(); | ||
| else localPlayerId = "Not Assigned"; | ||
|
|
||
| GUILayout.Space(10); | ||
| EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); | ||
| EditorGUILayout.BeginHorizontal(); | ||
| GUILayout.Label("Local Player ID: ", EditorStyles.boldLabel); | ||
| EditorGUILayout.LabelField($"{localPlayerId}"); | ||
| EditorGUILayout.EndHorizontal(); | ||
|
|
||
| //Room Ownership | ||
| string ownership = ""; | ||
| if (multiplayerManager != null && multiplayerManager.IsUserRoomOwner()) ownership = "Yes"; | ||
| else if (multiplayerManager != null && !multiplayerManager.IsUserRoomOwner()) ownership = "No"; | ||
| else ownership = "Not Assigned"; | ||
|
|
||
| EditorGUILayout.BeginHorizontal(); | ||
| GUILayout.Label("Is Local Player Room Owner:", EditorStyles.boldLabel); | ||
| EditorGUILayout.LabelField($"{ownership}"); | ||
| EditorGUILayout.EndHorizontal(); | ||
|
|
||
| //Remote Users | ||
| string remoteUsersRegistered = ""; | ||
| if (multiplayerManager.m_RemotePlayers != null && multiplayerManager.m_RemotePlayers.Count > 0) | ||
| { | ||
| remoteUsersRegistered = "UserIds:[ "; | ||
| foreach (var remotePlayer in multiplayerManager.m_RemotePlayers) | ||
| { | ||
| remoteUsersRegistered += remotePlayer.PlayerId.ToString() + ","; | ||
| } | ||
| remoteUsersRegistered += "]"; | ||
| } | ||
| else remoteUsersRegistered = "Not Assigned"; | ||
|
|
||
| //Registered remote players | ||
|
|
||
| EditorGUILayout.BeginHorizontal(); | ||
| GUILayout.Label("Registered Remote Players IDs:", EditorStyles.boldLabel); | ||
| 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(); | ||
|
|
||
| } | ||
|
|
||
| private async void ConnectToLobby() | ||
| { | ||
| if (multiplayerManager != null) | ||
| { | ||
| bool success = await multiplayerManager.Connect(); | ||
| } | ||
| } | ||
|
|
||
| private async void ConnectToRoom() | ||
| { | ||
| if (multiplayerManager != null) | ||
| { | ||
| RoomCreateData roomData = new RoomCreateData | ||
| { | ||
| roomName = roomName, | ||
| @private = isPrivate, | ||
| maxPlayers = maxPlayers, | ||
| voiceDisabled = voiceDisabled | ||
| }; | ||
|
|
||
| bool success = await multiplayerManager.JoinRoom(roomData); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| private async void DisconnectFromRoom() | ||
| { | ||
| if (multiplayerManager != null) | ||
| { | ||
| bool success = await multiplayerManager.LeaveRoom(); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| private async void Disconnect() | ||
| { | ||
| if (multiplayerManager != null) | ||
| { | ||
| bool success = await multiplayerManager.Disconnect(); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| private void CheckIfRoomExists() | ||
| { | ||
| if (multiplayerManager != null) | ||
| { | ||
| bool roomExists = multiplayerManager.DoesRoomNameExist(roomName); | ||
| } | ||
| } | ||
| } | ||
| #endif |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.