(MIGRATION) Fix all compilation issues

2023-10-02 04:47:57 +02:00
parent c4174120b9
commit af5ce1576b
24 changed files with 185 additions and 95 deletions
@@ -0,0 +1,88 @@
+using System;
+using System.Linq;
+using UnityEditor.Animations;
+using VRC.SDK3.Avatars.Components;
+
+// ReSharper disable once CheckNamespace
+namespace AnimatorAsCode.V1.VRCDestructiveWorkflow
+{
+    // ReSharper disable once InconsistentNaming
+    public static class AacV1VRCDestructiveWorkflowExtensions
+    {
+        private interface IAdditionalDataAvatarDescriptor {}
+        
+        public static AacConfiguration WithAvatarDescriptor(this AacConfiguration that, VRCAvatarDescriptor avatarDescriptor)
+        {
+            return that.WithAdditonalData(typeof(IAdditionalDataAvatarDescriptor), avatarDescriptor);
+        }
+        
+        public static AacFlLayer CreateMainFxLayer(this AacFlBase that) => DoCreateMainLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.FX);
+        public static AacFlLayer CreateMainGestureLayer(this AacFlBase that) => DoCreateMainLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Gesture);
+        public static AacFlLayer CreateMainActionLayer(this AacFlBase that) => DoCreateMainLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Action);
+        public static AacFlLayer CreateMainIdleLayer(this AacFlBase that) => DoCreateMainLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Additive);
+        public static AacFlLayer CreateMainLocomotionLayer(this AacFlBase that) => DoCreateMainLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Base);
+        public static AacFlLayer CreateMainAv3Layer(this AacFlBase that, VRCAvatarDescriptor.AnimLayerType animLayerType) => DoCreateMainLayerOnController(that, animLayerType);
+
+        public static AacFlLayer CreateSupportingFxLayer(this AacFlBase that, string suffix) => DoCreateSupportingLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.FX, suffix);
+        public static AacFlLayer CreateSupportingGestureLayer(this AacFlBase that, string suffix) => DoCreateSupportingLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Gesture, suffix);
+        public static AacFlLayer CreateSupportingActionLayer(this AacFlBase that, string suffix) => DoCreateSupportingLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Action, suffix);
+        public static AacFlLayer CreateSupportingIdleLayer(this AacFlBase that, string suffix) => DoCreateSupportingLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Additive, suffix);
+        public static AacFlLayer CreateSupportingLocomotionLayer(this AacFlBase that, string suffix) => DoCreateSupportingLayerOnController(that, VRCAvatarDescriptor.AnimLayerType.Base, suffix);
+        public static AacFlLayer CreateSupportingAv3Layer(this AacFlBase that, VRCAvatarDescriptor.AnimLayerType animLayerType, string suffix) => DoCreateSupportingLayerOnController(that, animLayerType, suffix);
+
+        private static AacFlLayer DoCreateMainLayerOnController(AacFlBase that, VRCAvatarDescriptor.AnimLayerType animType)
+        {
+            var animator = AnimatorOf(AvatarDescriptor(that), animType);
+            var layerName = that.InternalConfiguration().DefaultsProvider.ConvertLayerName(that.InternalConfiguration().SystemName);
+
+            return that.InternalDoCreateLayer(animator, layerName);
+        }
+
+        private static AacFlLayer DoCreateSupportingLayerOnController(AacFlBase that, VRCAvatarDescriptor.AnimLayerType animType, string suffix)
+        {
+            var animator = AnimatorOf(AvatarDescriptor(that), animType);
+            var layerName = that.InternalConfiguration().DefaultsProvider.ConvertLayerNameWithSuffix(that.InternalConfiguration().SystemName, suffix);
+
+            return that.InternalDoCreateLayer(animator, layerName);
+        }
+
+        internal static AnimatorController AnimatorOf(VRCAvatarDescriptor ad, VRCAvatarDescriptor.AnimLayerType animLayerType)
+        {
+            return (AnimatorController) ad.baseAnimationLayers.First(it => it.type == animLayerType).animatorController;
+        }
+
+        public static void RemoveAllMainLayers(this AacFlBase that)
+        {
+            var layerName = that.InternalConfiguration().SystemName;
+            RemoveLayerOnAllControllers(that, that.InternalConfiguration().DefaultsProvider.ConvertLayerName(layerName));
+        }
+
+        public static void RemoveAllSupportingLayers(this AacFlBase that, string suffix)
+        {
+            var layerName = that.InternalConfiguration().SystemName;
+            RemoveLayerOnAllControllers(that, that.InternalConfiguration().DefaultsProvider.ConvertLayerNameWithSuffix(layerName, suffix));
+        }
+
+        private static void RemoveLayerOnAllControllers(AacFlBase that, string layerName)
+        {
+            var layers = AvatarDescriptor(that).baseAnimationLayers.Select(layer => layer.animatorController).Where(layer => layer != null).Distinct().ToList();
+            foreach (var customAnimLayer in layers)
+            {
+                new AacAnimatorRemoval((AnimatorController) customAnimLayer).RemoveLayer(that.InternalConfiguration().DefaultsProvider.ConvertLayerName(layerName));
+            }
+        }
+
+        private static VRCAvatarDescriptor AvatarDescriptor(AacFlBase that)
+        {
+            var foundAvatarDescriptor =
+                that.InternalConfiguration().TryGetAdditionalData(typeof(IAdditionalDataAvatarDescriptor), out var avatarDescriptor);
+            if (!foundAvatarDescriptor)
+            {
+                throw new InvalidOperationException(
+                    "Could not find avatar descriptor in configuration. Invoke .WithAvatarDescriptor(...) on the configuration object");
+            }
+
+            return (VRCAvatarDescriptor)avatarDescriptor;
+        }
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5f4d323b6ed1494ca4034e5d5e992700
+timeCreated: 1693747417
@@ -0,0 +1,20 @@
+{
+    "name": "AnimatorAsCodeFramework.V1VRCDestructiveWorkflow",
+    "references": [
+        "GUID:7b32145194168e0409534fc5052b85ce"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRCSDKBase.dll",
+        "VRCSDK3A.dll"
+    ],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fab9d4fed7c140bb9801787933ccf7d2
+timeCreated: 1693747371