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

Rename MergeAnimator component, fix default layer references

Browse Source
This commit is contained in:
bd_ 2022-08-29 14:00:11 -07:00
parent ca32c75811
commit 757eaa9a85
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs
View File

@ -9,7 +9,7 @@ namespace net.fushizen.modular_avatar.core.editor
{ {
public class MergeAnimatorHook : IVRCSDKPreprocessAvatarCallback public class MergeAnimatorHook : IVRCSDKPreprocessAvatarCallback
{ {
private const string SAMPLE_PATH_PACKAGE = "Packages/com.vrchat.avatars/Samples/AV3 Demo Assets/Animation"; 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";
public int callbackOrder => HookSequence.SEQ_MERGE_ANIMATORS; public int callbackOrder => HookSequence.SEQ_MERGE_ANIMATORS;
@ -24,7 +24,7 @@ namespace net.fushizen.modular_avatar.core.editor
InitSessions(descriptor.baseAnimationLayers); InitSessions(descriptor.baseAnimationLayers);
InitSessions(descriptor.specialAnimationLayers); InitSessions(descriptor.specialAnimationLayers);
var toMerge = avatarGameObject.transform.GetComponentsInChildren<MergeAnimator>(true); var toMerge = avatarGameObject.transform.GetComponentsInChildren<ModularAvatarMergeAnimator>(true);
foreach (var merge in toMerge) foreach (var merge in toMerge)
{ {
@ -124,9 +124,9 @@ namespace net.fushizen.modular_avatar.core.editor
break; break;
} }
if (name == null) if (name != null)
{ {
name = "/vrc_AvatarV3" + name + "Layer"; name = "/vrc_AvatarV3" + name + "Layer.controller";
controller = AssetDatabase.LoadAssetAtPath<AnimatorController>(SAMPLE_PATH_PACKAGE + name); controller = AssetDatabase.LoadAssetAtPath<AnimatorController>(SAMPLE_PATH_PACKAGE + name);
if (controller == null) if (controller == null)

2
Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs → Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs
View File

@ -3,7 +3,7 @@ using VRC.SDK3.Avatars.Components;
namespace net.fushizen.modular_avatar.core namespace net.fushizen.modular_avatar.core
{ {
public class MergeAnimator : AvatarTagComponent public class ModularAvatarMergeAnimator : AvatarTagComponent
{ {
public RuntimeAnimatorController animator; public RuntimeAnimatorController animator;
public VRCAvatarDescriptor.AnimLayerType layerType; public VRCAvatarDescriptor.AnimLayerType layerType;

0
Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs.meta → Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta
View File