Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Inherit IEditorOnly #43

Merged
merged 3 commits into from
Sep 18, 2023
Merged

chore: Inherit IEditorOnly #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0ef65d
chore: Inherit IEditorOnly
ReinaS-64892 Sep 17, 2023
2cf274c
chore: Remove dependency on ModularAvatar from "jp.suzuryg.face-emo.c…
suzuryg Sep 18, 2023
9a1682d
refactor: Rename assembly and namespace (MA -> AV3)
suzuryg Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Suzuryg.FaceEmo.Components.MA;
using Suzuryg.FaceEmo.Components.AV3;
using System;
using UnityEngine;
using VRC.SDKBase.Editor.BuildPipeline;
Expand Down
2 changes: 1 addition & 1 deletion Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...zuryg.face-emo/Runtime/Components/MA.meta → ...uryg.face-emo/Runtime/Components/AV3.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mo/Runtime/Components/MA/BlinkDisabler.cs → ...o/Runtime/Components/AV3/BlinkDisabler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace Suzuryg.FaceEmo.Components.MA
namespace Suzuryg.FaceEmo.Components.AV3
{
[DisallowMultipleComponent]
public class BlinkDisabler : RunBeforeModularAvatar
Expand Down
0 ...ntime/Components/MA/BlinkDisabler.cs.meta → ...time/Components/AV3/BlinkDisabler.cs.meta
View file
Open in desktop
File renamed without changes.
8 changes: 2 additions & 6 deletions ...e/Components/MA/RunBeforeModularAvatar.cs → .../Components/AV3/RunBeforeModularAvatar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...ponents/MA/RunBeforeModularAvatar.cs.meta → ...onents/AV3/RunBeforeModularAvatar.cs.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Components/MA/TrackingControlDisabler.cs → ...Components/AV3/TrackingControlDisabler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using UnityEditor.Animations;
#endif

namespace Suzuryg.FaceEmo.Components.MA
namespace Suzuryg.FaceEmo.Components.AV3
{
[DisallowMultipleComponent]
public class TrackingControlDisabler : RunBeforeModularAvatar
Expand Down
0 ...onents/MA/TrackingControlDisabler.cs.meta → ...nents/AV3/TrackingControlDisabler.cs.meta
View file
Open in desktop
File renamed without changes.
18 changes: 18 additions & 0 deletions ...suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
0 ...ace-emo.components.ma.Runtime.asmdef.meta → ...ce-emo.components.av3.Runtime.asmdef.meta
View file
Open in desktop
File renamed without changes.
25 changes: 0 additions & 25 deletions ...p.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef
View file
Open in desktop

This file was deleted.