AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-11 23:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix type harmonization

Browse Source
This commit is contained in:
bd_ 2025-02-14 19:11:32 -08:00
parent 4455119632
commit dca6ad36ba
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/MergeAnimatorProcessor.cs
View File

@ -100,9 +100,9 @@ namespace nadena.dev.modular_avatar.core.editor
} }
var stash = context.PluginBuildContext.GetState<RenamedMergeAnimators>(); var stash = context.PluginBuildContext.GetState<RenamedMergeAnimators>();
var clonedController = stash.Controllers.GetValueOrDefault(merge) var clonedController = stash.Controllers.GetValueOrDefault(merge)
?? _asc.ControllerContext.CloneContext.Clone(merge.animator); ?? _asc.ControllerContext.CloneContext.CloneDistinct(merge.animator);
string basePath; string basePath;
if (merge.pathMode == MergeAnimatorPathMode.Relative) if (merge.pathMode == MergeAnimatorPathMode.Relative)

2
Editor/PluginDefinition/PluginDefinition.cs
View File

@ -79,6 +79,8 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
seq.Run("Prune empty animator layers", seq.Run("Prune empty animator layers",
ctx => { ctx.Extension<AnimatorServicesContext>().RemoveEmptyLayers(); }); ctx => { ctx.Extension<AnimatorServicesContext>().RemoveEmptyLayers(); });
seq.Run("Harmonize animator parameter types",
ctx => { ctx.Extension<AnimatorServicesContext>().HarmonizeParameterTypes(); });
}); });
seq.WithRequiredExtension(typeof(AnimationServicesContext), _s2 => seq.WithRequiredExtension(typeof(AnimationServicesContext), _s2 =>

2
Editor/RenameParametersHook.cs
View File

@ -70,7 +70,7 @@ namespace nadena.dev.modular_avatar.core.editor
if (mama.animator == null) return null; if (mama.animator == null) return null;
var cloned = AnimatorServices.ControllerContext.CloneContext.Clone(mama.animator, mama.layerType); var cloned = AnimatorServices.ControllerContext.CloneContext.CloneDistinct(mama.animator, mama.layerType);
Controllers[mama] = cloned; Controllers[mama] = cloned;
return cloned; return cloned;

5
UnitTests~/MergeAnimatorTests/TypeAdjustment/ConvertTransitionTypes.cs
View File

@ -237,7 +237,10 @@ public class ConvertTransitionTypes : TestBase
var fx = (AnimatorController) FindFxController(prefab).animatorController; var fx = (AnimatorController) FindFxController(prefab).animatorController;
Assert.AreEqual(fx.parameters[0].type, AnimatorControllerParameterType.Bool); Assert.AreEqual(
AnimatorControllerParameterType.Bool,
fx.parameters.First(p => p.name == "bool").type
);
} }
void AssertTransitions(AnimatorControllerLayer layer, string src, string dest, int index, void AssertTransitions(AnimatorControllerLayer layer, string src, string dest, int index,