From b216a5bbc078acb6a79507b99ef2ca4dab8e60ec Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 15 Nov 2023 18:24:02 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE?= =?UTF-8?q?=E8=A1=A8=E8=A8=98=E3=80=81=E9=A0=86=E7=95=AA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `-1.0` => ` 1.0` - `Import` and `Export` - `Export < Import < MeshUtility` order --- Assets/UniGLTF/Editor/GltfImportMenu.cs | 2 +- Assets/UniGLTF/Editor/TopMenu.cs | 6 +-- .../UniGLTF/ExportDialog/GltfExportWindow.cs | 2 +- Assets/VRM/Editor/Format/VRMExporterWizard.cs | 2 +- Assets/VRM/Editor/Format/VRMImporterMenu.cs | 2 +- .../SpringBone/VRMSpringBoneUtilityEditor.cs | 4 +- Assets/VRM/Editor/VrmTopMenu.cs | 38 +++++++++---------- Assets/VRM10/Editor/Components/VRM10Window.cs | 2 +- .../MeshUtility/Vrm10MeshUtilityDialog.cs | 2 +- Assets/VRM10/Editor/Vrm10ExportDialog.cs | 2 +- Assets/VRM10/Editor/Vrm10TopMenu.cs | 10 +++-- Assets/VRM10/Editor/VrmAnimationMenu.cs | 2 +- 12 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Assets/UniGLTF/Editor/GltfImportMenu.cs b/Assets/UniGLTF/Editor/GltfImportMenu.cs index 0430a33ea..913dd69dc 100644 --- a/Assets/UniGLTF/Editor/GltfImportMenu.cs +++ b/Assets/UniGLTF/Editor/GltfImportMenu.cs @@ -6,7 +6,7 @@ namespace UniGLTF { public static class GltfImportMenu { - public const string MENU_NAME = "glTF importer (*.gltf|*.glb|*.zip)"; + public const string MENU_NAME = "Import glTF... (*.gltf|*.glb|*.zip)"; public static void ImportGltfFileToGameObject() { var path = EditorUtility.OpenFilePanel(MENU_NAME + ": open glb", "", diff --git a/Assets/UniGLTF/Editor/TopMenu.cs b/Assets/UniGLTF/Editor/TopMenu.cs index 02ecb3189..c5efaf46d 100644 --- a/Assets/UniGLTF/Editor/TopMenu.cs +++ b/Assets/UniGLTF/Editor/TopMenu.cs @@ -25,18 +25,18 @@ namespace UniGLTF private static void ImportGltfFile() => GltfImportMenu.ImportGltfFileToGameObject(); - [MenuItem(UserGltfMenuPrefix + "/" + MeshUtility.MeshUtilityDialog.MENU_NAME, priority = 10)] + [MenuItem(UserGltfMenuPrefix + "/" + MeshUtility.MeshUtilityDialog.MENU_NAME, priority = 3)] private static void OpenMeshProcessingWindow() => MeshUtility.MeshUtilityDialog.OpenWindow(); #if VRM_DEVELOP - [MenuItem(DevelopmentMenuPrefix + "/Generate Serialization Code", priority = 20)] + [MenuItem(DevelopmentMenuPrefix + "/Generate Serialization Code", priority = 40)] private static void GenerateSerializationCode() { SerializerGenerator.GenerateSerializer(); DeserializerGenerator.GenerateSerializer(); } - [MenuItem(DevelopmentMenuPrefix + "/Generate UniJSON ConcreteCast", priority = 21)] + [MenuItem(DevelopmentMenuPrefix + "/Generate UniJSON ConcreteCast", priority = 41)] private static void GenerateUniJsonConcreteCastCode() => UniJSON.ConcreteCast.GenerateGenericCast(); #endif } diff --git a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs index cd5c29d0f..1f6b4b32e 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs @@ -9,7 +9,7 @@ namespace UniGLTF { public class GltfExportWindow : ExportDialogBase { - public const string MENU_NAME = "glTF Exporter"; + public const string MENU_NAME = "Export glTF..."; public static void ExportGameObjectToGltfFile() { var window = (GltfExportWindow)GltfExportWindow.GetWindow(typeof(GltfExportWindow)); diff --git a/Assets/VRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/Editor/Format/VRMExporterWizard.cs index 541ec1c0b..4e89b0e92 100644 --- a/Assets/VRM/Editor/Format/VRMExporterWizard.cs +++ b/Assets/VRM/Editor/Format/VRMExporterWizard.cs @@ -11,7 +11,7 @@ namespace VRM { public class VRMExporterWizard : ExportDialogBase { - public const string MENU_NAME = "VRM 0.x Exporter"; + public const string MENU_NAME = "Export VRM 0.x..."; public static void OpenExportMenu() { var window = (VRMExporterWizard)GetWindow(typeof(VRMExporterWizard)); diff --git a/Assets/VRM/Editor/Format/VRMImporterMenu.cs b/Assets/VRM/Editor/Format/VRMImporterMenu.cs index 2f5e66714..c99d1ff91 100644 --- a/Assets/VRM/Editor/Format/VRMImporterMenu.cs +++ b/Assets/VRM/Editor/Format/VRMImporterMenu.cs @@ -7,7 +7,7 @@ namespace VRM { public static class VRMImporterMenu { - public const string MENU_NAME = "VRM 0.x Importer"; + public const string MENU_NAME = "Import VRM 0.x..."; public static void OpenImportMenu() { var path = EditorUtility.OpenFilePanel(MENU_NAME + ": open vrm", "", "vrm"); diff --git a/Assets/VRM/Editor/SpringBone/VRMSpringBoneUtilityEditor.cs b/Assets/VRM/Editor/SpringBone/VRMSpringBoneUtilityEditor.cs index bfac92c7d..30f5b932e 100644 --- a/Assets/VRM/Editor/SpringBone/VRMSpringBoneUtilityEditor.cs +++ b/Assets/VRM/Editor/SpringBone/VRMSpringBoneUtilityEditor.cs @@ -10,7 +10,7 @@ namespace VRM internal static class VRMSpringBoneUtilityEditor { #region save - public const string SAVE_MENU_NAME = "VRM 0.x Save SpringBone to JSON"; + public const string SAVE_MENU_NAME = "VRM 0.x Save SpringBone to JSON..."; public static bool SaveSpringBoneToJsonValidation() { var root = Selection.activeObject as GameObject; @@ -57,7 +57,7 @@ namespace VRM #endregion #region load - public const string LOAD_MENU_NAME = "VRM 0.x Load SpringBone from JSON"; + public const string LOAD_MENU_NAME = "VRM 0.x Load SpringBone from JSON..."; public static bool LoadSpringBoneFromJsonValidation() { var root = Selection.activeObject as GameObject; diff --git a/Assets/VRM/Editor/VrmTopMenu.cs b/Assets/VRM/Editor/VrmTopMenu.cs index 65e7a95ce..6f130f3fc 100644 --- a/Assets/VRM/Editor/VrmTopMenu.cs +++ b/Assets/VRM/Editor/VrmTopMenu.cs @@ -10,52 +10,52 @@ namespace VRM private const string DevelopmentMenuPrefix = PackageVersion.MENU + "/Development"; - [MenuItem(UserMenuPrefix + "/" + PackageVersion.MENU_NAME, validate = true)] + [MenuItem(UserMenuPrefix + "/" + PackageVersion.MENU_NAME, true, 0)] private static bool ShowVersionValidation() => false; - [MenuItem(UserMenuPrefix + "/" + PackageVersion.MENU_NAME, priority = 0)] + [MenuItem(UserMenuPrefix + "/" + PackageVersion.MENU_NAME, false, 0)] private static void ShowVersion() { } - [MenuItem(UserMenuPrefix + "/" + VRMExporterWizard.MENU_NAME, priority = 1)] + [MenuItem(UserMenuPrefix + "/" + VRMExporterWizard.MENU_NAME, false, 1)] private static void ExportToVrmFile() => VRMExporterWizard.OpenExportMenu(); - [MenuItem(UserMenuPrefix + "/" + VRMImporterMenu.MENU_NAME, priority = 2)] + [MenuItem(UserMenuPrefix + "/" + VRMImporterMenu.MENU_NAME, false, 2)] private static void ImportFromVrmFile() => VRMImporterMenu.OpenImportMenu(); - [MenuItem(UserMenuPrefix + "/" + VRMHumanoidNormalizerMenu.MENU_NAME, validate = true)] - private static bool FreezeTPoseValidation() => VRMHumanoidNormalizerMenu.NormalizeValidation(); - [MenuItem(UserMenuPrefix + "/" + VRMHumanoidNormalizerMenu.MENU_NAME, priority = 20)] - private static void FreezeTPose() => VRMHumanoidNormalizerMenu.Normalize(); - - - [MenuItem(UserMenuPrefix + "/" + VrmMeshIntegratorWizard.MENU_NAME, priority = 21)] + [MenuItem(UserMenuPrefix + "/" + VrmMeshIntegratorWizard.MENU_NAME, false, 3)] private static void OpenMeshIntegratorWizard() => VrmMeshIntegratorWizard.CreateWizard(); - [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.SAVE_MENU_NAME, validate = true)] + [MenuItem(UserMenuPrefix + "/" + VRMHumanoidNormalizerMenu.MENU_NAME, true, 51)] + private static bool FreezeTPoseValidation() => VRMHumanoidNormalizerMenu.NormalizeValidation(); + [MenuItem(UserMenuPrefix + "/" + VRMHumanoidNormalizerMenu.MENU_NAME, false, 52)] + private static void FreezeTPose() => VRMHumanoidNormalizerMenu.Normalize(); + + + [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.SAVE_MENU_NAME, true, 53)] private static bool SaveSpringBoneToJsonValidation() => VRMSpringBoneUtilityEditor.SaveSpringBoneToJsonValidation(); - [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.SAVE_MENU_NAME, priority = 22)] + [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.SAVE_MENU_NAME, false, 53)] private static void SaveSpringBoneToJson() => VRMSpringBoneUtilityEditor.SaveSpringBoneToJson(); - [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.LOAD_MENU_NAME, validate = true)] + [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.LOAD_MENU_NAME, true, 54)] private static bool LoadSpringBoneFromJsonValidation() => VRMSpringBoneUtilityEditor.LoadSpringBoneFromJsonValidation(); - [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.LOAD_MENU_NAME, priority = 23)] + [MenuItem(UserMenuPrefix + "/" + VRMSpringBoneUtilityEditor.LOAD_MENU_NAME, false, 54)] #if VRM_DEVELOP - [MenuItem(DevelopmentMenuPrefix + "/Generate Serialization Code", priority = 30)] + [MenuItem(DevelopmentMenuPrefix + "/Generate Serialization Code", false, 91)] private static void GenerateSerializer() => VRMAOTCodeGenerator.GenerateCode(); - [MenuItem(DevelopmentMenuPrefix + "/Version Dialog", priority = 32)] + [MenuItem(DevelopmentMenuPrefix + "/Version Dialog", false, 92)] private static void ShowVersionDialog() => VRMVersionMenu.ShowVersionDialog(); - [MenuItem(DevelopmentMenuPrefix + "/Build dummy for CI", priority = 33)] + [MenuItem(DevelopmentMenuPrefix + "/Build dummy for CI", false, 93)] private static void BuildDummyForCi() => BuildClass.Build(); - [MenuItem(DevelopmentMenuPrefix + "/Create UnityPackage", priority = 34)] + [MenuItem(DevelopmentMenuPrefix + "/Create UnityPackage", false, 94)] private static void CreateUnityPackage() => VRMExportUnityPackage.CreateUnityPackageWithoutBuild(); #endif } diff --git a/Assets/VRM10/Editor/Components/VRM10Window.cs b/Assets/VRM10/Editor/Components/VRM10Window.cs index 0c39fde01..d9fd1ff62 100644 --- a/Assets/VRM10/Editor/Components/VRM10Window.cs +++ b/Assets/VRM10/Editor/Components/VRM10Window.cs @@ -10,7 +10,7 @@ namespace UniVRM10 /// public class VRM10Window : EditorWindow { - public const string MENU_NAME = "VRM-1.0 Window"; + public const string MENU_NAME = "VRM 1.0 Window"; public static VRM10Window Open() { diff --git a/Assets/VRM10/Editor/MeshUtility/Vrm10MeshUtilityDialog.cs b/Assets/VRM10/Editor/MeshUtility/Vrm10MeshUtilityDialog.cs index e7ff9aa84..1ac07d0b4 100644 --- a/Assets/VRM10/Editor/MeshUtility/Vrm10MeshUtilityDialog.cs +++ b/Assets/VRM10/Editor/MeshUtility/Vrm10MeshUtilityDialog.cs @@ -10,7 +10,7 @@ namespace UniVRM10 { public class Vrm10MeshUtilityDialog : EditorWindow { - public const string MENU_NAME = "VRM-1.0 MeshUtility"; + public const string MENU_NAME = "VRM 1.0 MeshUtility"; enum Tabs { diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs index 559fd6d0c..51b2e4d3f 100644 --- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs +++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs @@ -13,7 +13,7 @@ namespace UniVRM10 { public class VRM10ExportDialog : ExportDialogBase { - public const string MENU_NAME = "VRM-1.0 Exporter"; + public const string MENU_NAME = "Export VRM 1.0..."; public static void Open() { diff --git a/Assets/VRM10/Editor/Vrm10TopMenu.cs b/Assets/VRM10/Editor/Vrm10TopMenu.cs index 52f42ec82..999283894 100644 --- a/Assets/VRM10/Editor/Vrm10TopMenu.cs +++ b/Assets/VRM10/Editor/Vrm10TopMenu.cs @@ -9,23 +9,25 @@ namespace UniVRM10 private const string DevelopmentMenuPrefix = VRM10SpecVersion.MENU + "/Development"; private const string ExperimentalMenuPrefix = VRM10SpecVersion.MENU + "/Experimental"; + [MenuItem(UserMenuPrefix + "/" + VRM10ExportDialog.MENU_NAME, priority = 1)] private static void OpenExportDialog() => VRM10ExportDialog.Open(); [MenuItem(UserMenuPrefix + "/" + Vrm10MeshUtilityDialog.MENU_NAME, priority = 2)] private static void OpenMeshUtility() => Vrm10MeshUtilityDialog.OpenWindow(); - [MenuItem(ExperimentalMenuPrefix + "/" + VrmAnimationMenu.MENU_NAME, priority = 100)] + + [MenuItem(ExperimentalMenuPrefix + "/" + VrmAnimationMenu.MENU_NAME, priority = 21)] private static void ConvertVrmAnimation() => VrmAnimationMenu.BvhToVrmAnimationMenu(); #if VRM_DEVELOP - [MenuItem(UserMenuPrefix + "/" + VRM10Window.MENU_NAME, false, 2)] + [MenuItem(ExperimentalMenuPrefix + "/" + VRM10Window.MENU_NAME, false, 22)] private static void OpenWindow() => VRM10Window.Open(); - [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema")] + [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema", false, 100)] private static void Generate() => Vrm10SerializerGenerator.Run(false); - [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema(debug)")] + [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema(debug)", false, 101)] private static void Parse() => Vrm10SerializerGenerator.Run(true); #endif } diff --git a/Assets/VRM10/Editor/VrmAnimationMenu.cs b/Assets/VRM10/Editor/VrmAnimationMenu.cs index f445db91b..40ef1013f 100644 --- a/Assets/VRM10/Editor/VrmAnimationMenu.cs +++ b/Assets/VRM10/Editor/VrmAnimationMenu.cs @@ -10,7 +10,7 @@ namespace UniVRM10 { internal static class VrmAnimationMenu { - public const string MENU_NAME = "Convert BVH to VRM-Animation"; + public const string MENU_NAME = "Convert BVH to VRM-Animation..."; public static void BvhToVrmAnimationMenu() {