AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-02-01 03:02:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added support for AnimatorOverrideController (#139)

Browse Source
This commit is contained in:
らいちちゃん 2022-12-10 03:55:17 +09:00 committed by GitHub
parent d72e529ad7
commit 811c934f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
View File

@ -37,6 +37,8 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
private readonly AnimatorController _combined; private readonly AnimatorController _combined;
private AnimatorOverrideController _overrideController;
private List<AnimatorControllerLayer> _layers = new List<AnimatorControllerLayer>(); private List<AnimatorControllerLayer> _layers = new List<AnimatorControllerLayer>();
private Dictionary<String, AnimatorControllerParameter> _parameters = private Dictionary<String, AnimatorControllerParameter> _parameters =
@ -90,6 +92,20 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
public void AddOverrideController(string basePath, AnimatorOverrideController overrideController, bool? writeDefaults)
{
AnimatorController controller = overrideController.runtimeAnimatorController as AnimatorController;
if (controller == null) return;
_overrideController = overrideController;
try
{
this.AddController(basePath, controller, writeDefaults);
} finally
{
_overrideController = null;
}
}
private void insertLayer(string basePath, AnimatorControllerLayer layer, bool first, bool? writeDefaults) private void insertLayer(string basePath, AnimatorControllerLayer layer, bool first, bool? writeDefaults)
{ {
var newLayer = new AnimatorControllerLayer() var newLayer = new AnimatorControllerLayer()
@ -260,6 +276,16 @@ namespace nadena.dev.modular_avatar.core.editor
throw new Exception($"Unknown type referenced from animator: {original.GetType()}"); throw new Exception($"Unknown type referenced from animator: {original.GetType()}");
} }
// When using AnimatorOverrideController, replace the original AnimationClip based on AnimatorOverrideController.
if (_overrideController != null && original is AnimationClip srcClip)
{
T overrideClip = _overrideController[srcClip] as T;
if (overrideClip != null)
{
original = overrideClip;
}
}
if (cloneMap == null) cloneMap = new Dictionary<Object, Object>(); if (cloneMap == null) cloneMap = new Dictionary<Object, Object>();
if (cloneMap.ContainsKey(original)) if (cloneMap.ContainsKey(original))

12
Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
View File

@ -126,6 +126,12 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
if (willPurgeAnimators) break; // animator will be deleted in subsequent processing if (willPurgeAnimators) break; // animator will be deleted in subsequent processing
// RuntimeAnimatorController may be AnimatorOverrideController, convert in case of AnimatorOverrideController
if (anim.runtimeAnimatorController is AnimatorOverrideController overrideController)
{
anim.runtimeAnimatorController = Util.ConvertAnimatorController(overrideController);
}
var controller = anim.runtimeAnimatorController as AnimatorController; var controller = anim.runtimeAnimatorController as AnimatorController;
if (controller != null) if (controller != null)
{ {
@ -138,6 +144,12 @@ namespace nadena.dev.modular_avatar.core.editor
case ModularAvatarMergeAnimator merger: case ModularAvatarMergeAnimator merger:
{ {
// RuntimeAnimatorController may be AnimatorOverrideController, convert in case of AnimatorOverrideController
if (merger.animator is AnimatorOverrideController overrideController)
{
merger.animator = Util.ConvertAnimatorController(overrideController);
}
var controller = merger.animator as AnimatorController; var controller = merger.animator as AnimatorController;
if (controller != null) if (controller != null)
{ {

7
Packages/nadena.dev.modular-avatar/Editor/Util.cs
View File

@ -118,6 +118,13 @@ namespace nadena.dev.modular_avatar.core.editor
return merger.Finish(); return merger.Finish();
} }
public static AnimatorController ConvertAnimatorController(AnimatorOverrideController overrideController)
{
var merger = new AnimatorCombiner();
merger.AddOverrideController("", overrideController, null);
return merger.Finish();
}
public static bool IsTemporaryAsset(Object obj) public static bool IsTemporaryAsset(Object obj)
{ {
var path = AssetDatabase.GetAssetPath(obj); var path = AssetDatabase.GetAssetPath(obj);