Merge branch 'develop-2.0.0' into fix/networktransform-autoswitchspace-forcing-updates-localspace

Author: NoelStephensUnity

Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs

@@ -136,8 +136,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
 
     /// <summary>
     /// We are using post spawn to handle any final spawn initializations.
-    /// At this point we know all NetworkBehaviours on this instance has 
-    /// been spawned.
+    /// At this point we know all NetworkBehaviours on this instance have been spawned.
     /// </summary>
     protected override void OnNetworkPostSpawn()
     {
@@ -173,8 +172,7 @@ public override void OnNetworkDespawn()
         {
             m_CharacterController.enabled = false;
             Camera.main.transform.SetParent(null, false);
-            Camera.main.transform.position = m_CameraOriginalPosition;
-            Camera.main.transform.rotation = m_CameraOriginalRotation;
+            Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
         }
         base.OnNetworkDespawn();
     }

Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs

@@ -5,7 +5,7 @@
 using Random = UnityEngine.Random;
 using Debug = UnityEngine.Debug;
 
-#region MoverScriptNoRigidbody Custom Editor 
+#region MoverScriptNoRigidbody Custom Editor
 #if UNITY_EDITOR
 using Unity.Netcode.Editor;
 using UnityEditor;
@@ -144,8 +144,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
 
     /// <summary>
     /// We are using post spawn to handle any final spawn initializations.
-    /// At this point we know all NetworkBehaviours on this instance has 
-    /// been spawned.
+    /// At this point we know all NetworkBehaviours on this instance have been spawned.
     /// </summary>
     protected override void OnNetworkPostSpawn()
     {
@@ -182,14 +181,13 @@ protected override void OnNetworkPostSpawn()
 
     public override void OnNetworkDespawn()
     {
-        // Notify any client or server specific componant that this instance has despawned.
+        // Notify any client or server specific component that this instance has despawned.
         NotifySpawnStatusChanged?.Invoke(false);
         if (IsLocalPlayer)
         {
             m_CharacterController.enabled = false;
             Camera.main.transform.SetParent(null, false);
-            Camera.main.transform.position = m_CameraOriginalPosition;
-            Camera.main.transform.rotation = m_CameraOriginalRotation;
+            Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
         }
         base.OnNetworkDespawn();
     }

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs

@@ -415,8 +415,7 @@ private void SetCameraDefaults()
         if (Camera.main != null && Camera.main.transform.parent != null)
         {
             Camera.main.transform.SetParent(null, false);
-            Camera.main.transform.position = m_CameraOriginalPosition;
-            Camera.main.transform.rotation = m_CameraOriginalRotation;
+            Camera.main.transform.SetPositionAndRotation(m_CameraOriginalPosition, m_CameraOriginalRotation);
         }
     }
 
@@ -522,7 +521,7 @@ private void StartDedicatedServer()
 
     /// <summary>
     /// Register callbacks when the OnServerStarted callback is invoked.
-    /// This makes it easier to know you are registering for events only 
+    /// This makes it easier to know you are registering for events only
     /// when the server successfully has started.
     /// </summary>
     private void ServerStarted()
