Merge pull request #43 from ReinaS-64892/Inherit-IEditorOnly

chore: Inherit IEditorOnly
suzuryg · Sep 18, 2023 · f0e6a07 · f0e6a07
2 parents a619687 + 9a1682d
commit f0e6a07
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 35 deletions.
diff --git 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
@@ -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/...zuryg.face-emo/Runtime/Components/MA.meta → ...uryg.face-emo/Runtime/Components/AV3.meta b/...zuryg.face-emo/Runtime/Components/MA.meta → ...uryg.face-emo/Runtime/Components/AV3.meta
diff --git a/...mo/Runtime/Components/MA/BlinkDisabler.cs → ...o/Runtime/Components/AV3/BlinkDisabler.cs b/...mo/Runtime/Components/MA/BlinkDisabler.cs → ...o/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/...ntime/Components/MA/BlinkDisabler.cs.meta → ...time/Components/AV3/BlinkDisabler.cs.meta b/...ntime/Components/MA/BlinkDisabler.cs.meta → ...time/Components/AV3/BlinkDisabler.cs.meta
diff --git a/...e/Components/MA/RunBeforeModularAvatar.cs → .../Components/AV3/RunBeforeModularAvatar.cs b/...e/Components/MA/RunBeforeModularAvatar.cs → .../Components/AV3/RunBeforeModularAvatar.cs
@@ -5,14 +5,10 @@
 using nadena.dev.modular_avatar.core;
 #endif
 
-namespace Suzuryg.FaceEmo.Components.MA
+namespace Suzuryg.FaceEmo.Components.AV3
 {
     [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;

diff --git a/...ponents/MA/RunBeforeModularAvatar.cs.meta → ...onents/AV3/RunBeforeModularAvatar.cs.meta b/...ponents/MA/RunBeforeModularAvatar.cs.meta → ...onents/AV3/RunBeforeModularAvatar.cs.meta
diff --git a/.../Components/MA/TrackingControlDisabler.cs → ...Components/AV3/TrackingControlDisabler.cs b/.../Components/MA/TrackingControlDisabler.cs → ...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/...onents/MA/TrackingControlDisabler.cs.meta → ...nents/AV3/TrackingControlDisabler.cs.meta b/...onents/MA/TrackingControlDisabler.cs.meta → ...nents/AV3/TrackingControlDisabler.cs.meta
diff --git a/...suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef b/...suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "jp.suzuryg.face-emo.components.av3.Runtime",
+    "references": [
+        "GUID:ad29c40ce7d8264468d6c7634e6a3a40"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRCSDKBase.dll",
+        "VRCSDK3A.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/...ace-emo.components.ma.Runtime.asmdef.meta → ...ce-emo.components.av3.Runtime.asmdef.meta b/...ace-emo.components.ma.Runtime.asmdef.meta → ...ce-emo.components.av3.Runtime.asmdef.meta
diff --git a/...p.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef b/...p.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef