fix: networktransform double lerp (MTTB-539)

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -10,11 +10,15 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
+- Added interpolator types as an inspector view selection for position, rotation, and scale. (#3337)
+- Added a new smooth dampening interpolator type that provides a nice balance between precision and smoothing results. (#3337)
+- Added `NetworkTimeSystem.TickLatency` property that provides the average latency of a client. (#3337)
 - Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset and the `ArraySegment.Count` as the `FastBufferReader` length. (#3321)
 - Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator, int length = -1)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset. (#3321)
 
 ### Fixed
 
+- Fixed issue where the `MaximumInterpolationTime` could not be modified from within the inspector view or runtime. (#3337)
 - Fixed `ChangeOwnership` changing ownership to clients that are not observers. This also happened with automated object distribution. (#3323)
 - Fixed issue where `AnticipatedNetworkVariable` previous value returned by `AnticipatedNetworkVariable.OnAuthoritativeValueChanged` is updated correctly on the non-authoritative side. (#3306)
 - Fixed `OnClientConnectedCallback` passing incorrect `clientId` when scene management is disabled. (#3312)
@@ -31,6 +35,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Changed
 
+- Changed `BufferedLinearInterpolator<T>.Update(float deltaTime, NetworkTime serverTime)` as being deprecated since this method is only used for internal testing purposes. (#3337)
 - Ensured that a useful error is thrown when attempting to build a dedicated server with Unity Transport that uses websockets. (#3336)
 - Changed root in-scene placed `NetworkObject` instances now will always have either the `Distributable` permission set unless the `SessionOwner` permission is set. (#3305)
 - Changed the `DestroyObject` message to reduce the serialized message size and remove the unnecessary message field. (#3304)

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

@@ -11,11 +11,30 @@ namespace Unity.Netcode.Editor
     [CanEditMultipleObjects]
     public partial class NetcodeEditorBase<TT> : UnityEditor.Editor where TT : MonoBehaviour
     {
+        private const int k_IndentOffset = 15;
+
         /// <inheritdoc cref="UnityEditor.Editor.OnEnable"/>
         public virtual void OnEnable()
         {
         }
 
+        /// <summary>
+        /// Will draw a property field with an indention level using the default or a specified offset per indention.
+        /// </summary>
+        /// <param name="property">The serialized property to draw as a default field</param>
+        /// <param name="indentLevel">The indention level.</param>
+        /// <param name="offset">Optional indention level offset.</param>
+        protected internal void DrawIndentedPropertyField(SerializedProperty property, int indentLevel, int offset = k_IndentOffset)
+        {
+            var originalWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = originalWidth - (indentLevel * offset);
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.Space(indentLevel * offset, false);
+            EditorGUILayout.PropertyField(property, GUILayout.ExpandWidth(true));
+            EditorGUILayout.EndHorizontal();
+            EditorGUIUtility.labelWidth = originalWidth;
+        }
+
         /// <summary>
         /// Helper method to draw the properties of the specified child type <typeparamref name="T"/> component within a FoldoutHeaderGroup.
         /// </summary>

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

@@ -28,6 +28,13 @@ public class NetworkTransformEditor : NetcodeEditorBase<NetworkTransform>
         private SerializedProperty m_ScaleThresholdProperty;
         private SerializedProperty m_InLocalSpaceProperty;
         private SerializedProperty m_InterpolateProperty;
+        private SerializedProperty m_PositionInterpolationTypeProperty;
+        private SerializedProperty m_RotationInterpolationTypeProperty;
+        private SerializedProperty m_ScaleInterpolationTypeProperty;
+
+        private SerializedProperty m_PositionMaximumInterpolationTimeProperty;
+        private SerializedProperty m_RotationMaximumInterpolationTimeProperty;
+        private SerializedProperty m_ScaleMaximumInterpolationTimeProperty;
 
         private SerializedProperty m_UseQuaternionSynchronization;
         private SerializedProperty m_UseQuaternionCompression;
@@ -36,6 +43,7 @@ public class NetworkTransformEditor : NetcodeEditorBase<NetworkTransform>
         private SerializedProperty m_AuthorityMode;
 
         private static int s_ToggleOffset = 45;
+
         private static float s_MaxRowWidth = EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + 5;
         private static GUIContent s_PositionLabel = EditorGUIUtility.TrTextContent("Position");
         private static GUIContent s_RotationLabel = EditorGUIUtility.TrTextContent("Rotation");
@@ -61,6 +69,15 @@ public override void OnEnable()
             m_ScaleThresholdProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleThreshold));
             m_InLocalSpaceProperty = serializedObject.FindProperty(nameof(NetworkTransform.InLocalSpace));
             m_InterpolateProperty = serializedObject.FindProperty(nameof(NetworkTransform.Interpolate));
+
+            m_PositionInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.PositionInterpolationType));
+            m_PositionMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.PositionMaxInterpolationTime));
+            m_RotationInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.RotationInterpolationType));
+            m_RotationMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.RotationMaxInterpolationTime));
+            m_ScaleInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleInterpolationType));
+            m_ScaleMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleMaxInterpolationTime));
+
+
             m_UseQuaternionSynchronization = serializedObject.FindProperty(nameof(NetworkTransform.UseQuaternionSynchronization));
             m_UseQuaternionCompression = serializedObject.FindProperty(nameof(NetworkTransform.UseQuaternionCompression));
             m_UseHalfFloatPrecision = serializedObject.FindProperty(nameof(NetworkTransform.UseHalfFloatPrecision));
