refactored TransportPicker and removed unneeded switch-cases

Author: LPLafontaineB

Assets/BossRoom/Prefabs/NetworkingManager.prefab

@@ -27,9 +27,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5436007408952557925}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5486862276979889515
 MonoBehaviour:
@@ -86,9 +87,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5436007408952557925}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &503411709
 MonoBehaviour:
@@ -146,8 +148,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1861090270400447367}
   - {fileID: 347284043}
   - {fileID: 503411708}
   m_Father: {fileID: 0}
@@ -184,66 +186,55 @@ MonoBehaviour:
   NetworkConfig:
     ProtocolVersion: 0
     NetworkTransport: {fileID: 5486862276979889515}
-    PlayerPrefab: {fileID: 4927145850774787080, guid: 1d3f5528d25661949890bcd7f47fe81a,
-      type: 3}
+    PlayerPrefab: {fileID: 4927145850774787080, guid: 1d3f5528d25661949890bcd7f47fe81a, type: 3}
     NetworkPrefabs:
     - Override: 0
-      Prefab: {fileID: 6009713983291384756, guid: 8237adf32a9b6de4892e6febe6b4bdef,
-        type: 3}
+      Prefab: {fileID: 6009713983291384756, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 3713729372785093424, guid: 6cdd52f1fa2ed34469a487ae6477eded,
-        type: 3}
+      Prefab: {fileID: 3713729372785093424, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 3688950541947916333, guid: 365e94337fd10fe4ebde1906df413ac7,
-        type: 3}
+      Prefab: {fileID: 3688950541947916333, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a,
-        type: 3}
+      Prefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c,
-        type: 3}
+      Prefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 2842198241268549130, guid: 411974b75a8b43d4e9b3c9069a5067fb,
-        type: 3}
+      Prefab: {fileID: 2842198241268549130, guid: 411974b75a8b43d4e9b3c9069a5067fb, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 2842198241268549130, guid: 0251e08eeed89e844a8527b3a7874cc2,
-        type: 3}
+      Prefab: {fileID: 2842198241268549130, guid: 0251e08eeed89e844a8527b3a7874cc2, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 576565557002701866, guid: 3af96a32a84bcf74d9538fa7af973c97,
-        type: 3}
+      Prefab: {fileID: 576565557002701866, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 3597354879354517420, guid: c8513d3df780cb34a9576da3772d512b,
-        type: 3}
+      Prefab: {fileID: 3597354879354517420, guid: c8513d3df780cb34a9576da3772d512b, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
     - Override: 0
-      Prefab: {fileID: 3106828016798330210, guid: 5c107a985e30aa2469a62ecf015d43a8,
-        type: 3}
+      Prefab: {fileID: 3106828016798330210, guid: 5c107a985e30aa2469a62ecf015d43a8, type: 3}
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
@@ -262,53 +253,3 @@ MonoBehaviour:
     LoadSceneTimeOut: 120
     SpawnTimeout: 1
     EnableNetworkLogs: 1
---- !u!1 &7311172147761373013
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1861090270400447367}
-  - component: {fileID: 7738483995325753316}
-  m_Layer: 0
-  m_Name: UnetTransport2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1861090270400447367
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7311172147761373013}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 5436007408952557925}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7738483995325753316
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7311172147761373013}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b84c2d8dfe509a34fb59e2b81f8e1319, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  MessageBufferSize: 5120
-  MaxConnections: 100
-  MaxSentMessageQueueSize: 128
-  ConnectAddress: 127.0.0.1
-  ConnectPort: 7777
-  ServerListenPort: 7777
-  MessageSendMode: 0

Assets/BossRoom/Scripts/Client/UI/IPConnectionWindow.cs

@@ -3,8 +3,6 @@
 using TMPro;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Netcode;
-using Unity.Netcode.Transports.UNET;
-using Unity.Netcode.Transports.UTP;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Visual
@@ -57,19 +55,10 @@ void OnTimeElapsed()
                 m_IPUIMediator.DisableSignInSpinner();
             }
 
