Merge branch 'main' of github.com:JLChnToZ/modular-avatar

Editor/Animation/AnimationDatabase.cs

@@ -158,6 +158,7 @@ namespace nadena.dev.modular_avatar.animation
 
 #if MA_VRCSDK3_AVATARS
             var avatarDescriptor = context.AvatarDescriptor;
+            if (!avatarDescriptor) return;
 
             foreach (var layer in avatarDescriptor.baseAnimationLayers)
             {

Editor/Animation/AnimationServicesContext.cs

@@ -92,6 +92,8 @@ namespace nadena.dev.modular_avatar.animation
         public void AddPropertyDefinition(AnimatorControllerParameter paramDef)
         {
 #if MA_VRCSDK3_AVATARS
+            if (!_context.AvatarDescriptor) return;
+
             var fx = (AnimatorController)
                 _context.AvatarDescriptor.baseAnimationLayers
                 .First(l => l.type == VRCAvatarDescriptor.AnimLayerType.FX)

Editor/Animation/AnimationUtil.cs

@@ -53,6 +53,8 @@ namespace nadena.dev.modular_avatar.animation
             // This helps reduce the risk that we'll accidentally modify the original assets.
 
 #if MA_VRCSDK3_AVATARS
+            if (!context.AvatarDescriptor) return;
+
             context.AvatarDescriptor.baseAnimationLayers =
                 CloneLayers(context, context.AvatarDescriptor.baseAnimationLayers);
             context.AvatarDescriptor.specialAnimationLayers =

Editor/Animation/PathMappings.cs

@@ -369,21 +369,24 @@ namespace nadena.dev.modular_avatar.animation
             Profiler.EndSample();
 
 #if MA_VRCSDK3_AVATARS
-            var layers = context.AvatarDescriptor.baseAnimationLayers
+            if (context.AvatarDescriptor)
-                .Concat(context.AvatarDescriptor.specialAnimationLayers);
-
-            Profiler.BeginSample("ApplyMappingsToAvatarMasks");
-            foreach (var layer in layers)
             {
-                ApplyMappingsToAvatarMask(layer.mask);
+                var layers = context.AvatarDescriptor.baseAnimationLayers
+                    .Concat(context.AvatarDescriptor.specialAnimationLayers);
 
-                if (layer.animatorController is AnimatorController ac)
+                Profiler.BeginSample("ApplyMappingsToAvatarMasks");
-                    // By this point, all AnimationOverrideControllers have been collapsed into an ephemeral
+                foreach (var layer in layers)
-                    // AnimatorController so we can safely modify the controller in-place.
+                {
-                    foreach (var acLayer in ac.layers)
+                    ApplyMappingsToAvatarMask(layer.mask);
-                        ApplyMappingsToAvatarMask(acLayer.avatarMask);
+
+                    if (layer.animatorController is AnimatorController ac)
+                        // By this point, all AnimationOverrideControllers have been collapsed into an ephemeral
+                        // AnimatorController so we can safely modify the controller in-place.
+                        foreach (var acLayer in ac.layers)
+                            ApplyMappingsToAvatarMask(acLayer.avatarMask);
+                }
+                Profiler.EndSample();
             }
-            Profiler.EndSample();
 #endif
             
             Profiler.EndSample();

Editor/FixupPasses/FixupExpressionsMenuPass.cs

@@ -19,6 +19,8 @@ namespace nadena.dev.modular_avatar.core.editor
 
         internal static void FixupExpressionsMenu(BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             context.AvatarDescriptor.customExpressions = true;
 
             var expressionsMenu = context.AvatarDescriptor.expressionsMenu;

Editor/MergeAnimatorProcessor.cs

@@ -65,6 +65,7 @@ namespace nadena.dev.modular_avatar.core.editor
             mergeSessions.Clear();
 
             var descriptor = avatarGameObject.GetComponent<VRCAvatarDescriptor>();
+            if (!descriptor) return;
 
             if (descriptor.baseAnimationLayers != null) InitSessions(descriptor.baseAnimationLayers);
             if (descriptor.specialAnimationLayers != null) InitSessions(descriptor.specialAnimationLayers);

Editor/ObjectReferenceFixer.cs

@@ -11,30 +11,51 @@ namespace nadena.dev.modular_avatar.core
     {
         private static ComputeContext _context;
 
-        private static PrefabStage _lastStage;
+        private static int? _lastStage;
 
+        private static int? GetCurrentContentsRootId(out GameObject contentsRoot)
+        {
+            contentsRoot = null;
+
+            var stage = PrefabStageUtility.GetCurrentPrefabStage();
+            if (stage == null || stage.prefabContentsRoot == null) return null;
+
+            contentsRoot = stage.prefabContentsRoot;
+
+            return stage.prefabContentsRoot.GetInstanceID();
+        }
+        
         [InitializeOnLoadMethod]
         private static void Init()
         {
             EditorApplication.delayCall += ProcessObjectReferences;
             EditorApplication.update += () =>
             {
-                if (PrefabStageUtility.GetCurrentPrefabStage() != _lastStage) _context?.Invalidate?.Invoke();
+                var curStage = GetCurrentContentsRootId(out _);
+
+                Debug.Log($"{_lastStage} => {curStage}");
+
+                if (curStage != _lastStage)
+                {
+                    _context?.Invalidate?.Invoke();
+                }
             };
         }
 
         private static void ProcessObjectReferences()
         {
-            _lastStage = PrefabStageUtility.GetCurrentPrefabStage();
+            _lastStage = GetCurrentContentsRootId(out var contentsRoot);
+
+            AvatarObjectReference.InvalidateAll();
 
             _context = new ComputeContext("ObjectReferenceFixer");
             _context.InvokeOnInvalidate<object>(typeof(ObjectReferenceFixer), _ => ProcessObjectReferences());
 
             IEnumerable<IHaveObjReferences> withReferences = _context.GetComponentsByType<IHaveObjReferences>();
-            if (_lastStage != null)
+            if (contentsRoot != null)
                 withReferences =
                     withReferences.Concat(
-                        _context.GetComponentsInChildren<IHaveObjReferences>(_lastStage.prefabContentsRoot, true)
+                        _context.GetComponentsInChildren<IHaveObjReferences>(contentsRoot, true)
                     );
 
             foreach (var obj in withReferences)
@@ -56,10 +77,26 @@ namespace nadena.dev.modular_avatar.core
 
                 foreach (var (targetObject, referencePath, objRef) in references)
                 {
-                    if (targetObject == null) continue;
+                    var resolvedTarget = objRef.Get(component);
-                    _context.ObservePath(targetObject.transform);
+                    if (objRef.Get(component) == null) continue;
+                    if (targetObject == null)
+                    {
+                        Undo.RecordObject(component, "");
+                        objRef.targetObject = resolvedTarget;
+                        dirty = true;
+                    }
+                    else
+                    {
+                        // Direct object reference always wins in the event of a conflict.
+                        resolvedTarget = targetObject;
+                    }
 
-                    if (!targetObject.transform.IsChildOf(avatar.transform)) continue;
+                    foreach (var t in _context.ObservePath(resolvedTarget.transform))
+                    {
+                        _context.Observe(t.gameObject, g => g.name);
+                    }
+
+                    if (!resolvedTarget.transform.IsChildOf(avatar.transform)) continue;
 
                     if (objRef.IsConsistent(avatar)) continue;
 

Editor/OptimizationPasses/PruneParametersPass.cs

@@ -9,6 +9,8 @@ namespace nadena.dev.modular_avatar.core.editor
     {
         protected override void Execute(ndmf.BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             var expParams = context.AvatarDescriptor.expressionParameters;
             if (expParams != null && context.IsTemporaryAsset(expParams))
             {

Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPass.cs

@@ -34,6 +34,8 @@ namespace nadena.dev.modular_avatar.core.editor
 
         internal void Execute()
         {
+            if (!context.AvatarDescriptor) return;
+
             // Having a WD OFF layer after WD ON layers can break WD. We match the behavior of the existing states,
             // and if mixed, use WD ON to maximize compatibility.
             _writeDefaults = MergeAnimatorProcessor.ProbeWriteDefaults(FindFxController().animatorController as AnimatorController) ?? true;

Editor/RenameParametersHook.cs

@@ -159,6 +159,8 @@ namespace nadena.dev.modular_avatar.core.editor
 
         public void OnPreprocessAvatar(GameObject avatar, BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             _context = context;
 
             var syncParams = WalkTree(avatar);

Runtime/AvatarObjectReference.cs

@@ -29,6 +29,11 @@ namespace nadena.dev.modular_avatar.core
             EditorApplication.hierarchyChanged += () => HIERARCHY_CHANGED_SEQ += 1;
         }
 #endif
+
+        internal static void InvalidateAll()
+        {
+            HIERARCHY_CHANGED_SEQ++;
+        }
         
         public AvatarObjectReference Clone()
         {

Runtime/MAMoveIndependently.cs

@@ -218,6 +218,8 @@ namespace nadena.dev.modular_avatar.core.ArmatureAwase
                 return;
             }
 
+            if (transform.parent == null) return;
+            
             var pos = transform.localPosition;
             var rot = transform.localRotation;
             var scale = transform.localScale;

UnitTests~/Animation/AnimParameterPathRewrite/AnimParameterPathRewritingTest.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
@@ -36,4 +38,6 @@ namespace modular_avatar_tests
             Assert.AreEqual("x", curves[0].propertyName);
         }
     }
-}
+}
+
+#endif

UnitTests~/Animation/AvatarMask/AvatarMaskTest.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using nadena.dev.ndmf;
@@ -158,4 +160,6 @@ namespace modular_avatar_tests
             Assert.IsFalse(state.transformMaskElements.Any(e => e.Item1 == "Armature/Hips/UpperLeg.R"));
         }
     }
-}
+}
+
+#endif

UnitTests~/Animation/BaseLayerReferenceCorrection/BaseLayerReferenceCorrectionTest.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
 using nadena.dev.ndmf;
 using NUnit.Framework;
 using UnityEditor.Animations;
@@ -26,4 +28,6 @@ namespace modular_avatar_tests
             Assert.AreEqual(desiredIndex, alc.layer);
         }
     }