@@ -141,9 +158,21 @@ private void DisplayNetworkTransformProperties()
             }
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Thresholds", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_PositionThresholdProperty);
-            EditorGUILayout.PropertyField(m_RotAngleThresholdProperty);
-            EditorGUILayout.PropertyField(m_ScaleThresholdProperty);
+            if (networkTransform.SynchronizePosition)
+            {
+                EditorGUILayout.PropertyField(m_PositionThresholdProperty);
+            }
+
+            if (networkTransform.SynchronizeRotation)
+            {
+                EditorGUILayout.PropertyField(m_RotAngleThresholdProperty);
+            }
+
+            if (networkTransform.SynchronizeScale)
+            {
+                EditorGUILayout.PropertyField(m_ScaleThresholdProperty);
+            }
+
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Delivery", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(m_TickSyncChildren);
@@ -159,8 +188,39 @@ private void DisplayNetworkTransformProperties()
             if (!networkTransform.HideInterpolateValue)
             {
                 EditorGUILayout.PropertyField(m_InterpolateProperty);
+                if (networkTransform.Interpolate)
+                {
+                    if (networkTransform.SynchronizePosition)
+                    {
+                        DrawIndentedPropertyField(m_PositionInterpolationTypeProperty, 1);
+                        // Only display when using Lerp.
+                        if (networkTransform.PositionInterpolationType == NetworkTransform.InterpolationTypes.Lerp)
+                        {
+                            DrawIndentedPropertyField(m_SlerpPosition, 2);
+                            DrawIndentedPropertyField(m_PositionMaximumInterpolationTimeProperty, 2);
+                        }
+                    }
+                    if (networkTransform.SynchronizeRotation)
+                    {
+                        DrawIndentedPropertyField(m_RotationInterpolationTypeProperty, 1);
+                        // Only display when using Lerp.
+                        if (networkTransform.RotationInterpolationType == NetworkTransform.InterpolationTypes.Lerp)
+                        {
+                            DrawIndentedPropertyField(m_RotationMaximumInterpolationTimeProperty, 2);
+                        }
+                    }
+                    if (networkTransform.SynchronizeScale)
+                    {
+                        DrawIndentedPropertyField(m_ScaleInterpolationTypeProperty, 1);
+                        // Only display when using Lerp.
+                        if (networkTransform.ScaleInterpolationType == NetworkTransform.InterpolationTypes.Lerp)
+                        {
+                            DrawIndentedPropertyField(m_ScaleMaximumInterpolationTimeProperty, 2);
+                        }
+                    }
+                }
             }
-            EditorGUILayout.PropertyField(m_SlerpPosition);
+
             EditorGUILayout.PropertyField(m_UseQuaternionSynchronization);
             if (m_UseQuaternionSynchronization.boolValue)
             {
@@ -190,8 +250,6 @@ private void DisplayNetworkTransformProperties()
 #endif // COM_UNITY_MODULES_PHYSICS2D
         }
 
-
-
         /// <inheritdoc/>
         public override void OnInspectorGUI()
         {

com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs

@@ -74,9 +74,7 @@ private void SerializeRead(FastBufferReader reader)
             }
         }
 
-        /// <summary>
-        /// The serialization implementation of <see cref="INetworkSerializable"/>.
-        /// </summary>
+        /// <inheritdoc />
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             if (serializer.IsReader)

com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs

@@ -58,9 +58,7 @@ private void SerializeRead(FastBufferReader reader)
             }
         }
 
-        /// <summary>
-        /// The serialization implementation of <see cref="INetworkSerializable"/>.
-        /// </summary>
+        /// <inheritdoc />
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             if (serializer.IsReader)