-            switch (chosenTransport)
-            {
-                case UNetTransport unetTransport:
-                    StartCoroutine(WaitUntilUNETDisconnected(OnTimeElapsed));
-                    break;
-                case UnityTransport unityTransport:
-                    var maxConnectAttempts= unityTransport.MaxConnectAttempts;
-                    var connectTimeoutMS= unityTransport.ConnectTimeoutMS;
-                    StartCoroutine(DisplayUTPConnectionDuration(maxConnectAttempts, connectTimeoutMS, OnTimeElapsed));
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(chosenTransport));
-            }
+
+            var maxConnectAttempts= chosenTransport.MaxConnectAttempts;
+            var connectTimeoutMS= chosenTransport.ConnectTimeoutMS;
+            StartCoroutine(DisplayUTPConnectionDuration(maxConnectAttempts, connectTimeoutMS, OnTimeElapsed));
 
             Show();
         }
@@ -80,13 +69,6 @@ public void CancelConnectionWindow()
             StopAllCoroutines();
         }
 
-        IEnumerator WaitUntilUNETDisconnected(Action endAction)
-        {
-            yield return new WaitUntil(() => !NetworkManager.Singleton.IsListening);
-
-            endAction();
-        }
-
         IEnumerator DisplayUTPConnectionDuration(int maxReconnectAttempts, int connectTimeoutMS, Action endAction)
         {
             var connectionDuration = maxReconnectAttempts * connectTimeoutMS / 1000f;

Assets/BossRoom/Scripts/Shared/Game/UI/Editor/NetworkLatencyWarning.cs

@@ -21,24 +21,17 @@ void Update()
         {
             if (NetworkManager.Singleton != null && (NetworkManager.Singleton.IsClient || NetworkManager.Singleton.IsServer))
             {
-                var chosenTransport = NetworkManager.Singleton.NetworkConfig.NetworkTransport;
+                var unityTransport = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
 
-                switch (chosenTransport)
-                {
-                    case UnityTransport unityTransport:
-                        // adding this preprocessor directive check since UnityTransport's simulator tools only inject latency in #UNITY_EDITOR or in #DEVELOPMENT_BUILD
+                // adding this preprocessor directive check since UnityTransport's simulator tools only inject latency in #UNITY_EDITOR or in #DEVELOPMENT_BUILD
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
-                        var simulatorParameters = unityTransport.DebugSimulator;
-                        m_ArtificialLatencyEnabled = simulatorParameters.PacketDelayMS > 0 ||
-                            simulatorParameters.PacketJitterMS > 0 ||
-                            simulatorParameters.PacketDropRate > 0;
+                var simulatorParameters = unityTransport.DebugSimulator;
+                m_ArtificialLatencyEnabled = simulatorParameters.PacketDelayMS > 0 ||
+                    simulatorParameters.PacketJitterMS > 0 ||
+                    simulatorParameters.PacketDropRate > 0;
 #else
-                        m_ArtificialLatencyEnabled = false;
+                m_ArtificialLatencyEnabled = false;
 #endif
-                        break;
-                    default:
-                        throw new Exception($"unhandled transport {chosenTransport.GetType()}");
-                }
 
                 if (m_ArtificialLatencyEnabled)
                 {

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -246,22 +246,15 @@ public void StartClient(string ipaddress, int port)
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
-            switch (chosenTransport)
-            {
-                case UnityTransport unityTransport:
-                    // TODO: once this is exposed in the adapter we will be able to change it
-                    unityTransport.SetConnectionData(ipaddress, (ushort)port);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(chosenTransport));
-            }
+            // TODO: once this is exposed in the adapter we will be able to change it
+            chosenTransport.SetConnectionData(ipaddress, (ushort)port);
 
             ConnectClient();
         }
 
         public async void StartClientUnityRelayModeAsync(Action<string> onFailure)
         {
-            var utp = (UnityTransport)NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
+            var utp = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = utp;
 
             await JoinRelayAsync(onFailure);

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/GameNetPortal.cs

@@ -5,7 +5,6 @@
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Netcode;
-using Unity.Netcode.Transports.UTP;
 using Unity.Services.Authentication;
 using Unity.Services.Core;
 using UnityEngine;
@@ -179,17 +178,7 @@ public bool StartHost(string ipaddress, int port)
         {
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
-
-            // Note: In most cases, this switch case shouldn't be necessary. It becomes necessary when having to deal with multiple transports like this
-            // sample does, since current Transport API doesn't expose these fields.
-            switch (chosenTransport)
-            {
-                case UnityTransport unityTransport:
-                    unityTransport.SetConnectionData(ipaddress, (ushort)port);
-                    break;
-                default:
-                    throw new Exception($"unhandled IpHost transport {chosenTransport.GetType()}");
-            }
+            chosenTransport.SetConnectionData(ipaddress, (ushort)port);
 
             return StartHost();
         }
@@ -199,33 +188,25 @@ public async void StartUnityRelayHost()
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
-            switch (chosenTransport)
+            Debug.Log("Setting up Unity Relay host");
+
+            try
+            {
+                var (ipv4Address, port, allocationIdBytes, connectionData, key, joinCode) =
+                    await UnityRelayUtilities.AllocateRelayServerAndGetJoinCode(k_MaxUnityRelayConnections);
+
+                m_LocalLobby.RelayJoinCode = joinCode;
+                //next line enabled lobby and relay services integration
+                await m_LobbyServiceFacade.UpdateLobbyDataAsync(m_LocalLobby.GetDataForUnityServices());
+                await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), joinCode);
+
+                // we now need to set the RelayCode somewhere :P
+                chosenTransport.SetHostRelayData(ipv4Address, port, allocationIdBytes, key, connectionData, isSecure: true);
+            }
+            catch (Exception e)
             {
-                case UnityTransport utp:
-                    Debug.Log("Setting up Unity Relay host");
-
-                    try
-                    {
-                        var (ipv4Address, port, allocationIdBytes, connectionData, key, joinCode) =
-                            await UnityRelayUtilities.AllocateRelayServerAndGetJoinCode(k_MaxUnityRelayConnections);
-
-                        m_LocalLobby.RelayJoinCode = joinCode;
-                        //next line enabled lobby and relay services integration
-                        await m_LobbyServiceFacade.UpdateLobbyDataAsync(m_LocalLobby.GetDataForUnityServices());
-                        await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), joinCode);
-
-                        // we now need to set the RelayCode somewhere :P
-                        utp.SetHostRelayData(ipv4Address, port, allocationIdBytes, key, connectionData, isSecure: true);
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.LogErrorFormat($"{e.Message}");
-                        throw;
-                    }
-
-                    break;
-                default:
-                    throw new Exception($"unhandled relay transport {chosenTransport.GetType()}");
+                Debug.LogErrorFormat($"{e.Message}");
+                throw;
             }
 
             StartHost();