@@ -578,11 +577,11 @@ private void HandleEditorKeyCommands()
 #else
     private void HandleConsoleKeyCommands()
     {
-        if (Console.KeyAvailable) 
+        if (Console.KeyAvailable)
         {
             var networkManager = NetworkManager.Singleton;
             var keyPressed = Console.ReadKey(true);
-            switch(keyPressed.Key) 
+            switch(keyPressed.Key)
             {
                 case ConsoleKey.X:
                     {

Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs

@@ -45,8 +45,7 @@ public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaterni
         var gameObject = m_NetworkManager.IsClient ? Instantiate(NetworkPrefabOverride) : Instantiate(NetworkPrefab);
         // You could integrate spawn locations here and on the server side apply the spawn position at
         // this stage of the spawn process.
-        gameObject.transform.position = position;
-        gameObject.transform.rotation = rotation;
+        gameObject.transform.SetPositionAndRotation(position, rotation);
         return gameObject.GetComponent<NetworkObject>();
     }
 
@@ -64,4 +63,3 @@ public void Destroy(NetworkObject networkObject)
         Destroy(networkObject.gameObject);
     }
 }
-

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -31,9 +31,11 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Made a variety of small performance improvements. (#3683)
 - Fixed NetworkTransform state synchronization issue when `NetworkTransform.SwitchTransformSpaceWhenParented` is enabled and the associated NetworkObject is parented multiple times in a single frame or within a couple of frames. (#3664)
 - Fixed issue when spawning, parenting, and immediately re-parenting. (#3664)
 
+
 ### Security
 
 

com.unity.netcode.gameobjects/Documentation~/basics/object-spawning.md

@@ -153,8 +153,7 @@ This type of dynamically spawned `NetworkObject` typically is a simple wrapper c
             m_prefabInstance = Instantiate(prefabToSpawn);
 
             // Optional, this example applies the spawner's position and rotation to the new instance
-            m_prefabInstance.transform.position = transform.position;
-            m_prefabInstance.transform.rotation = transform.rotation;
+            m_prefabInstance.transform.SetPositionAndRotation(transform.position, transform.rotation);
 
             // Get the instance's NetworkObject and Spawn
             m_SpawnedNetworkObject = m_prefabInstance.GetComponent<NetworkObject>();
@@ -233,8 +232,7 @@ public class SinglePooledDynamicSpawner : NetworkBehaviour, INetworkprefabInstan
     public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
     {
         m_prefabInstance.SetActive(true);
-        m_prefabInstance.transform.position = transform.position;
-        m_prefabInstance.transform.rotation = transform.rotation;
+        m_prefabInstance.transform.position.SetPositionAndRotation(transform.position, transform.rotation);
         return m_SpawnedNetworkObject;
     }
 

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -1431,11 +1431,7 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass
                     MethodReference callMethod = rpcHandler;
                     if (typeDefinition.HasGenericParameters)
                     {
-                        var genericTypes = new List<TypeReference>();
-                        foreach (var parameter in typeDefinition.GenericParameters)
-                        {
-                            genericTypes.Add(parameter);
-                        }
+                        var genericTypes = new List<TypeReference>(typeDefinition.GenericParameters);
                         callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
                     }
 
@@ -3101,11 +3097,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
             var callMethod = (MethodReference)methodDefinition;
             if (castType.HasGenericParameters)
             {
-                var genericTypes = new List<TypeReference>();
-                foreach (var parameter in castType.GenericParameters)
-                {
-                    genericTypes.Add(parameter);
-                }
+                var genericTypes = new List<TypeReference>(castType.GenericParameters);
                 castType = castType.MakeGenericInstanceType(genericTypes.ToArray());
                 callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
             }

com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs

@@ -22,7 +22,7 @@ public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeF
 
         private void OnEnable()
         {
-            if (NetworkPrefabsPath == "")
+            if (NetworkPrefabsPath.Length == 0)
             {
                 NetworkPrefabsPath = DefaultNetworkPrefabsPath;
             }

com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs

@@ -36,7 +36,7 @@ private static void OnDeactivate()
             if (settings.TempNetworkPrefabsPath != settings.NetworkPrefabsPath)
             {
                 var newPath = settings.TempNetworkPrefabsPath;
-                if (newPath == "")
+                if (newPath.Length == 0)
                 {
                     newPath = NetcodeForGameObjectsProjectSettings.DefaultNetworkPrefabsPath;
                     settings.TempNetworkPrefabsPath = newPath;

com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs

@@ -55,7 +55,6 @@ public class UnityTransportEditor : HiddenScriptEditor
 
         private SerializedProperty m_ServerAddressProperty;
         private SerializedProperty m_ServerPortProperty;
-        private SerializedProperty m_OverrideBindIpProperty;
 
         private const string k_LoopbackIpv4 = "127.0.0.1";
         private const string k_LoopbackIpv6 = "::1";
@@ -76,7 +75,6 @@ private void Initialize()
 
             m_ServerAddressProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Address));
             m_ServerPortProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Port));
-            m_OverrideBindIpProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.ServerListenAddress));
         }
 
         /// <summary>
@@ -129,7 +127,7 @@ public override void OnInspectorGUI()
                 overrideIp = EditorGUILayout.TextField("Override Bind IP (optional)", overrideIp);
                 if (allowRemoteConnections)
                 {
-                    if (overrideIp == "")
+                    if (overrideIp.Length == 0)
                     {
                         if (isIpV6)
                         {