From b0ef65de2c607c6f67bab3995fcfedc863d751c1 Mon Sep 17 00:00:00 2001 From: Reina_Sakiria Date: Sun, 17 Sep 2023 22:50:40 +0900 Subject: [PATCH 1/3] chore: Inherit IEditorOnly --- .../Runtime/Components/MA/RunBeforeModularAvatar.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs index d4f126e0..544d1596 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs @@ -8,11 +8,7 @@ namespace Suzuryg.FaceEmo.Components.MA { [DefaultExecutionOrder(-20000)] // run before modular avatar -#if USE_MODULAR_AVATAR - public abstract class RunBeforeModularAvatar : AvatarTagComponent // Inherit AvatarTagComponent to register in VRChat whitelist -#else - public abstract class RunBeforeModularAvatar : MonoBehaviour -#endif + public abstract class RunBeforeModularAvatar : MonoBehaviour , VRC.SDKBase.IEditorOnly // Inherit IEditorOnly to register in VRChat whitelist { #if UNITY_EDITOR private static bool isPlaying => UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode; From 2cf274c029b97b162cdc132c77a52b3b1135fe15 Mon Sep 17 00:00:00 2001 From: suzuryg Date: Mon, 18 Sep 2023 15:01:43 +0900 Subject: [PATCH 2/3] chore: Remove dependency on ModularAvatar from "jp.suzuryg.face-emo.components.ma.Runtime" --- .../jp.suzuryg.face-emo.components.ma.Runtime.asmdef | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef b/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef index 4d92ce43..dcdd3e53 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef @@ -1,8 +1,7 @@ { "name": "jp.suzuryg.face-emo.components.ma.Runtime", "references": [ - "GUID:ad29c40ce7d8264468d6c7634e6a3a40", - "GUID:fc900867c0f47cd49b6e2ae4ef907300" + "GUID:ad29c40ce7d8264468d6c7634e6a3a40" ], "includePlatforms": [], "excludePlatforms": [], @@ -14,12 +13,6 @@ ], "autoReferenced": false, "defineConstraints": [], - "versionDefines": [ - { - "name": "nadena.dev.modular-avatar", - "expression": "", - "define": "USE_MODULAR_AVATAR" - } - ], + "versionDefines": [], "noEngineReferences": false } \ No newline at end of file From 9a1682d82657f0c4d4f01f1984b29ff89d5556e9 Mon Sep 17 00:00:00 2001 From: suzuryg Date: Mon, 18 Sep 2023 15:08:00 +0900 Subject: [PATCH 3/3] refactor: Rename assembly and namespace (MA -> AV3) --- .../jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs | 2 +- Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs | 2 +- .../Runtime/Components/{MA.meta => AV3.meta} | 0 .../Runtime/Components/{MA => AV3}/BlinkDisabler.cs | 2 +- .../Runtime/Components/{MA => AV3}/BlinkDisabler.cs.meta | 0 .../Runtime/Components/{MA => AV3}/RunBeforeModularAvatar.cs | 2 +- .../Components/{MA => AV3}/RunBeforeModularAvatar.cs.meta | 0 .../Runtime/Components/{MA => AV3}/TrackingControlDisabler.cs | 2 +- .../Components/{MA => AV3}/TrackingControlDisabler.cs.meta | 0 .../jp.suzuryg.face-emo.components.av3.Runtime.asmdef} | 2 +- .../jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta} | 0 11 files changed, 6 insertions(+), 6 deletions(-) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA.meta => AV3.meta} (100%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/BlinkDisabler.cs (90%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/BlinkDisabler.cs.meta (100%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/RunBeforeModularAvatar.cs (97%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/RunBeforeModularAvatar.cs.meta (100%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/TrackingControlDisabler.cs (99%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA => AV3}/TrackingControlDisabler.cs.meta (100%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef => AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef} (87%) rename Packages/jp.suzuryg.face-emo/Runtime/Components/{MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef.meta => AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta} (100%) diff --git a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs index ab805258..75cef526 100644 --- a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs +++ b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs @@ -1,4 +1,4 @@ -using Suzuryg.FaceEmo.Components.MA; +using Suzuryg.FaceEmo.Components.AV3; using System; using UnityEngine; using VRC.SDKBase.Editor.BuildPipeline; diff --git a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs index 20f0e7a0..c898148a 100644 --- a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs +++ b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs @@ -2,8 +2,8 @@ using AnimatorAsCode.V0.Extensions.VRChat; using Suzuryg.FaceEmo.Domain; using Suzuryg.FaceEmo.UseCase; +using Suzuryg.FaceEmo.Components.AV3; using Suzuryg.FaceEmo.Components.Settings; -using Suzuryg.FaceEmo.Components.MA; using Suzuryg.FaceEmo.Detail.Drawing; using Suzuryg.FaceEmo.External.Hai.ComboGestureIntegrator; using System; diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3.meta similarity index 100% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA.meta rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3.meta diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs similarity index 90% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs index dfc75df4..3e7f8c9a 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Suzuryg.FaceEmo.Components.MA +namespace Suzuryg.FaceEmo.Components.AV3 { [DisallowMultipleComponent] public class BlinkDisabler : RunBeforeModularAvatar diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs.meta similarity index 100% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs.meta rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs.meta diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs similarity index 97% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs index 544d1596..b89c6e3b 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs @@ -5,7 +5,7 @@ using nadena.dev.modular_avatar.core; #endif -namespace Suzuryg.FaceEmo.Components.MA +namespace Suzuryg.FaceEmo.Components.AV3 { [DefaultExecutionOrder(-20000)] // run before modular avatar public abstract class RunBeforeModularAvatar : MonoBehaviour , VRC.SDKBase.IEditorOnly // Inherit IEditorOnly to register in VRChat whitelist diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs.meta similarity index 100% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs.meta rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs.meta diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs similarity index 99% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs index 9e337902..e39b5465 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs @@ -11,7 +11,7 @@ using UnityEditor.Animations; #endif -namespace Suzuryg.FaceEmo.Components.MA +namespace Suzuryg.FaceEmo.Components.AV3 { [DisallowMultipleComponent] public class TrackingControlDisabler : RunBeforeModularAvatar diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs.meta similarity index 100% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs.meta rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs.meta diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef similarity index 87% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef index dcdd3e53..7de35cc3 100644 --- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef +++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef @@ -1,5 +1,5 @@ { - "name": "jp.suzuryg.face-emo.components.ma.Runtime", + "name": "jp.suzuryg.face-emo.components.av3.Runtime", "references": [ "GUID:ad29c40ce7d8264468d6c7634e6a3a40" ], diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta similarity index 100% rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef.meta rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta