bdunderscore · kaikoga · Oct 19, 2023 · Oct 19, 2023 · Oct 21, 2023 · Oct 22, 2023
diff --git a/Editor/Animation/AnimationDatabase.cs b/Editor/Animation/AnimationDatabase.cs
@@ -128,6 +128,8 @@ internal void OnActivate(ndmf.BuildContext context)
 #if MA_VRCSDK3_AVATARS
             var avatarDescriptor = context.AvatarDescriptor;
 
+            if (!avatarDescriptor) return;
+
             foreach (var layer in avatarDescriptor.baseAnimationLayers)
             {
                 BootstrapLayer(layer);

diff --git a/Editor/Animation/AnimationUtil.cs b/Editor/Animation/AnimationUtil.cs
@@ -51,9 +51,12 @@ internal static void CloneAllControllers(BuildContext context)
             // This helps reduce the risk that we'll accidentally modify the original assets.
 
 #if MA_VRCSDK3_AVATARS
-            context.AvatarDescriptor.baseAnimationLayers =
+            var avatarDescriptor = context.AvatarDescriptor;
+            if (!avatarDescriptor) return;
+
+            avatarDescriptor.baseAnimationLayers =
                 CloneLayers(context, context.AvatarDescriptor.baseAnimationLayers);
-            context.AvatarDescriptor.specialAnimationLayers =
+            avatarDescriptor.specialAnimationLayers =
                 CloneLayers(context, context.AvatarDescriptor.specialAnimationLayers);
 #endif
         }

diff --git a/Editor/FixupPasses/FixupExpressionsMenuPass.cs b/Editor/FixupPasses/FixupExpressionsMenuPass.cs
@@ -19,6 +19,8 @@ internal class FixupExpressionsMenuPass
 
         internal static void FixupExpressionsMenu(BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             context.AvatarDescriptor.customExpressions = true;
 
             var expressionsMenu = context.AvatarDescriptor.expressionsMenu;

diff --git a/Editor/Inspector/VRM.meta b/Editor/Inspector/VRM.meta
diff --git a/Editor/Inspector/VRM/MergeVRM1SpringBonesEditor.cs b/Editor/Inspector/VRM/MergeVRM1SpringBonesEditor.cs
@@ -0,0 +1,31 @@
+#if MA_VRM1
+
+using nadena.dev.modular_avatar.core.vrm;
+using UnityEditor;
+using static nadena.dev.modular_avatar.core.editor.Localization;
+
+namespace nadena.dev.modular_avatar.core.editor.vrm
+{
+    [CustomEditor(typeof(ModularAvatarMergeVRM1SpringBones))]
+    internal class MergeVRM1SpringBonesEditor : MAEditorBase
+    {
+        private SerializedProperty _prop_collider_groups;
+        private SerializedProperty _prop_springs;
+
+        private void OnEnable()
+        {
+            _prop_collider_groups = serializedObject.FindProperty(nameof(ModularAvatarMergeVRM1SpringBones.colliderGroups));
+            _prop_springs = serializedObject.FindProperty(nameof(ModularAvatarMergeVRM1SpringBones.springs));
+        }
+
+        protected override void OnInnerInspectorGUI()
+        {
+            EditorGUILayout.PropertyField(_prop_collider_groups, G("merge_vrm1_spring_bones.collider_groups"));
+            EditorGUILayout.PropertyField(_prop_springs, G("merge_vrm1_spring_bones.springs"));
+            serializedObject.ApplyModifiedProperties();
+            ShowLanguageUI();
+        }
+    }
+}
+
+#endif
diff --git a/Editor/Inspector/VRM/MergeVRM1SpringBonesEditor.cs.meta b/Editor/Inspector/VRM/MergeVRM1SpringBonesEditor.cs.meta
diff --git a/Editor/Localization/en-US.json b/Editor/Localization/en-US.json
@@ -95,6 +95,8 @@
   "merge_blend_tree.path_mode.tooltip": "How to interpret paths in animations. Using relative mode lets you record animations from an animator on this object.",
   "merge_blend_tree.relative_path_root": "Relative Path Root",
   "merge_blend_tree.relative_path_root.tooltip": "The root object to use when interpreting relative paths. If not specified, the object this component is attached to will be used.",
+  "merge_vrm1_spring_bones.collider_groups": "Collider Groups",
+  "merge_vrm1_spring_bones.springs": "Springs",
   "worldfixed.quest": "This component is not compatible with Android builds and will have no effect.",
   "worldfixed.normal": "This object will be fixed to world unless you fixed to avatar with constraint.",
   "fpvisible.normal": "This object will be visible in your first person view.",

diff --git a/Editor/MergeAnimatorProcessor.cs b/Editor/MergeAnimatorProcessor.cs
@@ -65,6 +65,7 @@ internal void OnPreprocessAvatar(GameObject avatarGameObject, BuildContext conte
             mergeSessions.Clear();
 
             var descriptor = avatarGameObject.GetComponent<VRCAvatarDescriptor>();
+            if (!descriptor) return;
 
             if (descriptor.baseAnimationLayers != null) InitSessions(descriptor.baseAnimationLayers);
             if (descriptor.specialAnimationLayers != null) InitSessions(descriptor.specialAnimationLayers);

diff --git a/Editor/MergeArmatureHook.cs b/Editor/MergeArmatureHook.cs
@@ -36,6 +36,15 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Animations;
+
+#if MA_VRM0
+using VRM;
+#endif
+
+#if MA_VRM1
+using UniVRM10;
+#endif
+
 using Object = UnityEngine.Object;
 
 #endregion
@@ -109,6 +118,35 @@ internal void OnPreprocessAvatar(ndmf.BuildContext context, GameObject avatarGam
             }
 #endif
 
+#if MA_VRM0
+            foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRMSpringBone>(true))
+            {
+                RetainBoneReferences(c);
+            }
+
+            foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRMSpringBoneColliderGroup>(true))
+            {
+                RetainBoneReferences(c);
+            }
+#endif
+
+#if MA_VRM1
+            foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRM10SpringBoneJoint>(true))
+            {
+                RetainBoneReferences(c);
+            }
+
+            foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRM10SpringBoneCollider>(true))
+            {
+                RetainBoneReferences(c);
+            }
+
+            foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRM10SpringBoneColliderGroup>(true))
+            {
+                RetainBoneReferences(c);
+            }
+#endif
+
             foreach (var c in avatarGameObject.transform.GetComponentsInChildren<IConstraint>(true))
             {
                 RetainBoneReferences(c as Component);
@@ -477,5 +515,7 @@ private void PruneDuplicatePhysBones()
             }
         }
 #endif
