chore: NGO 2.0.0-exp.4 merge back to develop NGO 2.0.0 (#2940)

* chore: distributed authority UI displays dependent upon multiplayer SDK package (#2875)

* update

Renaming Session Mode to Network Topology.
This includes any related properties or XML API documentation references.

Adding package dependent conditional define MULTIPLAYER_SDK_INSTALLED that is defined when the com.unity.services.multiplayer package is installed to the editor assembly definition file.

This removes the custom property drawer since it appears the default enum flag drawer visual bug is resolved in Unity 6.

incrementing the version change

* feat: expose the UTP connect (#2935)

* feat: expose the UTP connect payload

* pass accept payload

* fix formatting

* make Connect and m_Driver protected

* remove payload output

* chore: Merge develop 2.0.0 into exp.3 (#2933)

* feat: enum ordered message versioning  (#2929)

* chore: migrate tests from public to internal (#2930)

* update

Added the MessageTypeDefines ordering class that orders messages based on the NetworkMessageType.
Use tick offset.
Change the ticks ago based on whether DAHost or CMBService.
Changing all test public api to internal
Adding FixedJoint attach and detach methods to NetworkRigidbodyBase.

* test

Fixing issue with tests using their own message provider.
Fixing a few more tests that don't need the message ordering or count verification stuff to be running.
Removed the message ordering related tests since this it was no longer needed.


---------

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>

* update

Migrated non-authority NetworkTransform updates to the pre late update to more align with how it is handled in v1.x.
Added NetworkRigidbodyBase reference to NetworkObject.
For now, added the ability to add a fixed joint when parenting two NetworkObjects with NetworkTransforms and NetworkRigidbodies that both have UseRigidBodyForMotion set to true (i.e. Rigidbody has no concept of "local space" motion).

* update

Change the FixedJoint approach so it does not require parenting.
The "parent" rigid body now updates its children in NetworkTransform when the "parent's" state is updated in order to keep both parent and children state updates synchronized on the same network tick.
Added NetworkObject.CurrentParent that is set when a NetworkObject is parented.
NetworkObject.NetworkTransform is now NetworkObject.NetworkTransforms (a single NetworkObject can have many NetworkTransforms).
NetworkObject.NetworkRigidbodybase is now NetworkObject.NetworkRigidbodies (a single NetworkObject can have many NetworkRigidbodybase components).

* fix

Adding COM_UNITY_MODULES_PHYSICS wrappers around NetworkObject.NetworkRigidbodies.

* fix

wrapping some physics dependent properties in #if COM_UNITY_MODULES_PHYSICS.

* fix

Last missed NetworkRigidbodies needed wrapping in #if COM_UNITY_MODULES_PHYSICS

* fix

Only invoke DetachFromFixedJoint if HasAuthority is true during despawn.

* fix

Fixing issue where NetworkTransforms updated during FixedUpdate can have a render time that is slightly earlier than the start time. The delta between the two is typically in the nano to pico seconds range.

This first pass approach to resolve this issue is to just cast the two double properties to floats prior to subtracting one from the other in order to reduce that level of granularity of the delta between the two.

---------

Co-authored-by: Frank Luong <100299641+fluong6@users.noreply.github.com>

* chore: add NGO 2.0.0-exp.3 version and date to changelog (#2937)

adding release version and date to changelog

* removing "unreleased" tag

* chore: update changelog in ngo 2.0.0 exp.4 (#2939)

* updating changelog

* bumping ngo version in package json

* adding unreleased section back

---------

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>
Co-authored-by: Dominick <dominick@schroer.ca>

Author: 3 people

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -8,14 +8,18 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ## [Unreleased]
 
+## [2.0.0-exp.4] - 2024-05-31
+
 ### Added
 
+- Added `NetworkRigidbodyBase.AttachToFixedJoint` and `NetworkRigidbodyBase.DetachFromFixedJoint` to replace parenting for rigid bodies that have `NetworkRigidbodyBase.UseRigidBodyForMotion` enabled. (#2933)
 - Added `NetworkBehaviour.OnNetworkPreSpawn` and `NetworkBehaviour.OnNetworkPostSpawn` methods that provide the ability to handle pre and post spawning actions during the `NetworkObject` spawn sequence. (#2912)
 - Added a client-side only `NetworkBehaviour.OnNetworkSessionSynchronized` convenience method that is invoked on all `NetworkBehaviour`s after a newly joined client has finished synchronizing with the network session in progress. (#2912)
 - Added `NetworkBehaviour.OnInSceneObjectsSpawned` convenience method that is invoked when all in-scene `NetworkObject`s have been spawned after a scene has been loaded or upon a host or server starting. (#2912)
 
 ### Fixed
 
+- Fixed issue where non-authoritative rigid bodies with `NetworkRigidbodyBase.UseRigidBodyForMotion` enabled would constantly log errors about the renderTime being before `StartTimeConsumed`. (#2933)
 - Fixed issue where in-scene placed NetworkObjects could be destroyed if a client disconnects early and/or before approval. (#2924)
 - Fixed issue where a `NetworkObject` component's associated `NetworkBehaviour` components would not be detected if scene loading is disabled in the editor and the currently loaded scene has in-scene placed `NetworkObject`s. (#2912)
 - Fixed issue where an in-scene placed `NetworkObject` with `NetworkTransform` that is also parented under a `GameObject` would not properly synchronize when the parent `GameObject` had a world space position other than 0,0,0. (#2898)
@@ -24,6 +28,9 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 - Change all the access modifiers of test class from Public to Internal (#2930)
 - Changed messages are now sorted by enum values as opposed to ordinally sorting the messages by their type name. (#2929)
+- Changed `NetworkClient.SessionModeTypes` to `NetworkClient.NetworkTopologyTypes`. (#2875)
+- Changed `NetworkClient.SessionModeType` to `NetworkClient.NetworkTopologyType`. (#2875)
+- Changed `NetworkConfig.SessionMode` to `NeworkConfig.NetworkTopology`. (#2875)
 
 ## [2.0.0-exp.2] - 2024-04-02
 

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

@@ -30,7 +30,9 @@ public class NetworkManagerEditor : UnityEditor.Editor
         private SerializedProperty m_ProtocolVersionProperty;
         private SerializedProperty m_NetworkTransportProperty;
         private SerializedProperty m_TickRateProperty;
-        private SerializedProperty m_SessionModeProperty;
+#if MULTIPLAYER_SDK_INSTALLED
+        private SerializedProperty m_NetworkTopologyProperty;
+#endif
         private SerializedProperty m_ClientConnectionBufferTimeoutProperty;
         private SerializedProperty m_ConnectionApprovalProperty;
         private SerializedProperty m_EnsureNetworkVariableLengthSafetyProperty;
@@ -100,7 +102,9 @@ private void Initialize()
             m_ProtocolVersionProperty = m_NetworkConfigProperty.FindPropertyRelative("ProtocolVersion");
             m_NetworkTransportProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTransport");
             m_TickRateProperty = m_NetworkConfigProperty.FindPropertyRelative("TickRate");
-            m_SessionModeProperty = m_NetworkConfigProperty.FindPropertyRelative("SessionMode");
+#if MULTIPLAYER_SDK_INSTALLED
+            m_NetworkTopologyProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTopology");
+#endif
             m_ClientConnectionBufferTimeoutProperty = m_NetworkConfigProperty.FindPropertyRelative("ClientConnectionBufferTimeout");
             m_ConnectionApprovalProperty = m_NetworkConfigProperty.FindPropertyRelative("ConnectionApproval");
             m_EnsureNetworkVariableLengthSafetyProperty = m_NetworkConfigProperty.FindPropertyRelative("EnsureNetworkVariableLengthSafety");
@@ -138,7 +142,9 @@ private void CheckNullProperties()
             m_ProtocolVersionProperty = m_NetworkConfigProperty.FindPropertyRelative("ProtocolVersion");
             m_NetworkTransportProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTransport");
             m_TickRateProperty = m_NetworkConfigProperty.FindPropertyRelative("TickRate");
-            m_SessionModeProperty = m_NetworkConfigProperty.FindPropertyRelative("SessionMode");
+#if MULTIPLAYER_SDK_INSTALLED
+            m_NetworkTopologyProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTopology");
+#endif
             m_ClientConnectionBufferTimeoutProperty = m_NetworkConfigProperty.FindPropertyRelative("ClientConnectionBufferTimeout");
             m_ConnectionApprovalProperty = m_NetworkConfigProperty.FindPropertyRelative("ConnectionApproval");
             m_EnsureNetworkVariableLengthSafetyProperty = m_NetworkConfigProperty.FindPropertyRelative("EnsureNetworkVariableLengthSafety");
@@ -177,9 +183,12 @@ public override void OnInspectorGUI()
                 serializedObject.Update();
                 EditorGUILayout.PropertyField(m_RunInBackgroundProperty);
                 EditorGUILayout.PropertyField(m_LogLevelProperty);
-                EditorGUILayout.PropertyField(m_SessionModeProperty);
+
                 EditorGUILayout.Space();
                 EditorGUILayout.LabelField("Network Settings", EditorStyles.boldLabel);
+#if MULTIPLAYER_SDK_INSTALLED
+                EditorGUILayout.PropertyField(m_NetworkTopologyProperty);
+#endif
                 EditorGUILayout.PropertyField(m_ProtocolVersionProperty);
                 EditorGUILayout.PropertyField(m_NetworkTransportProperty);
                 if (m_NetworkTransportProperty.objectReferenceValue == null)

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

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+#if MULTIPLAYER_SDK_INSTALLED
 using System.Linq;
+#endif
 using UnityEditor;
 using UnityEngine;
 
@@ -144,7 +146,9 @@ private void OnDestroy()
         }
     }
 
-
+    // Keeping this here just in case, but it appears that in Unity 6 the visual bugs with
+    // enum flags is resolved
+#if BYPASS_DEFAULT_ENUM_DRAWER && MULTIPLAYER_SDK_INSTALLED
     [CustomPropertyDrawer(typeof(NetworkObject.OwnershipStatus))]
     public class NetworkObjectOwnership : PropertyDrawer
     {
@@ -188,4 +192,5 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             EditorGUI.EndProperty();
         }
     }
+#endif
 }

com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef

@@ -53,6 +53,11 @@
             "name": "com.unity.transport",
             "expression": "2.0",
             "define": "UTP_TRANSPORT_2_0_ABOVE"
+        },
+        {
+            "name": "com.unity.services.multiplayer",
+            "expression": "0.2.0",
+            "define": "MULTIPLAYER_SDK_INSTALLED"
         }
     ],
     "noEngineReferences": false

com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs

@@ -195,7 +195,9 @@ public T Update(float deltaTime, double renderTime, double serverTime)
                 double range = m_EndTimeConsumed - m_StartTimeConsumed;
                 if (range > k_SmallValue)
                 {
-                    t = (float)((renderTime - m_StartTimeConsumed) / range);
+                    var rangeFactor = 1.0f / (float)range;
+
+                    t = ((float)renderTime - (float)m_StartTimeConsumed) * rangeFactor;
 
                     if (t < 0.0f)
                     {