diff --git a/.github/ProjectRoot/vpm-manifest-2022.json b/.github/ProjectRoot/vpm-manifest-2022.json index dc8f31ff..3bc2f8cc 100644 --- a/.github/ProjectRoot/vpm-manifest-2022.json +++ b/.github/ProjectRoot/vpm-manifest-2022.json @@ -4,7 +4,7 @@ "version": "3.7.4" }, "nadena.dev.ndmf": { - "version": "1.7.0-alpha.3" + "version": "1.7.0-alpha.4" } }, "locked": { @@ -19,7 +19,7 @@ "dependencies": {} }, "nadena.dev.ndmf": { - "version": "1.7.0-alpha.3" + "version": "1.7.0-alpha.4" } } } \ No newline at end of file diff --git a/CHANGELOG-PRERELEASE-jp.md b/CHANGELOG-PRERELEASE-jp.md index 3fc0c1c7..6291002b 100644 --- a/CHANGELOG-PRERELEASE-jp.md +++ b/CHANGELOG-PRERELEASE-jp.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#1497] CHANGELOGをドキュメンテーションサイトに追加 - [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加 - [#1481] [World Scale Object](https://m-a.nadena.dev/dev/ja/docs/reference/world-scale-object)を追加 +- [#1489] [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を追加 ### Fixed - [#1492] 前回のプレリリースでアイコンとロゴアセットが間違っていた問題を修正 @@ -20,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 　に対してはWrite Defaultsを調整しないように変更。 - [#1429] Merge Armature は、特定の場合にPhysBoneに指定されたヒューマノイドボーンをマージできるようになりました。 - 具体的には、子ヒューマノイドボーンがある場合はPhysBoneから除外される必要があります。 +- [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。 + 詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。 ### Removed diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md index 195dca50..bd6266cb 100644 --- a/CHANGELOG-PRERELEASE.md +++ b/CHANGELOG-PRERELEASE.md @@ -11,9 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#1497] Added changelog to docs site - [#1482] Added support for replacing pre-existing animator controllers to `Merge Animator` - [#1481] Added [World Scale Object](https://m-a.nadena.dev/dev/docs/reference/world-scale-object) +- [#1489] Added [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) ### Fixed - [#1492] Fixed incorrect icon and logo assets in prior prerelease +- [#1489] Fixed compatibility issues between `Merge Blend Tree` or reactive components and MMD worlds. + See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling. ### Changed - [#1483] The Merge Animator "Match Avatar Write Defaults" option will no longer adjust write defaults on states in diff --git a/CHANGELOG-jp.md b/CHANGELOG-jp.md index 88630cf3..15189c32 100644 --- a/CHANGELOG-jp.md +++ b/CHANGELOG-jp.md @@ -12,10 +12,13 @@ Modular Avatarの主な変更点をこのファイルで記録しています。 - CHANGELOGファイルを追加 - [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加 - [#1481] [World Scale Object](https://m-a.nadena.dev/ja/docs/reference/world-scale-object)を追加 +- [#1489] [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を追加 ### Fixed - [#1460] パラメーターアセットをMA Parametersにインポートするとき、ローカルのみのパラメーターが間違ってアニメーターのみ扱いになる問題を修正 - +- [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。 + 詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。 + ### Changed - [#1476] ModularAvatarMergeAnimator と ModularAvatarMergeParameter を新しい NDMF API (`IVirtualizeMotion` と `IVirtualizeAnimatorController`) を使用するように変更 - [#1483] Merge Animator の 「アバターの Write Defaults 設定に合わせる」設定では、Additiveなレイヤー、および単一Stateかつ遷移のないレイヤー diff --git a/CHANGELOG.md b/CHANGELOG.md index bc06f511..ae4d1ab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,10 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added CHANGELOG files - [#1482] Added support for replacing pre-existing animator controllers to `Merge Animator` - [#1481] Added [World Scale Object](https://m-a.nadena.dev/docs/reference/world-scale-object) +- [#1489] Added [`MA MMD Layer Control`](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) ### Fixed - [#1460] When importing parameter assets in MA Parameters, "local only" parameters were incorrectly treated as "animator only" +- [#1489] Fixed compatibility issues between `Merge Blend Tree` or reactive components and MMD worlds. + See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling. ### Changed - [#1476] Switch ModularAvatarMergeAnimator and ModularAvatarMergeParameter to use new NDMF APIs (`IVirtualizeMotion` and `IVirtualizeAnimatorController`) diff --git a/Editor/Animation/MMDRelayPass.cs b/Editor/Animation/MMDRelayPass.cs new file mode 100644 index 00000000..d52dc580 --- /dev/null +++ b/Editor/Animation/MMDRelayPass.cs @@ -0,0 +1,234 @@ +#nullable enable + +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; +using nadena.dev.modular_avatar.core; +using nadena.dev.modular_avatar.core.editor; +using nadena.dev.ndmf; +using nadena.dev.ndmf.animator; +using UnityEditor; +using UnityEditor.Animations; +using UnityEngine; +using VRC.SDK3.Avatars.Components; +using VRC.SDKBase; +using BuildContext = nadena.dev.ndmf.BuildContext; +using Object = UnityEngine.Object; + +namespace nadena.dev.modular_avatar.animation +{ + internal class MMDRelayState + { + internal HashSet mmdAffectedOriginalLayers = new(); + } + + internal class MMDRelayEarlyPass : Pass + { + protected override void Execute(BuildContext context) + { + var asc = context.Extension(); + if (asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx)) + { + context.GetState().mmdAffectedOriginalLayers = new HashSet( + fx.Layers.Skip(1).Take(2) + ); + } + } + } + + /// + /// Many MMD worlds animate the first three FX layers to weight zero. When MA injects new layers, this can hit + /// unintended layers (eg the RC base state layer). + /// To work around this, we'll inject a layer which will relay its active state into a parameter; then, we add a + /// layer to relay this to layers which should be affected. Finally, any layer which _shouldn't_ be affected is + /// pushed out of the first three layers by injecting dummy layers. + /// + internal class MMDRelayPass : Pass + { + private const string MMDRelayParam = "__MA/Internal/MMDNotActive"; + internal const string ControlLayerName = "Modular Avatar: MMD Control"; + internal const string DummyLayerName = "Modular Avatar: MMD Dummy"; + internal const string StateNameInitial = "Initial"; + internal const string StateNameNotMMD = "NotMMD"; + internal const string StateNameMMD = "MMD"; + + protected override void Execute(BuildContext context) + { + var asc = context.Extension(); + if (!asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx)) + return; + + var affectedLayers = context.GetState().mmdAffectedOriginalLayers; + + foreach (var layer in fx.Layers) + { + var rootMMDModeBehaviors = layer.StateMachine.Behaviours + .OfType() + .ToList(); + + if (rootMMDModeBehaviors.Count == 0) continue; + if (rootMMDModeBehaviors.Count > 1) + { + ErrorReport.ReportError(Localization.L, ErrorSeverity.Error, + "error.mmd.multiple_mmd_mode_behaviors", layer.Name); + continue; + } + + if (rootMMDModeBehaviors[0].DisableInMMDMode) + { + affectedLayers.Add(layer); + } + else + { + affectedLayers.Remove(layer); + } + + layer.StateMachine.Behaviours = layer.StateMachine.Behaviours + .Where(b => b is not ModularAvatarMMDLayerControl).ToImmutableList(); + Object.DestroyImmediate(rootMMDModeBehaviors[0]); + + // check for child behaviors + // TODO: implement filtering on AllReachableNodes + foreach (var node in layer.AllReachableNodes()) + { + if (node is VirtualState state) + { + if (state.Behaviours.Any(b => b is ModularAvatarMMDLayerControl)) + { + ErrorReport.ReportError(Localization.L, ErrorSeverity.Error, + "error.mmd.mmd_mode_in_child_state", layer.Name, state.Name); + } + } + else if (node is VirtualStateMachine vsm) + { + if (vsm.Behaviours.Any(b => b is ModularAvatarMMDLayerControl)) + { + ErrorReport.ReportError(Localization.L, ErrorSeverity.Error, + "error.mmd.mmd_mode_in_child_state_machine", layer.Name, vsm.Name); + } + } + } + } + + var needsAdjustment = fx.Layers.Select((layer, index) => (layer, index)) + .Any(pair => affectedLayers.Contains(pair.layer) != (pair.index < 3 && pair.index != 0)); + if (!needsAdjustment) return; + + var toDisable = fx.Layers.Where(l => affectedLayers.Contains(l)) + .Select(l => l.VirtualLayerIndex) + .ToList(); + + fx.Parameters = fx.Parameters.Add(MMDRelayParam, new AnimatorControllerParameter + { + name = MMDRelayParam, + type = AnimatorControllerParameterType.Float, + defaultFloat = 0 + }); + + var currentLayers = fx.Layers.ToList(); + var newLayers = new List(); + + // Layer zero's weight can't be changed anyway, so leave it where it is. + newLayers.Add(currentLayers[0]); + currentLayers.RemoveAt(0); + newLayers.Add(CreateMMDLayer(fx, toDisable)); + + // Add a dummy layer + var dummy = fx.AddLayer(new LayerPriority(0), DummyLayerName); + var s = dummy.StateMachine!.DefaultState = dummy.StateMachine.AddState("Dummy"); + s.Motion = VirtualClip.Create("empty"); + newLayers.Add(dummy); + + fx.Layers = newLayers.Concat(currentLayers); + } + + private static VirtualLayer CreateMMDLayer(VirtualAnimatorController fx, List virtualLayers) + { + // We'll reorder this later, so the layer priority doesn't matter + var mmdControl = fx.AddLayer(new LayerPriority(0), ControlLayerName); + var stateMachine = mmdControl.StateMachine ?? throw new Exception("No state machine on MMD Control layer"); + + var motion = VirtualClip.Create("MMDRelay"); + motion.SetFloatCurve(EditorCurveBinding.FloatCurve("", typeof(Animator), MMDRelayParam), + AnimationCurve.Constant(0, 1, 1) + ); + + var state_initial = stateMachine.AddState(StateNameInitial); + state_initial.Motion = motion; + + var state_notmmd = stateMachine.AddState(StateNameNotMMD); + state_notmmd.Motion = motion; + + var state_mmd = stateMachine.AddState(StateNameMMD); + state_mmd.Motion = motion; + + var t = VirtualStateTransition.Create(); + t.SetDestination(state_mmd); + t.Conditions = ImmutableList.Create(new AnimatorCondition + { + mode = AnimatorConditionMode.Less, + parameter = MMDRelayParam, + threshold = 0.5f + }); + + state_notmmd.Transitions = ImmutableList.Create(t); + + t = VirtualStateTransition.Create(); + t.SetDestination(state_notmmd); + t.Conditions = ImmutableList.Create(new AnimatorCondition + { + mode = AnimatorConditionMode.Greater, + parameter = MMDRelayParam, + threshold = 0.5f + }); + + state_mmd.Transitions = ImmutableList.Create(t); + + t = VirtualStateTransition.Create(); + t.SetDestination(state_mmd); + t.Conditions = ImmutableList.Create(new AnimatorCondition + { + mode = AnimatorConditionMode.Less, + parameter = MMDRelayParam, + threshold = 0.5f + }); + + state_initial.Transitions = ImmutableList.Create(t); + + stateMachine.DefaultState = state_initial; + + var mmd_behaviors = ImmutableList.CreateBuilder(); + var notmmd_behaviors = ImmutableList.CreateBuilder(); + + foreach (var index in virtualLayers) + { + var behavior = ScriptableObject.CreateInstance(); + behavior.layer = index; + behavior.playable = VRC_AnimatorLayerControl.BlendableLayer.FX; + behavior.goalWeight = 0; + behavior.blendDuration = 0; + + mmd_behaviors.Add(behavior); + + behavior = ScriptableObject.CreateInstance(); + behavior.layer = index; + behavior.playable = VRC_AnimatorLayerControl.BlendableLayer.FX; + behavior.goalWeight = 1; + behavior.blendDuration = 0; + + notmmd_behaviors.Add(behavior); + } + + state_notmmd.Behaviours = notmmd_behaviors.ToImmutable(); + state_mmd.Behaviours = mmd_behaviors.ToImmutable(); + + return mmdControl; + } + + internal static bool IsRelayLayer(string layerName) + { + return layerName == ControlLayerName || layerName == DummyLayerName; + } + } +} \ No newline at end of file diff --git a/Editor/Animation/MMDRelayPass.cs.meta b/Editor/Animation/MMDRelayPass.cs.meta new file mode 100644 index 00000000..ccdf8903 --- /dev/null +++ b/Editor/Animation/MMDRelayPass.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 163fd3d0edea43d5969395079f561986 +timeCreated: 1741745889 \ No newline at end of file diff --git a/Editor/Inspector/MMDModeEditor.cs b/Editor/Inspector/MMDModeEditor.cs new file mode 100644 index 00000000..b00f9546 --- /dev/null +++ b/Editor/Inspector/MMDModeEditor.cs @@ -0,0 +1,30 @@ +using UnityEditor; +using static nadena.dev.modular_avatar.core.editor.Localization; + +namespace nadena.dev.modular_avatar.core.editor +{ + [CustomEditor(typeof(ModularAvatarMMDLayerControl))] + internal class MMDModeEditor : MAEditorBase + { + private SerializedProperty m_p_DisableInMMDMode; + + private void OnEnable() + { + m_p_DisableInMMDMode = + serializedObject.FindProperty(nameof(ModularAvatarMMDLayerControl.m_DisableInMMDMode)); + } + + protected override void OnInnerInspectorGUI() + { + serializedObject.Update(); + + LogoDisplay.DisplayLogo(); + + EditorGUILayout.PropertyField(m_p_DisableInMMDMode, G("mmd_mode.disable_in_mmd_mode")); + + ShowLanguageUI(); + + serializedObject.ApplyModifiedProperties(); + } + } +} \ No newline at end of file diff --git a/Editor/Inspector/MMDModeEditor.cs.meta b/Editor/Inspector/MMDModeEditor.cs.meta new file mode 100644 index 00000000..c775074b --- /dev/null +++ b/Editor/Inspector/MMDModeEditor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a1a682db3a3b491fa27980adfeeacffd +timeCreated: 1741836147 \ No newline at end of file diff --git a/Editor/PluginDefinition/PluginDefinition.cs b/Editor/PluginDefinition/PluginDefinition.cs index b951fe19..578087e3 100644 --- a/Editor/PluginDefinition/PluginDefinition.cs +++ b/Editor/PluginDefinition/PluginDefinition.cs @@ -54,6 +54,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin seq.WithRequiredExtension(typeof(AnimatorServicesContext), _s2 => { #if MA_VRCSDK3_AVATARS + seq.Run(MMDRelayEarlyPass.Instance); seq.Run(RenameParametersPluginPass.Instance); seq.Run(ParameterAssignerPass.Instance); seq.Run(MergeBlendTreePass.Instance); @@ -98,6 +99,8 @@ namespace nadena.dev.modular_avatar.core.editor.plugin ctx => { ctx.Extension().RemoveEmptyLayers(); }); seq.Run("Harmonize animator parameter types", ctx => { ctx.Extension().HarmonizeParameterTypes(); }); + + seq.Run(MMDRelayPass.Instance); }); #if MA_VRCSDK3_AVATARS seq.Run(PhysbonesBlockerPluginPass.Instance); diff --git a/Runtime/ModularAvatarMMDLayerControl.cs b/Runtime/ModularAvatarMMDLayerControl.cs new file mode 100644 index 00000000..bca66611 --- /dev/null +++ b/Runtime/ModularAvatarMMDLayerControl.cs @@ -0,0 +1,23 @@ +using System.Diagnostics.CodeAnalysis; +using JetBrains.Annotations; +using UnityEngine; + +namespace nadena.dev.modular_avatar.core +{ + [AddComponentMenu("Modular Avatar/MA MMD Layer Control")] + [DisallowMultipleComponent] + [HelpURL("https://modular-avatar.nadena.dev/docs/reference/mmd-layer-control?lang=auto")] + [SuppressMessage("ReSharper", "InconsistentNaming")] + // ReSharper disable once RequiredBaseTypesIsNotInherited (false positive) + public sealed class ModularAvatarMMDLayerControl : StateMachineBehaviour + { + [SerializeField] internal bool m_DisableInMMDMode; + + [PublicAPI] + public bool DisableInMMDMode + { + get => m_DisableInMMDMode; + set => m_DisableInMMDMode = value; + } + } +} \ No newline at end of file diff --git a/Runtime/ModularAvatarMMDLayerControl.cs.meta b/Runtime/ModularAvatarMMDLayerControl.cs.meta new file mode 100644 index 00000000..1bbd7ccb --- /dev/null +++ b/Runtime/ModularAvatarMMDLayerControl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d1d979d3cedd4ddd969f414e2ea04fb8 +timeCreated: 1741836107 \ No newline at end of file diff --git a/UnitTests~/Animation/LayerPruningTest.cs b/UnitTests~/Animation/LayerPruningTest.cs index 40cd179c..078edca5 100644 --- a/UnitTests~/Animation/LayerPruningTest.cs +++ b/UnitTests~/Animation/LayerPruningTest.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using modular_avatar_tests; +using nadena.dev.modular_avatar.animation; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEditor.Animations; @@ -21,10 +22,12 @@ namespace modular_avatar_tests var fxController = (AnimatorController) FindController(prefab, VRCAvatarDescriptor.AnimLayerType.FX).animatorController; var l0 = fxController.layers[0]; - var l1 = fxController.layers[1]; - var l2 = fxController.layers[2]; - var l3 = fxController.layers[3]; - var l3a = fxController.layers[4]; + Assert.AreEqual(MMDRelayPass.ControlLayerName, fxController.layers[1].name); + Assert.AreEqual(MMDRelayPass.DummyLayerName, fxController.layers[2].name); + var l1 = fxController.layers[3]; + var l2 = fxController.layers[4]; + var l3 = fxController.layers[5]; + var l3a = fxController.layers[6]; Assert.AreEqual("Base Layer", l0.name); Assert.AreEqual("L1", l1.name); @@ -37,10 +40,10 @@ namespace modular_avatar_tests Assert.AreEqual("2", ((VRCAnimatorLayerControl)l3.stateMachine.defaultState.behaviours[0]).debugString); Assert.IsTrue(l3.stateMachine.defaultState.behaviours[1] is VRCAnimatorTrackingControl); Assert.AreEqual("3", ((VRCAnimatorLayerControl)l3.stateMachine.defaultState.behaviours[2]).debugString); - Assert.AreEqual(3, ((VRCAnimatorLayerControl)l3.stateMachine.defaultState.behaviours[0]).layer); + Assert.AreEqual(FindFxLayerIndex(prefab, l3), ((VRCAnimatorLayerControl)l3.stateMachine.defaultState.behaviours[0]).layer); Assert.AreEqual(1, l3a.stateMachine.defaultState.behaviours.Length); - Assert.AreEqual(3, ((VRCAnimatorLayerControl)l3a.stateMachine.defaultState.behaviours[0]).layer); + Assert.AreEqual(FindFxLayerIndex(prefab, l3), ((VRCAnimatorLayerControl)l3a.stateMachine.defaultState.behaviours[0]).layer); } } } diff --git a/UnitTests~/Animation/MMD.meta b/UnitTests~/Animation/MMD.meta new file mode 100644 index 00000000..5c8c52f8 --- /dev/null +++ b/UnitTests~/Animation/MMD.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 046888971cba42e895a515d3d07b955b +timeCreated: 1742001943 \ No newline at end of file diff --git a/UnitTests~/Animation/MMD/AC1.controller b/UnitTests~/Animation/MMD/AC1.controller new file mode 100644 index 00000000..ec943823 --- /dev/null +++ b/UnitTests~/Animation/MMD/AC1.controller @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7355338869790508137 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3477861051435458144 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: L0 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7355338869790508137} + m_Position: {x: 441.0094, y: 127.91522, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7355338869790508137} +--- !u!1107 &-3163258767259997666 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: L2 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2165750007709086016} + m_Position: {x: 320, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2165750007709086016} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AC1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: L0 + m_StateMachine: {fileID: -3477861051435458144} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: L1 + m_StateMachine: {fileID: 3734055781436131242} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: L2 + m_StateMachine: {fileID: -3163258767259997666} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2165750007709086016 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3470771388114793831 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &3734055781436131242 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: L1 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3470771388114793831} + m_Position: {x: 495.48987, y: 46.194702, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3470771388114793831} diff --git a/UnitTests~/Animation/MMD/AC1.controller.meta b/UnitTests~/Animation/MMD/AC1.controller.meta new file mode 100644 index 00000000..1127e0eb --- /dev/null +++ b/UnitTests~/Animation/MMD/AC1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7f6321e9d2601a45a3efa0a24305b78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/AC2.controller b/UnitTests~/Animation/MMD/AC2.controller new file mode 100644 index 00000000..a41ca7de --- /dev/null +++ b/UnitTests~/Animation/MMD/AC2.controller @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7355338869790508137 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3477861051435458144 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M0 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7355338869790508137} + m_Position: {x: 441.0094, y: 127.91522, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7355338869790508137} +--- !u!1107 &-3163258767259997666 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M2 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2165750007709086016} + m_Position: {x: 320, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2165750007709086016} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AC2 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: M0 + m_StateMachine: {fileID: -3477861051435458144} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: M1 + m_StateMachine: {fileID: 3734055781436131242} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: M2 + m_StateMachine: {fileID: -3163258767259997666} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2165750007709086016 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3470771388114793831 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &3734055781436131242 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M1 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3470771388114793831} + m_Position: {x: 495.48987, y: 46.194702, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3470771388114793831} diff --git a/UnitTests~/Animation/MMD/AC2.controller.meta b/UnitTests~/Animation/MMD/AC2.controller.meta new file mode 100644 index 00000000..b5acc9f8 --- /dev/null +++ b/UnitTests~/Animation/MMD/AC2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf8dbf58ea7a7544cb5c7f86b790d0ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/MMDHandlingTests.cs b/UnitTests~/Animation/MMD/MMDHandlingTests.cs new file mode 100644 index 00000000..390a96c5 --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDHandlingTests.cs @@ -0,0 +1,138 @@ +using System.Collections.Generic; +using nadena.dev.modular_avatar.animation; +using nadena.dev.modular_avatar.core.editor; +using NUnit.Framework; +using UnityEditor.Animations; +using UnityEngine.Assertions.Must; +using VRC.SDK3.Avatars.Components; +using VRC.SDKBase; + +namespace modular_avatar_tests.MMD +{ + public class MMDHandlingTests : TestBase + { + [Test] + public void MMDMode_NoopHandling() + { + var prefab = CreatePrefab("MMDMode_Noop.prefab"); + + AvatarProcessor.ProcessAvatar(prefab); + + var fx = FindFxController(prefab); + var fxc = (AnimatorController)fx.animatorController; + + Assert.AreEqual(3, fxc.layers.Length); + Assert.AreEqual("L0", fxc.layers[0].name); + Assert.AreEqual("L1", fxc.layers[1].name); + Assert.AreEqual("L2", fxc.layers[2].name); + } + + [Test] + public void MMDMode_ReactiveComponent() + { + var prefab = CreatePrefab("MMDMode_Reactive.prefab"); + + AvatarProcessor.ProcessAvatar(prefab); + + var fx = FindFxController(prefab); + var fxc = (AnimatorController)fx.animatorController; + + // RC, MMD, dummy, L0, L1, L2 + AssertMMDModeHandling(fxc, 4, 5); + + Assert.AreEqual(MergeBlendTreePass.BlendTreeLayerName, fxc.layers[0].name); + Assert.AreEqual(MMDRelayPass.ControlLayerName, fxc.layers[1].name); + Assert.AreEqual(MMDRelayPass.DummyLayerName, fxc.layers[2].name); + Assert.AreEqual("L0", fxc.layers[3].name); + Assert.AreEqual("L1", fxc.layers[4].name); + Assert.AreEqual("L2", fxc.layers[5].name); + } + + [Test] + public void MMDMode_MergeBefore() + { + var prefab = CreatePrefab("MMDMode_MergeBefore.prefab"); + + AvatarProcessor.ProcessAvatar(prefab); + + var fx = FindFxController(prefab); + var fxc = (AnimatorController)fx.animatorController; + + // M0, MMD, dummy, M1, M2, L0, L1, L2 + AssertMMDModeHandling(fxc, 6, 7); + + Assert.AreEqual(8, fxc.layers.Length); + Assert.AreEqual("M0", fxc.layers[0].name); + Assert.AreEqual(MMDRelayPass.ControlLayerName, fxc.layers[1].name); + Assert.AreEqual(MMDRelayPass.DummyLayerName, fxc.layers[2].name); + Assert.AreEqual("M1", fxc.layers[3].name); + Assert.AreEqual("M2", fxc.layers[4].name); + Assert.AreEqual("L0", fxc.layers[5].name); + Assert.AreEqual("L1", fxc.layers[6].name); + Assert.AreEqual("L2", fxc.layers[7].name); + } + + [Test] + public void MMDMode_ManualOverride() + { + var prefab = CreatePrefab("MMDMode_Overrides.prefab"); + + AvatarProcessor.ProcessAvatar(prefab); + + var fx = FindFxController(prefab); + var fxc = (AnimatorController)fx.animatorController; + + // Base, MMD, dummy, ForceOff, DefaultOn, DefaultOff, ForceOn + AssertMMDModeHandling(fxc, 4, 6); + } + + + private void AssertMMDModeHandling(AnimatorController fxc, params int[] layers) + { + Assert.AreEqual(MMDRelayPass.ControlLayerName, fxc.layers[1].name); + Assert.AreEqual(MMDRelayPass.DummyLayerName, fxc.layers[2].name); + + var expectedLayers = new HashSet(layers); + + foreach (var state in fxc.layers[1].stateMachine.states) + { + var actualLayers = new HashSet(); + float expectedWeight = -1f; + + var behaviors = state.state.behaviours; + + switch (state.state.name) + { + case MMDRelayPass.StateNameInitial: + Assert.IsEmpty(behaviors); + Assert.AreEqual(fxc.layers[1].stateMachine.defaultState, state.state); + continue; + + case MMDRelayPass.StateNameNotMMD: + expectedWeight = 1f; + break; + + case MMDRelayPass.StateNameMMD: + expectedWeight = 0f; + break; + + default: + Assert.Fail($"Unexpected state {state.state.name}"); + break; + } + + foreach (var behavior in state.state.behaviours) + { + if (behavior is VRCAnimatorLayerControl lc) + { + Assert.AreEqual(expectedWeight, lc.goalWeight); + Assert.AreEqual(VRC_AnimatorLayerControl.BlendableLayer.FX, lc.playable); + Assert.IsTrue(actualLayers.Add(lc.layer)); + } + } + + Assert.That(expectedLayers, Is.EquivalentTo(actualLayers)); + } + } + } +} \ No newline at end of file diff --git a/UnitTests~/Animation/MMD/MMDHandlingTests.cs.meta b/UnitTests~/Animation/MMD/MMDHandlingTests.cs.meta new file mode 100644 index 00000000..30d644fe --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDHandlingTests.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 298d11b5361148b499d196aabcaaab73 +timeCreated: 1742002556 \ No newline at end of file diff --git a/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab b/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab new file mode 100644 index 00000000..56bc64fb --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab @@ -0,0 +1,380 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &784701382543359949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8612238306248833727} + - component: {fileID: 3495771561595279164} + - component: {fileID: 1229959924919852631} + - component: {fileID: 6320176121826827791} + m_Layer: 0 + m_Name: MMDMode_MergeBefore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8612238306248833727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784701382543359949} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.02920363, y: 0.5853253, z: -0.39815798} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7556123215267729845} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3495771561595279164 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784701382543359949} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1229959924919852631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784701382543359949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: + ViewPosition: {x: 0, y: 1.6, z: 0.2} + Animations: 0 + ScaleIPD: 1 + lipSync: 0 + lipSyncJawBone: {fileID: 0} + lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1} + lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1} + VisemeSkinnedMesh: {fileID: 0} + MouthOpenBlendShapeName: Facial_Blends.Jaw_Down + VisemeBlendShapes: [] + unityVersion: + portraitCameraPositionOffset: {x: 0, y: 0, z: 0} + portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} + networkIDs: [] + customExpressions: 1 + expressionsMenu: {fileID: 0} + expressionParameters: {fileID: 0} + enableEyeLook: 0 + customEyeLookSettings: + eyeMovement: + confidence: 0.5 + excitement: 0.5 + leftEye: {fileID: 0} + rightEye: {fileID: 0} + eyesLookingStraight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingUp: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingDown: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingLeft: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingRight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidType: 0 + upperLeftEyelid: {fileID: 0} + upperRightEyelid: {fileID: 0} + lowerLeftEyelid: {fileID: 0} + lowerRightEyelid: {fileID: 0} + eyelidsDefault: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsClosed: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingUp: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingDown: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsSkinnedMesh: {fileID: 0} + eyelidsBlendshapes: + customizeAnimationLayers: 1 + baseAnimationLayers: + - isEnabled: 0 + type: 0 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 4 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 5 + animatorController: {fileID: 9100000, guid: e7f6321e9d2601a45a3efa0a24305b78, + type: 2} + mask: {fileID: 0} + isDefault: 0 + specialAnimationLayers: + - isEnabled: 0 + type: 6 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 7 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 8 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + AnimationPreset: {fileID: 0} + animationHashSet: [] + autoFootsteps: 1 + autoLocomotion: 1 + collider_head: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_torso: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &6320176121826827791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784701382543359949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3} + m_Name: + m_EditorClassIdentifier: + launchedFromSDKPipeline: 0 + completedSDKPipeline: 0 + blueprintId: + contentType: 0 + assetBundleUnityVersion: + fallbackStatus: 0 +--- !u!1 &8032631290352466631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7556123215267729845} + - component: {fileID: 2259268676535659146} + m_Layer: 0 + m_Name: mergeBefore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7556123215267729845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8032631290352466631} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8612238306248833727} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2259268676535659146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8032631290352466631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bb122659f724ebf85fe095ac02dc339, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 9100000, guid: bf8dbf58ea7a7544cb5c7f86b790d0ff, type: 2} + layerType: 5 + deleteAttachedAnimator: 1 + pathMode: 0 + matchAvatarWriteDefaults: 0 + relativePathRoot: + referencePath: + targetObject: {fileID: 0} + layerPriority: -1 + mergeAnimatorMode: 0 diff --git a/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab.meta b/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab.meta new file mode 100644 index 00000000..e38410c2 --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_MergeBefore.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5cd01837b01aa8b4897906d81b421b32 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/MMDMode_Noop.prefab b/UnitTests~/Animation/MMD/MMDMode_Noop.prefab new file mode 100644 index 00000000..20ac55d5 --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Noop.prefab @@ -0,0 +1,325 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &252931896825782499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5142404049502950569} + - component: {fileID: 5869130456277801080} + - component: {fileID: 9098796828299356927} + - component: {fileID: 5312873765374103901} + m_Layer: 0 + m_Name: MMDMode_Noop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5142404049502950569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252931896825782499} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.02920363, y: 0.5853253, z: -0.39815798} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5869130456277801080 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252931896825782499} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &9098796828299356927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252931896825782499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: + ViewPosition: {x: 0, y: 1.6, z: 0.2} + Animations: 0 + ScaleIPD: 1 + lipSync: 0 + lipSyncJawBone: {fileID: 0} + lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1} + lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1} + VisemeSkinnedMesh: {fileID: 0} + MouthOpenBlendShapeName: Facial_Blends.Jaw_Down + VisemeBlendShapes: [] + unityVersion: + portraitCameraPositionOffset: {x: 0, y: 0, z: 0} + portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} + networkIDs: [] + customExpressions: 1 + expressionsMenu: {fileID: 0} + expressionParameters: {fileID: 0} + enableEyeLook: 0 + customEyeLookSettings: + eyeMovement: + confidence: 0.5 + excitement: 0.5 + leftEye: {fileID: 0} + rightEye: {fileID: 0} + eyesLookingStraight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingUp: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingDown: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingLeft: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingRight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidType: 0 + upperLeftEyelid: {fileID: 0} + upperRightEyelid: {fileID: 0} + lowerLeftEyelid: {fileID: 0} + lowerRightEyelid: {fileID: 0} + eyelidsDefault: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsClosed: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingUp: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingDown: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsSkinnedMesh: {fileID: 0} + eyelidsBlendshapes: + customizeAnimationLayers: 1 + baseAnimationLayers: + - isEnabled: 0 + type: 0 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 4 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 5 + animatorController: {fileID: 9100000, guid: e7f6321e9d2601a45a3efa0a24305b78, + type: 2} + mask: {fileID: 0} + isDefault: 0 + specialAnimationLayers: + - isEnabled: 0 + type: 6 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 7 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 8 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + AnimationPreset: {fileID: 0} + animationHashSet: [] + autoFootsteps: 1 + autoLocomotion: 1 + collider_head: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_torso: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &5312873765374103901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252931896825782499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3} + m_Name: + m_EditorClassIdentifier: + launchedFromSDKPipeline: 0 + completedSDKPipeline: 0 + blueprintId: + contentType: 0 + assetBundleUnityVersion: + fallbackStatus: 0 diff --git a/UnitTests~/Animation/MMD/MMDMode_Noop.prefab.meta b/UnitTests~/Animation/MMD/MMDMode_Noop.prefab.meta new file mode 100644 index 00000000..187b621d --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Noop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9467ce2e34cfbc74aa9cb6ed1b990488 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab b/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab new file mode 100644 index 00000000..4481c3d7 --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab @@ -0,0 +1,325 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3649483952032229877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3671950317217900310} + - component: {fileID: 5516575333733947756} + - component: {fileID: 3355915580969342691} + - component: {fileID: 8742850335181783537} + m_Layer: 0 + m_Name: MMDMode_Overrides + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3671950317217900310 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3649483952032229877} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.02920363, y: 0.5853253, z: -0.39815798} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5516575333733947756 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3649483952032229877} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3355915580969342691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3649483952032229877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: + ViewPosition: {x: 0, y: 1.6, z: 0.2} + Animations: 0 + ScaleIPD: 1 + lipSync: 0 + lipSyncJawBone: {fileID: 0} + lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1} + lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1} + VisemeSkinnedMesh: {fileID: 0} + MouthOpenBlendShapeName: Facial_Blends.Jaw_Down + VisemeBlendShapes: [] + unityVersion: + portraitCameraPositionOffset: {x: 0, y: 0, z: 0} + portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} + networkIDs: [] + customExpressions: 1 + expressionsMenu: {fileID: 0} + expressionParameters: {fileID: 0} + enableEyeLook: 0 + customEyeLookSettings: + eyeMovement: + confidence: 0.5 + excitement: 0.5 + leftEye: {fileID: 0} + rightEye: {fileID: 0} + eyesLookingStraight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingUp: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingDown: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingLeft: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingRight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidType: 0 + upperLeftEyelid: {fileID: 0} + upperRightEyelid: {fileID: 0} + lowerLeftEyelid: {fileID: 0} + lowerRightEyelid: {fileID: 0} + eyelidsDefault: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsClosed: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingUp: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingDown: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsSkinnedMesh: {fileID: 0} + eyelidsBlendshapes: + customizeAnimationLayers: 1 + baseAnimationLayers: + - isEnabled: 0 + type: 0 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 4 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 5 + animatorController: {fileID: 9100000, guid: 9aedd84d3acd0db4384c04f9b136ecb1, + type: 2} + mask: {fileID: 0} + isDefault: 0 + specialAnimationLayers: + - isEnabled: 0 + type: 6 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 7 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 8 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + AnimationPreset: {fileID: 0} + animationHashSet: [] + autoFootsteps: 1 + autoLocomotion: 1 + collider_head: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_torso: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &8742850335181783537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3649483952032229877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3} + m_Name: + m_EditorClassIdentifier: + launchedFromSDKPipeline: 0 + completedSDKPipeline: 0 + blueprintId: + contentType: 0 + assetBundleUnityVersion: + fallbackStatus: 0 diff --git a/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab.meta b/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab.meta new file mode 100644 index 00000000..fd1dbc8a --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Overrides.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1880667773f814c49922924e24005b29 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab b/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab new file mode 100644 index 00000000..e094e9aa --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab @@ -0,0 +1,454 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1386134902351561831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6342890467153306326} + - component: {fileID: 6952234223613419749} + - component: {fileID: 8569547807942057610} + - component: {fileID: 5205561095749141078} + m_Layer: 0 + m_Name: GameObject Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6342890467153306326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1386134902351561831} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4605622065467040953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6952234223613419749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1386134902351561831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a162bb8ec7e24a5abcf457887f1df3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + m_inverted: 0 + m_objects: + - Object: + referencePath: GameObject + targetObject: {fileID: 4583133230356327828} + Active: 0 +--- !u!114 &8569547807942057610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1386134902351561831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b29d45007c5493d926d2cd45a489529, type: 3} + m_Name: + m_EditorClassIdentifier: + Control: + name: GameObject Toggle + icon: {fileID: 0} + type: 102 + parameter: + name: + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: [] + labels: [] + MenuSource: 1 + menuSource_otherObjectChildren: {fileID: 0} + isSynced: 1 + isSaved: 1 + isDefault: 0 + automaticValue: 1 + label: +--- !u!114 &5205561095749141078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1386134902351561831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ef83cb0c23d4d7c9d41021e544a1978, type: 3} + m_Name: + m_EditorClassIdentifier: + menuToAppend: {fileID: 0} + installTargetMenu: {fileID: 0} +--- !u!1 &4583133230356327828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3143043948112966587} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3143043948112966587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583133230356327828} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4605622065467040953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6783015114988609388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4605622065467040953} + - component: {fileID: 2545551016003718416} + - component: {fileID: 7974059650307163264} + - component: {fileID: 6183713000671264849} + m_Layer: 0 + m_Name: MMDMode_Reactive + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4605622065467040953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783015114988609388} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.02920363, y: 0.5853253, z: -0.39815798} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3143043948112966587} + - {fileID: 6342890467153306326} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2545551016003718416 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783015114988609388} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &7974059650307163264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783015114988609388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: + ViewPosition: {x: 0, y: 1.6, z: 0.2} + Animations: 0 + ScaleIPD: 1 + lipSync: 0 + lipSyncJawBone: {fileID: 0} + lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1} + lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1} + VisemeSkinnedMesh: {fileID: 0} + MouthOpenBlendShapeName: Facial_Blends.Jaw_Down + VisemeBlendShapes: [] + unityVersion: + portraitCameraPositionOffset: {x: 0, y: 0, z: 0} + portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} + networkIDs: [] + customExpressions: 1 + expressionsMenu: {fileID: 0} + expressionParameters: {fileID: 0} + enableEyeLook: 0 + customEyeLookSettings: + eyeMovement: + confidence: 0.5 + excitement: 0.5 + leftEye: {fileID: 0} + rightEye: {fileID: 0} + eyesLookingStraight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingUp: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingDown: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingLeft: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyesLookingRight: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidType: 0 + upperLeftEyelid: {fileID: 0} + upperRightEyelid: {fileID: 0} + lowerLeftEyelid: {fileID: 0} + lowerRightEyelid: {fileID: 0} + eyelidsDefault: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsClosed: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingUp: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsLookingDown: + upper: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + lower: + linked: 1 + left: {x: 0, y: 0, z: 0, w: 0} + right: {x: 0, y: 0, z: 0, w: 0} + eyelidsSkinnedMesh: {fileID: 0} + eyelidsBlendshapes: + customizeAnimationLayers: 1 + baseAnimationLayers: + - isEnabled: 0 + type: 0 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 4 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 5 + animatorController: {fileID: 9100000, guid: e7f6321e9d2601a45a3efa0a24305b78, + type: 2} + mask: {fileID: 0} + isDefault: 0 + specialAnimationLayers: + - isEnabled: 0 + type: 6 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 7 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + - isEnabled: 0 + type: 8 + animatorController: {fileID: 0} + mask: {fileID: 0} + isDefault: 1 + AnimationPreset: {fileID: 0} + animationHashSet: [] + autoFootsteps: 1 + autoLocomotion: 1 + collider_head: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_torso: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_footL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_handL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleL: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerIndexR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerMiddleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerRingR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + collider_fingerLittleR: + isMirrored: 1 + state: 0 + transform: {fileID: 0} + radius: 0 + height: 0 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &6183713000671264849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6783015114988609388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3} + m_Name: + m_EditorClassIdentifier: + launchedFromSDKPipeline: 0 + completedSDKPipeline: 0 + blueprintId: + contentType: 0 + assetBundleUnityVersion: + fallbackStatus: 0 diff --git a/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab.meta b/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab.meta new file mode 100644 index 00000000..b727ac81 --- /dev/null +++ b/UnitTests~/Animation/MMD/MMDMode_Reactive.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38d357295bfc91b499787e9c3e9e5fc1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/Overrides.controller b/UnitTests~/Animation/MMD/Overrides.controller new file mode 100644 index 00000000..e55da41c --- /dev/null +++ b/UnitTests~/Animation/MMD/Overrides.controller @@ -0,0 +1,340 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7355338869790508137 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &-6326018740725076774 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1d979d3cedd4ddd969f414e2ea04fb8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DisableInMMDMode: 1 +--- !u!1102 &-4845154332522161829 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3747905681079763705 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ForceOn + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4845154332522161829} + m_Position: {x: 461.43958, y: -41.875793, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: + - {fileID: -6326018740725076774} + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -4845154332522161829} +--- !u!1107 &-3477861051435458144 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7355338869790508137} + m_Position: {x: 441.0094, y: 127.91522, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7355338869790508137} +--- !u!1107 &-3163258767259997666 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DefaultOn + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2165750007709086016} + m_Position: {x: 320, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2165750007709086016} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Overrides + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base + m_StateMachine: {fileID: -3477861051435458144} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: ForceOff + m_StateMachine: {fileID: 3734055781436131242} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: DefaultOn + m_StateMachine: {fileID: -3163258767259997666} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: DefaultOff + m_StateMachine: {fileID: 6393666339861909369} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: ForceOn + m_StateMachine: {fileID: -3747905681079763705} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2165750007709086016 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &3283455143269254731 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1d979d3cedd4ddd969f414e2ea04fb8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DisableInMMDMode: 0 +--- !u!1102 &3470771388114793831 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &3734055781436131242 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ForceOff + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3470771388114793831} + m_Position: {x: 495.48987, y: 46.194702, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: + - {fileID: 3283455143269254731} + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3470771388114793831} +--- !u!1107 &6393666339861909369 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DefaultOff + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8588877275217762460} + m_Position: {x: 638.5006, y: 477.95697, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8588877275217762460} +--- !u!1102 &8588877275217762460 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 931318d79958463468b9ca3d48c96186, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/UnitTests~/Animation/MMD/Overrides.controller.meta b/UnitTests~/Animation/MMD/Overrides.controller.meta new file mode 100644 index 00000000..0f27c152 --- /dev/null +++ b/UnitTests~/Animation/MMD/Overrides.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9aedd84d3acd0db4384c04f9b136ecb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MMD/empty.anim b/UnitTests~/Animation/MMD/empty.anim new file mode 100644 index 00000000..584aa3d6 --- /dev/null +++ b/UnitTests~/Animation/MMD/empty.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: empty + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/UnitTests~/Animation/MMD/empty.anim.meta b/UnitTests~/Animation/MMD/empty.anim.meta new file mode 100644 index 00000000..f51fb0e5 --- /dev/null +++ b/UnitTests~/Animation/MMD/empty.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 931318d79958463468b9ca3d48c96186 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitTests~/Animation/MergeBlendTreeTest.cs b/UnitTests~/Animation/MergeBlendTreeTest.cs index d1b934cc..5635107f 100644 --- a/UnitTests~/Animation/MergeBlendTreeTest.cs +++ b/UnitTests~/Animation/MergeBlendTreeTest.cs @@ -2,6 +2,7 @@ using System; using System.Linq; +using nadena.dev.modular_avatar.animation; using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; @@ -115,7 +116,7 @@ namespace modular_avatar_tests var layerNames = (FindController(root, VRCAvatarDescriptor.AnimLayerType.FX).animatorController as AnimatorController) .layers.Select(l => l.name).ToArray(); - Assert.AreEqual(new[] {MergeBlendTreePass.BlendTreeLayerName, "m2", "Eyes", "FaceMood", "m1", "m3"}, layerNames); + Assert.AreEqual(new[] {MergeBlendTreePass.BlendTreeLayerName, MMDRelayPass.ControlLayerName, MMDRelayPass.DummyLayerName, "m2", "Eyes", "FaceMood", "m1", "m3"}, layerNames); } ModularAvatarMergeAnimator TestMerge(GameObject root, string mergeName, Motion motion = null) diff --git a/UnitTests~/Animation/MergeOrderTest.cs b/UnitTests~/Animation/MergeOrderTest.cs index 31831d44..6c45a542 100644 --- a/UnitTests~/Animation/MergeOrderTest.cs +++ b/UnitTests~/Animation/MergeOrderTest.cs @@ -1,6 +1,7 @@ #if MA_VRCSDK3_AVATARS using System.Linq; +using nadena.dev.modular_avatar.animation; using nadena.dev.ndmf; using NUnit.Framework; using UnityEditor.Animations; @@ -24,7 +25,7 @@ namespace modular_avatar_tests Assert.AreEqual(new [] { - "1", "2", "3", "4", "5" + "1", MMDRelayPass.ControlLayerName, MMDRelayPass.DummyLayerName, "2", "3", "4", "5" }, layerNames); } } diff --git a/UnitTests~/MergeAnimatorTests/Replacement/MergeAnimatorReplacementTest.cs b/UnitTests~/MergeAnimatorTests/Replacement/MergeAnimatorReplacementTest.cs index b96368a0..da7862f4 100644 --- a/UnitTests~/MergeAnimatorTests/Replacement/MergeAnimatorReplacementTest.cs +++ b/UnitTests~/MergeAnimatorTests/Replacement/MergeAnimatorReplacementTest.cs @@ -1,5 +1,6 @@ using System.Linq; using modular_avatar_tests; +using nadena.dev.modular_avatar.animation; using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using nadena.dev.ndmf; @@ -20,10 +21,12 @@ namespace UnitTests.MergeAnimatorTests.Replacement var fx = FindFxController(prefab); var fxc = (AnimatorController)fx.animatorController; + + var layers = fxc.layers.Where(l => !MMDRelayPass.IsRelayLayer(l.name)).ToList(); - Assert.AreEqual(2, fxc.layers.Length); - Assert.AreEqual("2", fxc.layers[0].name); - Assert.AreEqual("3", fxc.layers[1].name); + Assert.AreEqual(2, layers.Count); + Assert.AreEqual("2", layers[0].name); + Assert.AreEqual("3", layers[1].name); } [Test] @@ -38,9 +41,11 @@ namespace UnitTests.MergeAnimatorTests.Replacement var fx = FindFxController(prefab); var fxc = (AnimatorController)fx.animatorController; - Assert.AreEqual(2, fxc.layers.Length); - Assert.AreEqual("3", fxc.layers[0].name); - Assert.AreEqual("2", fxc.layers[1].name); + var layers = fxc.layers.Where(l => !MMDRelayPass.IsRelayLayer(l.name)).ToList(); + + Assert.AreEqual(2, layers.Count); + Assert.AreEqual("3", layers[0].name); + Assert.AreEqual("2", layers[1].name); } [Test] diff --git a/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs b/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs index 1fbae006..921349b6 100644 --- a/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs +++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs @@ -1,4 +1,5 @@ using modular_avatar_tests; +using nadena.dev.modular_avatar.animation; using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core.editor; using nadena.dev.ndmf.animator; @@ -40,6 +41,9 @@ namespace UnitTests.MergeAnimatorTests.WriteDefaults foreach (var layer in vfx.Layers) { bool expectedState; + + if (MMDRelayPass.IsRelayLayer(layer.Name)) continue; + switch (layer.Name[0]) { case 'M': expectedState = wdMode ?? mergeSetMode; break; diff --git a/UnitTests~/SyncedLayerHandling/SyncedLayerHandling.cs b/UnitTests~/SyncedLayerHandling/SyncedLayerHandling.cs index 11184ee8..2296232f 100644 --- a/UnitTests~/SyncedLayerHandling/SyncedLayerHandling.cs +++ b/UnitTests~/SyncedLayerHandling/SyncedLayerHandling.cs @@ -4,6 +4,7 @@ using System.Linq; using nadena.dev.modular_avatar.core.editor; using NUnit.Framework; using UnityEditor.Animations; +using UnityEngine; using VRC.SDK3.Avatars.Components; namespace modular_avatar_tests.SyncedLayerHandling @@ -19,7 +20,7 @@ namespace modular_avatar_tests.SyncedLayerHandling var mainLayer = findFxLayer(prefab, "main"); var syncLayer = findFxLayer(prefab, "sync"); - Assert.AreEqual(1, syncLayer.syncedLayerIndex); + Assert.AreEqual(FindFxLayerIndex(prefab, mainLayer), syncLayer.syncedLayerIndex); var m1State = FindStateInLayer(mainLayer, "m1"); var m2State = FindStateInLayer(mainLayer, "m2"); @@ -42,7 +43,7 @@ namespace modular_avatar_tests.SyncedLayerHandling var mainLayer = findFxLayer(prefab, "main"); var syncLayer = findFxLayer(prefab, "sync"); - Assert.AreEqual(2, syncLayer.syncedLayerIndex); + Assert.AreEqual(FindFxLayerIndex(prefab, mainLayer), syncLayer.syncedLayerIndex); var m1State = FindStateInLayer(mainLayer, "m1"); var m2State = FindStateInLayer(mainLayer, "m2"); @@ -61,11 +62,11 @@ namespace modular_avatar_tests.SyncedLayerHandling { var prefab = CreatePrefab("BaseController.prefab"); AvatarProcessor.ProcessAvatar(prefab); - + var mainLayer = findFxLayer(prefab, "main"); var syncLayer = findFxLayer(prefab, "sync"); - Assert.AreEqual(1, syncLayer.syncedLayerIndex); + Assert.AreEqual(FindFxLayerIndex(prefab, mainLayer), syncLayer.syncedLayerIndex); var m1State = FindStateInLayer(mainLayer, "m1"); var overrides = syncLayer.GetOverrideBehaviours(m1State); @@ -86,7 +87,7 @@ namespace modular_avatar_tests.SyncedLayerHandling var mainLayer = findFxLayer(prefab, "main"); var syncLayer = findFxLayer(prefab, "sync"); - Assert.AreEqual(2, syncLayer.syncedLayerIndex); + Assert.AreEqual(FindFxLayerIndex(prefab, mainLayer), syncLayer.syncedLayerIndex); var m1State = FindStateInLayer(mainLayer, "m1"); var overrides = syncLayer.GetOverrideBehaviours(m1State); @@ -108,7 +109,7 @@ namespace modular_avatar_tests.SyncedLayerHandling var mainLayer = findFxLayer(prefab, "main"); var syncLayer = findFxLayer(prefab, "sync"); - Assert.AreEqual(2, syncLayer.syncedLayerIndex); + Assert.AreEqual(FindFxLayerIndex(prefab, mainLayer), syncLayer.syncedLayerIndex); var m1State = FindStateInLayer(mainLayer, "m1"); var overrides = syncLayer.GetOverrideBehaviours(m1State); diff --git a/UnitTests~/TestBase.cs b/UnitTests~/TestBase.cs index da2506d2..b14f41b6 100644 --- a/UnitTests~/TestBase.cs +++ b/UnitTests~/TestBase.cs @@ -165,5 +165,10 @@ namespace modular_avatar_tests .FirstOrDefault(l => l.type == layerType); } #endif + protected int FindFxLayerIndex(GameObject prefab, AnimatorControllerLayer layer) + { + var fx = (AnimatorController)FindFxController(prefab).animatorController; + return fx.layers.TakeWhile(l => l.stateMachine != layer.stateMachine).Count(); + } } } \ No newline at end of file diff --git a/docs~/docs/general-behavior/index.md b/docs~/docs/general-behavior/index.md new file mode 100644 index 00000000..76a29146 --- /dev/null +++ b/docs~/docs/general-behavior/index.md @@ -0,0 +1,7 @@ +--- +sidebar_position: 6 +--- + +# General Behavior + +This section has general information on the behavior of Modular Avatar. \ No newline at end of file diff --git a/docs~/docs/general-behavior/mmd.md b/docs~/docs/general-behavior/mmd.md new file mode 100644 index 00000000..c7c4a571 --- /dev/null +++ b/docs~/docs/general-behavior/mmd.md @@ -0,0 +1,28 @@ +# MMD World Workarounds + +Some "MMD Worlds" in VRChat have a behavior where they will disable the _second and third_ layers of your FX animator +controller. This is intended to disable the layers controlling your facial expressions, so the MMD world can override +them. + +Modular Avatar will automatically arrange for whichever layers were _originally_ layers 2 and 3 to be disabled in this +circumstance. That is, if a layer is added before them, MA will add some relay layers to drive layers 2 and 3 off and +on appropriately. + +Layers added via Merge Animator (even in replace mode) will not be affected by this MMD world behavior; if necessary, +padding layers will be added to protect them. If you want to opt them into this behavior, you can attach the `MA MMD +Layer Control` _state machine behavior_ to the layer you want to control. + +:::warning + +The `MA MMD Layer Control` state machine behavior will only work when attached to the layer directly. Due to how state +machine behaviors work, I can't stop you from attaching them to individual states - but this will break your build +(so don't do that). + +::: + +:::note + +This workaround only works for worlds which specifically disable layers 2 & 3. Given current VRChat constraints, it's +not possible to provide a more general solution. + +::: \ No newline at end of file diff --git a/docs~/docs/problems/index.md b/docs~/docs/problems/index.md index 48e8e3bb..9596ef47 100644 --- a/docs~/docs/problems/index.md +++ b/docs~/docs/problems/index.md @@ -1,5 +1,5 @@ --- -sidebar_position: 6 +sidebar_position: 7 --- # Dealing with problems diff --git a/docs~/docs/reference/mmd-layer-control.md b/docs~/docs/reference/mmd-layer-control.md new file mode 100644 index 00000000..37e40e4a --- /dev/null +++ b/docs~/docs/reference/mmd-layer-control.md @@ -0,0 +1,3 @@ +# MMD Layer Control + +Refer to the [documentation on MMD handling](../general-behavior/mmd). \ No newline at end of file diff --git a/docs~/docs/unity-2019/parameters-devmode.png b/docs~/docs/unity-2019/parameters-devmode.png index 1bef8366..e69de29b 100644 Binary files a/docs~/docs/unity-2019/parameters-devmode.png and b/docs~/docs/unity-2019/parameters-devmode.png differ diff --git a/docs~/docs/unity-2019/parameters-enduser.png b/docs~/docs/unity-2019/parameters-enduser.png index 88aa6a62..e69de29b 100644 Binary files a/docs~/docs/unity-2019/parameters-enduser.png and b/docs~/docs/unity-2019/parameters-enduser.png differ diff --git a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/index.md b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/index.md new file mode 100644 index 00000000..613b3742 --- /dev/null +++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/index.md @@ -0,0 +1,7 @@ +--- +sidebar_position: 6 +--- + +# その他の仕様 + +Modular Avatar の一般的な挙動に関する情報です。 \ No newline at end of file diff --git a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/mmd.md b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/mmd.md new file mode 100644 index 00000000..1ffe587f --- /dev/null +++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/mmd.md @@ -0,0 +1,32 @@ +# MMD ワールド対策 + +一部の「MMD ワールド」では、FXアニメーターコントローラーの2番目と3番目_のレイヤーを無効にする動作があります。 +これは、表情を制御するレイヤーを無効にして、MMD ワールドがそれを上書きできるようにするためです。 + +Modular Avatar は、元々レイヤー2と3であったレイヤーがこの状況で無効になるように自動的に配慮します。 +つまり、レイヤーがそれらより前に追加された場合、MA はレイヤー2と3を適切にオンとオフするためのリレーレイヤーを追加します。 + +Merge Animatorなどで追加されたレイヤーは、（置換モードでも）この MMD ワールドの動作に影響を受けません。 +必要に応じて、それらを保護するためのパディングレイヤーが追加されます。MMDワールドの動作で無効化したい場合は、 +`MA MMD Layer Control` という_ステートマシンビヘイビア_を制御したいレイヤーに追加することができます。 + + +:::warning + +`MA MMD Layer Control` ステートマシンビヘイビアは、レイヤーに直接アタッチされている場合にのみ機能します。 +ステートマシンビヘイビアの仕様により、個々のステートに追加することはできてしまいますが、その場合はビルドが失敗するのでやめましょう。 + +::: + +:::warning + +`MA MMD Layer Control`は現在、FXアニメーターコントローラーのレイヤーにのみ適用されます。 + +::: + +:::note + +このワークアラウンドは、２番と３番レイヤーを無効にするワールドにのみ正しく適用されます。 +現在のVRChatの制約により、より一般的な解決策を提供することはできません。 + +::: \ No newline at end of file diff --git a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mmd-layer-control.md b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mmd-layer-control.md new file mode 100644 index 00000000..8c69f487 --- /dev/null +++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mmd-layer-control.md @@ -0,0 +1,3 @@ +# MMD Layer Control + +[MMD ワールド対策のドキュメンテーション](../general-behavior/mmd)を参照してください。 \ No newline at end of file