Assets/BossRoom/Scripts/Shared/TransportPicker.cs

@@ -1,33 +1,25 @@
-using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
 using UnityEngine;
-using UnityEngine.Assertions;
 
 /// <summary>
 /// This exists as a small helper to easily swap transports while still supporting the UI switch from ip to relay based transports.
 /// </summary>
 public class TransportPicker : MonoBehaviour
 {
     [SerializeField]
-    NetworkTransport m_IpHostTransport;
+    UnityTransport m_IpHostTransport;
 
     [SerializeField]
-    NetworkTransport m_UnityRelayTransport;
+    UnityTransport m_UnityRelayTransport;
 
     /// <summary>
     /// The transport used when hosting the game on an IP address.
     /// </summary>
-    public NetworkTransport IpHostTransport => m_IpHostTransport;
+    public UnityTransport IpHostTransport => m_IpHostTransport;
 
 
     /// <summary>
     /// The transport used when hosting the game over a unity relay server.
     /// </summary>
-    public NetworkTransport UnityRelayTransport => m_UnityRelayTransport;
-
-    void OnValidate()
-    {
-        Assert.IsTrue(m_IpHostTransport == null || m_IpHostTransport as UnityTransport,
-            "IpHost transport must be UTP.");
-    }
+    public UnityTransport UnityRelayTransport => m_UnityRelayTransport;
 }