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

Support absolute referenced animator merging (#22)

Browse Source 
also fix a bug where only one animator per layer could be merged, oops.
This commit is contained in:
bd_ 2022-09-17 09:52:59 -07:00 committed by bd_
parent 5455e0da87
commit 108df78f06
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorProcessor.cs
View File

@ -27,13 +27,14 @@ using UnityEditor;
using UnityEditor.Animations; using UnityEditor.Animations;
using UnityEngine; using UnityEngine;
using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.Components;
using VRC.SDKBase.Editor.BuildPipeline;
namespace net.fushizen.modular_avatar.core.editor namespace net.fushizen.modular_avatar.core.editor
{ {
internal class MergeAnimatorProcessor internal class MergeAnimatorProcessor
{ {
private const string SAMPLE_PATH_PACKAGE = "Packages/com.vrchat.avatars/Samples/AV3 Demo Assets/Animation/Controllers"; private const string SAMPLE_PATH_PACKAGE =
"Packages/com.vrchat.avatars/Samples/AV3 Demo Assets/Animation/Controllers";
private const string SAMPLE_PATH_LEGACY = "Assets/VRCSDK/Examples3/Animation/Controllers"; private const string SAMPLE_PATH_LEGACY = "Assets/VRCSDK/Examples3/Animation/Controllers";
private Dictionary<VRCAvatarDescriptor.AnimLayerType, AnimatorController> defaultControllers_ = private Dictionary<VRCAvatarDescriptor.AnimLayerType, AnimatorController> defaultControllers_ =
@ -58,6 +59,17 @@ namespace net.fushizen.modular_avatar.core.editor
{ {
if (merge.animator == null) continue; if (merge.animator == null) continue;
string basePath;
if (merge.pathMode == MergeAnimatorPathMode.Relative)
{
var relativePath = RuntimeUtil.RelativePath(avatarGameObject, merge.gameObject);
basePath = relativePath != "" ? relativePath + "/" : "";
}
else
{
basePath = "";
}
if (!mergeSessions.TryGetValue(merge.layerType, out var session)) if (!mergeSessions.TryGetValue(merge.layerType, out var session))
{ {
session = new AnimatorCombiner(); session = new AnimatorCombiner();
@ -66,13 +78,10 @@ namespace net.fushizen.modular_avatar.core.editor
{ {
session.AddController("", defaultControllers_[merge.layerType]); session.AddController("", defaultControllers_[merge.layerType]);
} }
var relativePath = RuntimeUtil.RelativePath(avatarGameObject, merge.gameObject);
mergeSessions[merge.layerType].AddController(
relativePath != "" ? relativePath + "/" : "",
(AnimatorController) merge.animator
);
} }
mergeSessions[merge.layerType].AddController(basePath, (AnimatorController) merge.animator);
if (merge.deleteAttachedAnimator) if (merge.deleteAttachedAnimator)
{ {
var animator = merge.GetComponent<Animator>(); var animator = merge.GetComponent<Animator>();
@ -114,7 +123,6 @@ namespace net.fushizen.modular_avatar.core.editor
} }
private static AnimatorController ResolveLayerController(VRCAvatarDescriptor.CustomAnimLayer layer) private static AnimatorController ResolveLayerController(VRCAvatarDescriptor.CustomAnimLayer layer)
{ {
AnimatorController controller = null; AnimatorController controller = null;

7
Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs
View File

@ -27,10 +27,17 @@ using VRC.SDK3.Avatars.Components;
namespace net.fushizen.modular_avatar.core namespace net.fushizen.modular_avatar.core
{ {
public enum MergeAnimatorPathMode
{
Relative,
Absolute
}
public class ModularAvatarMergeAnimator : AvatarTagComponent public class ModularAvatarMergeAnimator : AvatarTagComponent
{ {
public RuntimeAnimatorController animator; public RuntimeAnimatorController animator;
public VRCAvatarDescriptor.AnimLayerType layerType; public VRCAvatarDescriptor.AnimLayerType layerType;
public bool deleteAttachedAnimator; public bool deleteAttachedAnimator;
public MergeAnimatorPathMode pathMode = MergeAnimatorPathMode.Relative;
} }
} }