fix: NetworkAnimator does not update animator's parameters unless the animator's layer changes [MTT-3492]

com.unity.netcode.gameobjects/Components/NetworkAnimator.cs

@@ -1,4 +1,5 @@
 #if COM_UNITY_MODULES_ANIMATION
+using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
@@ -70,8 +71,25 @@ private unsafe struct AnimatorParamCache
             internal fixed byte Value[4]; // this is a max size of 4 bytes
         }
 
+        /// <summary>
+        /// Used to track parameter state change in order to update the changed
+        /// parameters when the animator's layer has not changed
+        /// </summary>
+        private class ParameterState
+        {
+            public AnimatorControllerParameterType AnimatorControllerParameterType;
+            public bool CurrentStateBool;
+            public int CurrentStateInt;
+            public float CurrentStateFloat;
+        }
+
+
+        private Dictionary<int, ParameterState> m_ParameterStates = new Dictionary<int, ParameterState>();
+
         // 128 bytes per Animator
         private FastBufferWriter m_ParameterWriter = new FastBufferWriter(k_MaxAnimationParams * sizeof(float), Allocator.Persistent);
+
+
         private NativeArray<AnimatorParamCache> m_CachedAnimatorParameters;
 
         // We cache these values because UnsafeUtility.EnumToInt uses direct IL that allows a non-boxing conversion
@@ -138,15 +156,29 @@ public override void OnNetworkSpawn()
                         case AnimatorControllerParameterType.Float:
                             var value = m_Animator.GetFloat(cacheParam.Hash);
                             UnsafeUtility.WriteArrayElement(cacheParam.Value, 0, value);
+                            // Track this parameter
+                            if (!m_ParameterStates.ContainsKey(i))
+                            {
+                                m_ParameterStates.Add(i, new ParameterState() { CurrentStateFloat = value, AnimatorControllerParameterType = AnimatorControllerParameterType.Float });
+                            }
                             break;
                         case AnimatorControllerParameterType.Int:
                             var valueInt = m_Animator.GetInteger(cacheParam.Hash);
                             UnsafeUtility.WriteArrayElement(cacheParam.Value, 0, valueInt);
-
+                            // Track this parameter
+                            if (!m_ParameterStates.ContainsKey(i))
+                            {
+                                m_ParameterStates.Add(i, new ParameterState() { CurrentStateInt = valueInt, AnimatorControllerParameterType = AnimatorControllerParameterType.Int });
+                            }
                             break;
                         case AnimatorControllerParameterType.Bool:
                             var valueBool = m_Animator.GetBool(cacheParam.Hash);
                             UnsafeUtility.WriteArrayElement(cacheParam.Value, 0, valueBool);
+                            // Track this parameter
+                            if (!m_ParameterStates.ContainsKey(i))
+                            {
+                                m_ParameterStates.Add(i, new ParameterState() { CurrentStateBool = valueBool, AnimatorControllerParameterType = AnimatorControllerParameterType.Bool });
+                            }
                             break;
                         case AnimatorControllerParameterType.Trigger:
                         default:
@@ -197,7 +229,7 @@ private void FixedUpdate()
             }
         }
 
-        private bool CheckAnimStateChanged(out int stateHash, out float normalizedTime, int layer)
+        unsafe private bool CheckAnimStateChanged(out int stateHash, out float normalizedTime, int layer)
         {
             bool shouldUpdate = false;
             stateHash = 0;
@@ -239,6 +271,43 @@ private bool CheckAnimStateChanged(out int stateHash, out float normalizedTime,
                 }
             }
 
+            // Whether the layer has changed or not, we always check to see if parameters have changed and send updates if they have.
+            for (int i = 0; i < m_CachedAnimatorParameters.Length; i++)
+            {
+                ref var cacheValue = ref UnsafeUtility.ArrayElementAsRef<AnimatorParamCache>(m_CachedAnimatorParameters.GetUnsafePtr(), i);
+                var hash = cacheValue.Hash;
+                if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterInt)
+                {
+                    var valueInt = m_Animator.GetInteger(hash);
+                    var currentState = m_ParameterStates[i].CurrentStateInt;
+                    if (valueInt != currentState)
+                    {
+                        shouldUpdate = true;
+                        break;
+                    }
+                }
+                else if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterBool)
+                {
+                    var valueBool = m_Animator.GetBool(hash);
+                    var currentState = (bool)m_ParameterStates[i].CurrentStateBool;
+                    if (valueBool != currentState)
+                    {
+                        shouldUpdate = true;
+                        break;
+                    }
+                }
+                else if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterFloat)
+                {
+                    var valueFloat = m_Animator.GetFloat(hash);
+                    var currentState = (float)m_ParameterStates[i].CurrentStateFloat;
+                    if (Mathf.Abs(valueFloat - currentState) > 0.00f)
+                    {
+                        shouldUpdate = true;
+                        break;
+                    }
+                }
+            }
+
             return shouldUpdate;
         }
 
@@ -258,6 +327,7 @@ private unsafe void WriteParameters(FastBufferWriter writer)
                 if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterInt)
                 {
                     var valueInt = m_Animator.GetInteger(hash);
+                    m_ParameterStates[i].CurrentStateInt = valueInt;
                     fixed (void* value = cacheValue.Value)
                     {
                         UnsafeUtility.WriteArrayElement(value, 0, valueInt);
@@ -267,6 +337,7 @@ private unsafe void WriteParameters(FastBufferWriter writer)
                 else if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterBool)
                 {
                     var valueBool = m_Animator.GetBool(hash);
+                    m_ParameterStates[i].CurrentStateBool = valueBool;
                     fixed (void* value = cacheValue.Value)
                     {
                         UnsafeUtility.WriteArrayElement(value, 0, valueBool);
@@ -276,6 +347,7 @@ private unsafe void WriteParameters(FastBufferWriter writer)
                 else if (cacheValue.Type == AnimationParamEnumWrapper.AnimatorControllerParameterFloat)
                 {
                     var valueFloat = m_Animator.GetFloat(hash);
+                    m_ParameterStates[i].CurrentStateFloat = valueFloat;
                     fixed (void* value = cacheValue.Value)
                     {
 

testproject/Assets/Tests/Manual/NetworkAnimatorTests/CubeAnimatorController.controller

@@ -193,13 +193,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Pulse
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: TestFloat
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: TestBool
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: TestInt
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer