From 757eaa9a85fe576a5c8b3f2dfb385e4cf3ea8768 Mon Sep 17 00:00:00 2001
From: bd_ <bdunderscore@fushizen.net>
Date: Mon, 29 Aug 2022 14:00:11 -0700
Subject: [PATCH] Rename MergeAnimator component, fix default layer references

---
 .../Editor/MergeAnimatorHook.cs                           | 8 ++++----
 .../{MergeAnimator.cs => ModularAvatarMergeAnimator.cs}   | 2 +-
 ...nimator.cs.meta => ModularAvatarMergeAnimator.cs.meta} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename Packages/net.fushizen.modular-avatar/Runtime/{MergeAnimator.cs => ModularAvatarMergeAnimator.cs} (80%)
 rename Packages/net.fushizen.modular-avatar/Runtime/{MergeAnimator.cs.meta => ModularAvatarMergeAnimator.cs.meta} (100%)

diff --git a/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs b/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs
index 74127a3e..485cd55d 100644
--- a/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs
+++ b/Packages/net.fushizen.modular-avatar/Editor/MergeAnimatorHook.cs
@@ -9,7 +9,7 @@ namespace net.fushizen.modular_avatar.core.editor
 {
     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";
         
         public int callbackOrder => HookSequence.SEQ_MERGE_ANIMATORS;
@@ -24,7 +24,7 @@ namespace net.fushizen.modular_avatar.core.editor
             InitSessions(descriptor.baseAnimationLayers);
             InitSessions(descriptor.specialAnimationLayers);
             
-            var toMerge = avatarGameObject.transform.GetComponentsInChildren<MergeAnimator>(true);
+            var toMerge = avatarGameObject.transform.GetComponentsInChildren<ModularAvatarMergeAnimator>(true);
 
             foreach (var merge in toMerge)
             {
@@ -124,9 +124,9 @@ namespace net.fushizen.modular_avatar.core.editor
                         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);
                     if (controller == null)
diff --git a/Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs
similarity index 80%
rename from Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs
rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs
index 6f4e1519..23b3080d 100644
--- a/Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs
+++ b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs
@@ -3,7 +3,7 @@ using VRC.SDK3.Avatars.Components;
 
 namespace net.fushizen.modular_avatar.core
 {
-    public class MergeAnimator : AvatarTagComponent
+    public class ModularAvatarMergeAnimator : AvatarTagComponent
     {
         public RuntimeAnimatorController animator;
         public VRCAvatarDescriptor.AnimLayerType layerType;
diff --git a/Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs.meta b/Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta
similarity index 100%
rename from Packages/net.fushizen.modular-avatar/Runtime/MergeAnimator.cs.meta
rename to Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs.meta