-}
+}
+
+#endif

UnitTests~/Animation/PlayAudio/PlayAudioRemapping.cs

@@ -1,9 +1,10 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS_3_5_2_OR_NEWER
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor.Animations;
 using VRC.SDK3.Avatars.Components;
 
-#if MA_VRCSDK3_AVATARS_3_5_2_OR_NEWER
 namespace modular_avatar_tests
 {
     public class PlayAudioRemapping : TestBase
@@ -28,4 +29,5 @@ namespace modular_avatar_tests
         }
     }
 }
+
 #endif

UnitTests~/MergeAnimatorTests/MergeSingleTests.cs

@@ -1,4 +1,6 @@
-using modular_avatar_tests;
+#if MA_VRCSDK3_AVATARS
+
+using modular_avatar_tests;
 using nadena.dev.modular_avatar.animation;
 using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
@@ -47,4 +49,6 @@ namespace UnitTests.MergeAnimatorTests
             Assert.IsTrue(state.motion.name.StartsWith("Anim2"));
         }
     }
-}
+}
+
+#endif

UnitTests~/MergeAnimatorTests/PreexistingAnimatorParams/PreexistingParamsTest.cs

@@ -1,3 +1,5 @@
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -35,3 +37,4 @@ public class PreexistingParamsTest : TestBase
     }
 }
 
