From ff31a01e7d9fbb8bc2c64c104ed52702fe7126dd Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 13 Jan 2021 21:44:49 +0900 Subject: [PATCH] update menu --- Assets/UniGLTF/Runtime/UniJSON/ConcreteCast.cs | 2 +- .../GenericCallUtility/GenericExpressionCallFactory.cs | 4 ++-- .../UniJSON/GenericCallUtility/GenericInvokeCallFactory.cs | 4 ++-- Assets/VRM/Editor/Format/VRMExporterWizard.cs | 2 +- Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs | 2 +- Assets/VRM/Runtime/Format/VRMVersionPartial.cs | 2 +- .../VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs | 2 +- Assets/VRM10/Editor/GeneratorMenu.cs | 2 +- Assets/VRM10/Runtime/Version/VRMVersionPartial.cs | 4 +--- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniJSON/ConcreteCast.cs b/Assets/UniGLTF/Runtime/UniJSON/ConcreteCast.cs index 603346973..10cf4d09e 100644 --- a/Assets/UniGLTF/Runtime/UniJSON/ConcreteCast.cs +++ b/Assets/UniGLTF/Runtime/UniJSON/ConcreteCast.cs @@ -43,7 +43,7 @@ namespace UniJSON typeof(double), }; - [MenuItem("VRM/UniJSON/Generate ConcreteCast")] + [MenuItem("UniGLTF/UniJSON/Generate ConcreteCast")] public static void GenerateGenericCast() { var s = new StringBuilder(); diff --git a/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericExpressionCallFactory.cs b/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericExpressionCallFactory.cs index d644936e1..57ff1e342 100644 --- a/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericExpressionCallFactory.cs +++ b/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericExpressionCallFactory.cs @@ -15,7 +15,7 @@ namespace UniJSON #if UNITY_EDITOR && VRM_DEVELOP const int NET35MAX = 4; const int ARGS = 6; - const string GENERATE_PATH = "/VRM/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.g.cs"; + const string GENERATE_PATH = "UniGLTF/UniJSON/Scripts/GenericCallUtility/GenericExpressionCallFactory.g.cs"; static System.Collections.Generic.IEnumerable GetArgs(string prefix, int n) { @@ -25,7 +25,7 @@ namespace UniJSON } } - [MenuItem("VRM/UniJSON/Generate GenericExpressionCallFactory")] + [MenuItem("UniGLTF/UniJSON/Generate GenericExpressionCallFactory")] static void Generate() { var sb = new StringBuilder(); diff --git a/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericInvokeCallFactory.cs b/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericInvokeCallFactory.cs index 9ceeca036..4d8296554 100644 --- a/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericInvokeCallFactory.cs +++ b/Assets/UniGLTF/Runtime/UniJSON/GenericCallUtility/GenericInvokeCallFactory.cs @@ -24,7 +24,7 @@ namespace UniJSON #if UNITY_EDITOR && VRM_DEVELOP const int NET35MAX = 4; const int ARGS = 6; - const string GENERATE_PATH = "/VRM/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.g.cs"; + const string GENERATE_PATH = "/UniGLTF/UniJSON/Scripts/GenericCallUtility/GenericInvokeCallFactory.g.cs"; static System.Collections.Generic.IEnumerable GetArgs(string prefix, int n) { @@ -34,7 +34,7 @@ namespace UniJSON } } - [MenuItem("VRM/UniJSON/Generate GenericInvokeCallFactory")] + [MenuItem("UniGLTF/UniJSON/Generate GenericInvokeCallFactory")] static void Generate() { var sb = new StringBuilder(); diff --git a/Assets/VRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/Editor/Format/VRMExporterWizard.cs index d422fe12f..03cebe28c 100644 --- a/Assets/VRM/Editor/Format/VRMExporterWizard.cs +++ b/Assets/VRM/Editor/Format/VRMExporterWizard.cs @@ -10,7 +10,7 @@ namespace VRM { public class VRMExporterWizard : EditorWindow { - const string CONVERT_HUMANOID_KEY = VRMVersion.MENU + "/Export humanoid"; + const string CONVERT_HUMANOID_KEY = VRMVersion.MENU + "/Export " + VRMVersion.VRM_VERSION; [MenuItem(CONVERT_HUMANOID_KEY, false, 1)] private static void ExportFromMenu() diff --git a/Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs b/Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs index 9eb266a12..6795a3a55 100644 --- a/Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs +++ b/Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs @@ -16,7 +16,7 @@ namespace VRM [DisallowMultipleComponent] public static class MeshIntegratorEditor { - const string MENU_KEY = "Mesh Utility/MeshIntegrator"; + const string MENU_KEY = VRMVersion.MENU + "/MeshIntegrator"; const string ASSET_SUFFIX = ".mesh.asset"; [MenuItem(MENU_KEY, true)] diff --git a/Assets/VRM/Runtime/Format/VRMVersionPartial.cs b/Assets/VRM/Runtime/Format/VRMVersionPartial.cs index ebaaa3df1..2fe04e6da 100644 --- a/Assets/VRM/Runtime/Format/VRMVersionPartial.cs +++ b/Assets/VRM/Runtime/Format/VRMVersionPartial.cs @@ -100,6 +100,6 @@ namespace VRM } public const string VRM_VERSION = "UniVRM-" + VERSION; - public const string MENU = "VRM/" + VRM_VERSION; + public const string MENU = "VRM0"; } } diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs b/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs index 21f772519..e4e8aeea9 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs +++ b/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs @@ -10,7 +10,7 @@ namespace UniVRM10 { public class VRMSpringBoneWindow : EditorWindow { - [MenuItem("VRM/UniVRM-" + UniVRM10.VRMVersion.VERSION + "/VRMSpringBoneWindow")] + [MenuItem(VRMVersion.MENU + "/VRMSpringBoneWindow")] public static void ShowEditorWindow() { var wnd = GetWindow(); diff --git a/Assets/VRM10/Editor/GeneratorMenu.cs b/Assets/VRM10/Editor/GeneratorMenu.cs index d2680c55d..e491852bb 100644 --- a/Assets/VRM10/Editor/GeneratorMenu.cs +++ b/Assets/VRM10/Editor/GeneratorMenu.cs @@ -19,7 +19,7 @@ namespace UniVRM10 /// public static class Menu { - [MenuItem("VRM/UniVRM-" + UniVRM10.VRMVersion.VERSION + "/Generate from JsonSchema")] + [MenuItem(UniVRM10.VRMVersion.MENU + "/Generate from JsonSchema")] public static void Main() { var root = new DirectoryInfo(Path.GetFullPath(Path.Combine(Application.dataPath, "../../"))); diff --git a/Assets/VRM10/Runtime/Version/VRMVersionPartial.cs b/Assets/VRM10/Runtime/Version/VRMVersionPartial.cs index 045add381..fb7514b54 100644 --- a/Assets/VRM10/Runtime/Version/VRMVersionPartial.cs +++ b/Assets/VRM10/Runtime/Version/VRMVersionPartial.cs @@ -102,8 +102,6 @@ namespace UniVRM10 public string Pre; } - public const string VRM_VERSION = "UniVRM-" + VERSION; - public const string MENU = "VRM/" + VRM_VERSION; - + public const string MENU = "VRM1/"; } }