+
+        // TODO - deduplicate VRM0/1 SpringBone components... doesn't break avatars either
     }
 }
diff --git a/Editor/OptimizationPasses/GCGameObjectsPass.cs b/Editor/OptimizationPasses/GCGameObjectsPass.cs
@@ -7,6 +7,10 @@
 using VRC.SDK3.Dynamics.PhysBone.Components;
 #endif
 
+#if MA_VRM0
+using VRM;
+#endif
+
 namespace nadena.dev.modular_avatar.core.editor
 {
     /// <summary>
@@ -66,6 +70,13 @@ private void MarkAll()
                             break;
 #endif
 
+#if MA_VRM0
+                        case VRMSpringBone sb:
+                            MarkObject(obj);
+                            MarkSpringBone(sb);
+                            break;
+#endif
+
                         case AvatarTagComponent _:
                             // Tag components will not be retained at runtime, so pretend they're not there.
                             break;
@@ -147,6 +158,22 @@ private void MarkPhysBone(VRCPhysBone pb)
         }
 #endif
 
+#if MA_VRM0
+        private void MarkSpringBone(VRMSpringBone sb)
+        {
+            foreach (var rootBone in sb.RootBones)
+            {
+                foreach (var obj in GameObjects(rootBone.gameObject))
+                {
+                    MarkObject(obj);
+                }
+            }
+
+            // Mark etc
+            MarkAllReferencedObjects(sb);
+        }
+#endif
+
         private void MarkAllReferencedObjects(Component component)
         {
             var so = new SerializedObject(component);

diff --git a/Editor/OptimizationPasses/PruneParametersPass.cs b/Editor/OptimizationPasses/PruneParametersPass.cs
@@ -9,6 +9,8 @@ internal class PruneParametersPass : Pass<PruneParametersPass>
     {
         protected override void Execute(ndmf.BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             var expParams = context.AvatarDescriptor.expressionParameters;
             if (expParams != null && context.IsTemporaryAsset(expParams))
             {

diff --git a/Editor/PluginDefinition/PluginDefinition.cs b/Editor/PluginDefinition/PluginDefinition.cs
@@ -12,6 +12,10 @@
 
 #endregion
 
+#if MA_VRM0 || MA_VRM1
+using nadena.dev.modular_avatar.core.editor.vrm;
+#endif
+
 [assembly: ExportsPlugin(
     typeof(PluginDefinition)
 )]
@@ -57,6 +61,9 @@ protected override void Configure()
                 seq.WithRequiredExtension(typeof(AnimationServicesContext), _s2 =>
                 {
                     seq.Run(MergeArmaturePluginPass.Instance);
+#if MA_VRM1
+                    seq.Run(MergeVRM1SpringBonesPass.Instance);
+#endif
                     seq.Run(BoneProxyPluginPass.Instance);
                     seq.Run(VisibleHeadAccessoryPluginPass.Instance);
                     seq.Run("World Fixed Object",
@@ -125,7 +132,7 @@ protected override void Execute(ndmf.BuildContext context)
         }
     }
 
-    abstract class MAPass<T> : Pass<T> where T : Pass<T>, new()
+    internal abstract class MAPass<T> : Pass<T> where T : Pass<T>, new()
     {
         protected BuildContext MAContext(ndmf.BuildContext context)
         {

diff --git a/Editor/RenameParametersHook.cs b/Editor/RenameParametersHook.cs
@@ -183,6 +183,8 @@ private void SetExpressionParameters(GameObject avatarRoot, ImmutableDictionary<
                 .ToImmutableDictionary();
 
             var avatar = avatarRoot.GetComponent<VRCAvatarDescriptor>();
+            if (!avatar) return;
+
             var expParams = avatar.expressionParameters;
 
             if (expParams == null)

diff --git a/Editor/VRM.meta b/Editor/VRM.meta
diff --git a/Editor/VRM/MergeVRM1SpringBonesPass.cs b/Editor/VRM/MergeVRM1SpringBonesPass.cs
@@ -0,0 +1,46 @@
+#if MA_VRM1
+
+using System.Linq;
+using nadena.dev.ndmf;
+using nadena.dev.modular_avatar.core.vrm;
+
+using UniVRM10;
+
+namespace nadena.dev.modular_avatar.core.editor.vrm
+{
+    internal class MergeVRM1SpringBonesPass : Pass<MergeVRM1SpringBonesPass>
+    {
+        protected override void Execute(ndmf.BuildContext context)
+        {
+            var processor = new MergeVRM1SpringBoneProcessor();
+            processor.ProcessVRM1(context);
+        }
+    }
+
+    internal class MergeVRM1SpringBoneProcessor
+    {
+        public void ProcessVRM1(ndmf.BuildContext context)
+        {
+            var rootTransform = context.AvatarRootObject;
+            var vrmInstance = rootTransform.GetComponent<Vrm10Instance>();
+            if (!vrmInstance) return;
+
+            var sources = rootTransform.GetComponentsInChildren<ModularAvatarMergeVRM1SpringBones>(); 
+
+            vrmInstance.SpringBone.ColliderGroups = vrmInstance.SpringBone.ColliderGroups
+                .Concat(sources.SelectMany(bone => bone.colliderGroups))
+                .ToList();
+
+            vrmInstance.SpringBone.Springs = vrmInstance.SpringBone.Springs
+                .Concat(sources.SelectMany(bone => bone.springs))
+                .ToList();
+
+            foreach (var source in sources)
+            {
+                UnityEngine.Object.DestroyImmediate(source);
+            }
+        }
+    }
+}
+
+#endif
diff --git a/Editor/VRM/MergeVRM1SpringBonesPass.cs.meta b/Editor/VRM/MergeVRM1SpringBonesPass.cs.meta
diff --git a/Editor/nadena.dev.modular-avatar.core.editor.asmdef b/Editor/nadena.dev.modular-avatar.core.editor.asmdef
@@ -6,7 +6,9 @@
         "VRC.SDK3A",
         "VRC.SDKBase",
         "nadena.dev.ndmf",
-        "nadena.dev.ndmf.vrchat"
+        "nadena.dev.ndmf.vrchat",
+        "VRM",
+        "VRM10"
     ],
     "includePlatforms": [
         "Editor"
@@ -41,6 +43,16 @@
             "name": "com.vrchat.avatars",
             "expression": "",
             "define": "MA_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "MA_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "MA_VRM1"
         }
     ],
     "noEngineReferences": false

diff --git a/Runtime/VRM.meta b/Runtime/VRM.meta
diff --git a/Runtime/VRM/ModularAvatarMergeVRM1SpringBones.cs b/Runtime/VRM/ModularAvatarMergeVRM1SpringBones.cs
@@ -0,0 +1,18 @@
+#if MA_VRM1
+
+using System.Collections.Generic;
+using UnityEngine;
+using UniVRM10;
+
+namespace nadena.dev.modular_avatar.core.vrm
+{
+    [AddComponentMenu("Modular Avatar/MA Merge VRM1 SpringBones")]
+    [DisallowMultipleComponent]
+    public class ModularAvatarMergeVRM1SpringBones : AvatarTagComponent
+    {
+        public List<VRM10SpringBoneColliderGroup> colliderGroups = new List<VRM10SpringBoneColliderGroup>();
+        public List<Vrm10InstanceSpringBone.Spring> springs = new List<Vrm10InstanceSpringBone.Spring>();
+    }
+}
+
+#endif
diff --git a/Runtime/VRM/ModularAvatarMergeVRM1SpringBones.cs.meta b/Runtime/VRM/ModularAvatarMergeVRM1SpringBones.cs.meta
diff --git a/Runtime/nadena.dev.modular-avatar.core.asmdef b/Runtime/nadena.dev.modular-avatar.core.asmdef
@@ -3,7 +3,9 @@
     "rootNamespace": "",
     "references": [
         "Unity.Burst",
-        "nadena.dev.ndmf.runtime"
+        "nadena.dev.ndmf.runtime",
+        "VRM",
+        "VRM10"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -24,6 +26,16 @@
             "name": "com.vrchat.avatars",
             "expression": "",
             "define": "MA_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "MA_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "MA_VRM1"
         }
     ],
     "noEngineReferences": false