+#endif

UnitTests~/MergeAnimatorTests/ProxyAnim/ProxyAnimTest.cs

@@ -1,4 +1,6 @@
-using modular_avatar_tests;
+#if MA_VRCSDK3_AVATARS
+
+using modular_avatar_tests;
 using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
@@ -25,4 +27,6 @@ namespace UnitTests.MergeAnimatorTests.ProxyAnim
             Assert.AreEqual(originalClip, resultClip);
         }
     }
-}
+}
+
+#endif

UnitTests~/MergeAnimatorTests/SyncedLayerOverrideInSubStatemachine/SyncedLayerOverrideInSubStateMachine.cs

@@ -1,4 +1,6 @@
-using modular_avatar_tests;
+#if MA_VRCSDK3_AVATARS
+
+using modular_avatar_tests;
 using nadena.dev.ndmf;
 using NUnit.Framework;
 using UnityEditor.Animations;
@@ -38,4 +40,6 @@ namespace UnitTests.MergeAnimatorTests.SyncedLayerOverrideInSubStatemachine
             Assert.NotNull(motion);
         }
     }
-}
+}
+
+#endif

UnitTests~/MergeAnimatorTests/TypeAdjustment/ConvertTransitionTypes.cs

@@ -1,3 +1,5 @@
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -268,3 +270,4 @@ public class ConvertTransitionTypes : TestBase
     }
 }
 
+#endif

UnitTests~/MergeDBT/MergeDirectBlendTreeTests.cs

@@ -1,3 +1,5 @@
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -24,3 +26,5 @@ public class MergeDirectBlendTreeTests : TestBase
         Assert.AreEqual(0, parameters["DEF"]);
     }
 }
+
+#endif

UnitTests~/ReactiveComponent/BlendshapeSyncTest.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
 using modular_avatar_tests;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
@@ -58,4 +60,6 @@ namespace UnitTests.ReactiveComponent
             Assert.AreEqual(m3.actionGroups, m1.actionGroups);
         }
     }
