Change how runtime animator overrides are managed

Author: liamlutton

Runtime/Code/Player/Character/Animation/CharacterAnimationHelper.cs

@@ -62,19 +62,19 @@ private void Awake() {
         }
 
      //   // Make a new instance of the animator override controller
-     //   if (!this.animatorOverride) {
-     //       if (this.animator.runtimeAnimatorController is AnimatorOverrideController over) {
-     //           // Copy all the overrides if we already have an override controller in use
-     //           var overrides = new List<KeyValuePair<AnimationClip, AnimationClip>>(over.overridesCount);
-     //           over.GetOverrides(overrides);
-     //           this.animatorOverride = new AnimatorOverrideController(animator.runtimeAnimatorController);
-     //           this.animator.runtimeAnimatorController = this.animatorOverride;
-     //           this.animatorOverride.ApplyOverrides(overrides);
-     //       } else {
-     //           this.animatorOverride = new AnimatorOverrideController(animator.runtimeAnimatorController);
-     //           this.animator.runtimeAnimatorController = this.animatorOverride;
-     //       }
-     //   }
+     if (!this.animatorOverride) {
+         if (this.animator.runtimeAnimatorController is AnimatorOverrideController over) {
+             // Copy all the overrides if we already have an override controller in use
+             var overrides = new List<KeyValuePair<AnimationClip, AnimationClip>>(over.overridesCount);
+             over.GetOverrides(overrides);
+             this.animatorOverride = new AnimatorOverrideController(animator.runtimeAnimatorController);
+             this.animator.runtimeAnimatorController = this.animatorOverride;
+             this.animatorOverride.ApplyOverrides(overrides);
+         } else {
+             this.animatorOverride = new AnimatorOverrideController(animator.runtimeAnimatorController);
+             this.animator.runtimeAnimatorController = this.animatorOverride;
+         }
+     }
     }
 
     private void Start() {
@@ -257,6 +257,7 @@ public void PlayAnimation(AnimationClip clip, CharacterAnimationLayer layer, flo
         }
 
         animatorOverride = animator.runtimeAnimatorController as AnimatorOverrideController;
+        // Debug.Log($"Inst id: {animator.runtimeAnimatorController.GetInstanceID()}");
 
         var stateName = "Override" + (int)layer;
 

Runtime/Code/Player/Character/Animation/ClipReplacer/AnimatorClipReplacer.cs

@@ -8,8 +8,9 @@ namespace Code.Player.Character
 {
     [ExecuteInEditMode]
     [LuauAPI]
-    public class AnimatorClipReplacer : MonoBehaviour
-    {
+    public class AnimatorClipReplacer : MonoBehaviour {
+        private static Dictionary<Animator, AnimatorOverrideController> _overrideControllers = new ();
+        
         /// <summary>
         /// Holds a reference to the animator-related object, which can be an <see cref="Animator"/>, 
         /// <see cref="GameObject"/>, or <see cref="AnimatorOverrideController"/>.
@@ -73,7 +74,10 @@ public void ReplaceClips(Object controller)
             }
         }
 
-
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        public static void ResetOnLoad() {
+            _overrideControllers.Clear();
+        }
 
         /// <summary>
         /// Overload that directly applies clip replacements to the given <see cref="AnimatorOverrideController"/>.
@@ -141,6 +145,7 @@ private void ReplaceClipsInternal(AnimatorOverrideController overrideController)
                 var originalClip = overrides[i].Key;
                 if (animationMap.TryGetValue(originalClip.name, out var newClip))
                 {
+                    Debug.Log("Replacing " + originalClip.name + " in favor of " + newClip.name);
                     if (newClip != null)
                     {
                         newOverrides[i] = new KeyValuePair<AnimationClip, AnimationClip>(originalClip, newClip);
@@ -273,8 +278,12 @@ private bool TryGetOverrideController(Object controller, out AnimatorOverrideCon
         {
             overrideController = null;
 
-            if (controller is Animator animator)
-            {      
+            if (controller is Animator animator) {
+                if (_overrideControllers.TryGetValue(animator, out var oc)) {
+                    overrideController = oc;
+                    return true;
+                }
+                
                 overrideController = animator.runtimeAnimatorController as AnimatorOverrideController;
 
                 if (Application.isPlaying)
@@ -283,9 +292,10 @@ private bool TryGetOverrideController(Object controller, out AnimatorOverrideCon
                     AnimatorOverrideController instanaceAnimator = new(animator.runtimeAnimatorController);
                     var overrides = new List<KeyValuePair<AnimationClip, AnimationClip>>(overrideController.overridesCount);
                     overrideController.GetOverrides(overrides);
-
+                    
                     instanaceAnimator.ApplyOverrides(overrides);
                     animator.runtimeAnimatorController = instanaceAnimator;
+                    _overrideControllers[animator] = instanaceAnimator; 
 
                     overrideController = animator.runtimeAnimatorController as AnimatorOverrideController;
                 }