From 38aa88c6580d7dcf427bb89b16df059f59725e27 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 24 Sep 2023 14:44:07 +0900 Subject: [PATCH] fix: AvatarTagComponent API compatibility break --- .../nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs | 4 +++- .../Runtime/Menu/ModularAvatarMenuGroup.cs | 2 +- .../Runtime/Menu/ModularAvatarMenuInstaller.cs | 2 +- .../Runtime/ModularAvatarBlendshapeSync.cs | 2 +- .../Runtime/ModularAvatarBoneProxy.cs | 5 +++-- .../Runtime/ModularAvatarMenuInstallTarget.cs | 2 +- .../Runtime/ModularAvatarMenuItem.cs | 2 +- .../Runtime/ModularAvatarMergeAnimator.cs | 2 +- .../Runtime/ModularAvatarMergeArmature.cs | 2 +- .../Runtime/ModularAvatarMeshSettings.cs | 2 +- .../Runtime/ModularAvatarPBBlocker.cs | 2 +- .../Runtime/ModularAvatarParameters.cs | 2 +- .../Runtime/ModularAvatarReplaceObject.cs | 2 +- .../Runtime/ModularAvatarVisibleHeadAccessory.cs | 2 +- 14 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs b/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs index 1453457e..044eba12 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/AvatarTagComponent.cs @@ -63,6 +63,8 @@ namespace nadena.dev.modular_avatar.core /// /// Eagerly resolve all AvatarTagReferences to their destinations. /// - internal abstract void ResolveReferences(); + public virtual void ResolveReferences() + { + } } } \ No newline at end of file diff --git a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs index 5f187540..f240cf2f 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuGroup.cs @@ -13,7 +13,7 @@ namespace nadena.dev.modular_avatar.core context.PushNode(new MenuNodesUnder(targetObject != null ? targetObject : gameObject)); } - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs index 09c436a3..01ad022b 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/Menu/ModularAvatarMenuInstaller.cs @@ -23,7 +23,7 @@ namespace nadena.dev.modular_avatar.core RuntimeUtil.InvalidateMenu(); } - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs index 648913dc..94536e21 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBlendshapeSync.cs @@ -64,7 +64,7 @@ namespace nadena.dev.modular_avatar.core RuntimeUtil.OnHierarchyChanged -= Rebind; } - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs index 93686d9b..69bbd558 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarBoneProxy.cs @@ -95,7 +95,7 @@ namespace nadena.dev.modular_avatar.core public string subPath; public BoneProxyAttachmentMode attachmentMode = BoneProxyAttachmentMode.Unset; - internal override void ResolveReferences() + public override void ResolveReferences() { _targetCache = UpdateDynamicMapping(); } @@ -116,7 +116,8 @@ namespace nadena.dev.modular_avatar.core if (immediate) { _targetCache = null; - } else if (_targetCache != null) + } + else if (_targetCache != null) { RuntimeUtil.delayCall(() => { _targetCache = null; }); } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs index 5e893b5e..6802830d 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuInstallTarget.cs @@ -23,7 +23,7 @@ namespace nadena.dev.modular_avatar.core context.PushNode(installer); } - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs index 58ff537f..8b6556c3 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs @@ -37,7 +37,7 @@ namespace nadena.dev.modular_avatar.core } } - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs index 950385bc..5fec0c93 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeAnimator.cs @@ -42,7 +42,7 @@ namespace nadena.dev.modular_avatar.core public MergeAnimatorPathMode pathMode = MergeAnimatorPathMode.Relative; public bool matchAvatarWriteDefaults; - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs index 7e7c806a..8018b837 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMergeArmature.cs @@ -89,7 +89,7 @@ namespace nadena.dev.modular_avatar.core #endif } - internal override void ResolveReferences() + public override void ResolveReferences() { mergeTarget?.Get(this); } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs index 0661b111..b3a0d419 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMeshSettings.cs @@ -26,7 +26,7 @@ namespace nadena.dev.modular_avatar.core public AvatarObjectReference RootBone; public Bounds Bounds = DEFAULT_BOUNDS; - internal override void ResolveReferences() + public override void ResolveReferences() { ProbeAnchor?.Get(this); RootBone?.Get(this); diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarPBBlocker.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarPBBlocker.cs index d66f2e4c..7bffe31d 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarPBBlocker.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarPBBlocker.cs @@ -30,7 +30,7 @@ namespace nadena.dev.modular_avatar.core [AddComponentMenu("Modular Avatar/MA PhysBone Blocker")] public class ModularAvatarPBBlocker : AvatarTagComponent { - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs index b82d00ae..731c9b32 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarParameters.cs @@ -34,7 +34,7 @@ namespace nadena.dev.modular_avatar.core { public List parameters = new List(); - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarReplaceObject.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarReplaceObject.cs index fec064e2..a38de004 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarReplaceObject.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarReplaceObject.cs @@ -8,7 +8,7 @@ namespace nadena.dev.modular_avatar.core { public AvatarObjectReference targetObject = new AvatarObjectReference(); - internal override void ResolveReferences() + public override void ResolveReferences() { targetObject?.Get(this); } diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs index 1cc12429..af4381fa 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarVisibleHeadAccessory.cs @@ -7,7 +7,7 @@ namespace nadena.dev.modular_avatar.core public class ModularAvatarVisibleHeadAccessory : AvatarTagComponent { // no configuration needed - internal override void ResolveReferences() + public override void ResolveReferences() { // no-op }