-}
+}
+
+#endif

UnitTests~/ReactiveComponent/ObjectToggleTests.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
 using modular_avatar_tests;
 using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
@@ -47,4 +49,6 @@ namespace UnitTests.ReactiveComponent
             Assert.IsFalse(obj.activeSelf);
         }
     }
-}
+}
+
+#endif

UnitTests~/ReactiveComponent/ParameterAssignment/AutoValueAssignmentTests.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using modular_avatar_tests;
@@ -112,4 +114,6 @@ namespace UnitTests.ReactiveComponent.ParameterAssignment
             Assert.AreEqual(expectedDefaultValue, avDesc.expressionParameters.parameters.Single().defaultValue);
         }
     }
-}
+}
+
+#endif

UnitTests~/ReactiveComponent/ParameterAssignment/ParameterTypeTests.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Linq;
 using modular_avatar_tests;
 using nadena.dev.modular_avatar.core;
@@ -82,4 +84,6 @@ namespace UnitTests.ReactiveComponent.ParameterAssignment
             Assert.AreEqual(expected, descriptor.expressionParameters.parameters.Single().valueType);
         }
     }
-}
+}
+
+#endif

UnitTests~/ReactiveComponent/ShapeDeletionAnalysis.cs

@@ -1,3 +1,5 @@
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -96,3 +98,5 @@ public class ShapeDeletionAnalysis : TestBase
         Assert.AreEqual(originalSharedMesh, mesh.sharedMesh);
     }
 }
+
+#endif

UnitTests~/ShapeChanger/InitialStates/SCDefaultAnimation.cs

@@ -1,4 +1,6 @@
-using modular_avatar_tests;
+#if MA_VRCSDK3_AVATARS
+
+using modular_avatar_tests;
 using nadena.dev.modular_avatar.animation;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
@@ -121,4 +123,6 @@ namespace ShapeChangerTests
             Assert.AreEqual(100.0f, smr.GetBlendShapeWeight(sharedMesh.GetBlendShapeIndex("key3")), 0.1f);
         }
     }
-}
+}
+
+#endif

UnitTests~/VisibleHeadAccessoryTest/VisibleHeadAccessoryTest.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#if MA_VRCSDK3_AVATARS
+
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -57,4 +59,6 @@ namespace UnitTests.VisibleHeadAccessoryTest
             Assert.AreEqual(headchop.globalScaleFactor, 1);
         }
     }
-}
+}
+
+#endif

docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mesh-settings.md

@@ -28,10 +28,10 @@ Mesh Settingsコンポーネントを使用すると、特定のゲームオブ
 - 継承：このコンポーネントはこの設定に対して何もしません。親のMesh Settingsで設定された値を継承します。
 - 設定：このコンポーネントは、そのゲームオブジェクトとその子にあるメッシュの対応する設定を設定します。
 - 設定しない：このコンポーネントは、親のMesh Settingsの影響を受けないようにします。メッシュはデフォルトの設定のままです。
-- 親が継承された時は継承、または設定：親のMesh Settingsが設定モードにある場合、それが使用されます。親のMesh
+- 親が継承された時は継承、それ以外では設定：親のMesh Settingsが設定モードにある場合、それが使用されます。親のMesh
   Settingsが適用されない場合、
   このコンポーネントの設定が使用されます。衣装プレハブなどに、アバター全体の設定が優先されるようにするために便利です。
 
 バウンズを設定する場合、バウンディングボックスは「Root Bone」として指定したトランスフォームに対して相対的に決定されます。
 また、バウンズはSkinned Mesh Rendererのみに影響しますが、Anchor OverrideはMesh RendererやLine Rendererなどの他のタイプの
-Rendererにも設定されます。
+Rendererにも設定されます。

docs~/yarn.lock

@@ -6378,8 +6378,8 @@ __metadata:
   linkType: hard
 
 "http-proxy-middleware@npm:^2.0.3":
-  version: 2.0.6
+  version: 2.0.7
-  resolution: "http-proxy-middleware@npm:2.0.6"
+  resolution: "http-proxy-middleware@npm:2.0.7"
   dependencies:
     "@types/http-proxy": ^1.17.8
     http-proxy: ^1.18.1
@@ -6391,7 +6391,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/express":
       optional: true
-  checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a
+  checksum: 18caa21145917aa1054740353916e8f03f5a3a93bede9106f1f44d84f7b174df17af1c72bf5fade5cc440c2058ee813f47cbb2bdd6ae6874af1cf33e0ac575f3
   languageName: node
   linkType: hard