wip

Editor/API/AnimatorServices/ICommitable.cs

@@ -2,6 +2,7 @@
 
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using JetBrains.Annotations;
 using UnityEngine;
 
@@ -43,6 +44,12 @@ public CommitContext(IPlatformAnimatorBindings platform)
         {
             _platform = platform;
         }
+
+        internal IEnumerable<UnityEngine.Object> AllObjects => _commitCache.Values.Select(o =>
+        {
+            if (o is UnityEngine.Object unityObj) return unityObj;
+            return null;
+        }).Where(o => o != null)!;
 
         [return: NotNullIfNotNull("obj")]
         internal R? CommitObject<R>(ICommitable<R>? obj) where R : class

Editor/API/AnimatorServices/PlatformBindings/VRChatPlatformAnimatorBindings.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using HarmonyLib;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
@@ -97,6 +98,13 @@ public bool IsSpecialMotion(Motion m)
 
             if (!root.TryGetComponent<VRCAvatarDescriptor>(out var vrcAvatarDescriptor)) yield break;
 
+            // Initialize the VRChat avatar descriptor. Unfortunately the only way to do this is to run the editor for
+            // it. Ick.
+            var editor = Editor.CreateEditor(vrcAvatarDescriptor);
+            var onEnable = AccessTools.Method(editor.GetType(), "OnEnable");
+            onEnable?.Invoke(editor, null);
+            UnityEngine.Object.DestroyImmediate(editor);
+
             // TODO: Fallback layers
             foreach (var layer in vrcAvatarDescriptor.baseAnimationLayers)
             {
@@ -135,6 +143,8 @@ IDictionary<object, RuntimeAnimatorController> controllers
 
             GenericPlatformAnimatorBindings.Instance.CommitControllers(root, controllers);
 
+            vrcAvatarDescriptor.customizeAnimationLayers = true;
+
             void EditLayers(VRCAvatarDescriptor.CustomAnimLayer[] layers)
             {
                 for (var i = 0; i < layers.Length; i++)

Editor/API/AnimatorServices/VirtualControllerContext.cs

@@ -148,8 +148,17 @@ public void OnDeactivate(BuildContext context)
                         commitContext.ActiveInnateLayerKey = kv.Key;
                         return (RuntimeAnimatorController)commitContext.CommitObject(kv.Value.VirtualController!);
                     });
-
-            _platformBindings!.CommitControllers(root, controllers);
+
+            using (var scope = context.OpenSerializationScope())
+            {
+                _platformBindings!.CommitControllers(root, controllers);
+
+                // Save all animator objects to prevent references from breaking later
+                foreach (var obj in commitContext.AllObjects)
+                {
+                    context.AssetSaver.SaveAsset(obj);
+                }
+            }
         }
 
         public IEnumerable<VirtualAnimatorController> GetAllControllers()

Editor/API/BuildContext.cs

@@ -15,6 +15,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Profiling;
+using VRC.SDK3.Avatars.Components;
 using Debug = UnityEngine.Debug;
 using UnityObject = UnityEngine.Object;
 
@@ -378,16 +379,16 @@ public void DeactivateAllExtensionContexts()
             }
         }
 
-        public T ActivateExtensionContextRecurse<T>() where T : IExtensionContext
+        public T ActivateExtensionContextRecursive<T>() where T : IExtensionContext
         {
-            return (T) ActivateExtensionContextRecurse(typeof(T));
+            return (T) ActivateExtensionContextRecursive(typeof(T));
         }
 
-        public IExtensionContext ActivateExtensionContextRecurse(Type ty)
+        public IExtensionContext ActivateExtensionContextRecursive(Type ty)
         {
             foreach (var dependency in ty.ContextDependencies())
             {
-                ActivateExtensionContextRecurse(dependency);
+                ActivateExtensionContextRecursive(dependency);
             }
 
             return ActivateExtensionContext(ty);