From e22bacb94e7d2ef0da3d76c0944bf9df66806a9a Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Mon, 7 Mar 2022 16:34:48 +0900
Subject: [PATCH] =?UTF-8?q?Vrm10TopMenu=20=E3=81=AB=20`MenuItem`=20?=
 =?UTF-8?q?=E3=82=92=E9=9B=86=E7=B4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/VRM10/Editor/Components/VRM10Window.cs |  5 +---
 Assets/VRM10/Editor/GeneratorMenu.cs          | 18 ++-----------
 Assets/VRM10/Editor/Vrm10ExportDialog.cs      |  5 +---
 Assets/VRM10/Editor/Vrm10TopMenu.cs           | 25 +++++++++++++++++++
 Assets/VRM10/Editor/Vrm10TopMenu.cs.meta      | 11 ++++++++
 5 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 Assets/VRM10/Editor/Vrm10TopMenu.cs
 create mode 100644 Assets/VRM10/Editor/Vrm10TopMenu.cs.meta

diff --git a/Assets/VRM10/Editor/Components/VRM10Window.cs b/Assets/VRM10/Editor/Components/VRM10Window.cs
index 588d262d8..3612409eb 100644
--- a/Assets/VRM10/Editor/Components/VRM10Window.cs
+++ b/Assets/VRM10/Editor/Components/VRM10Window.cs
@@ -10,11 +10,8 @@ namespace UniVRM10
     /// </summary>
     public class VRM10Window : EditorWindow
     {
-        const string MENU_KEY = VRMVersion.MENU + "/VRM1 Window";
         const string WINDOW_TITLE = "VRM1 Window";
-
-        [MenuItem(MENU_KEY, false, 1)]
-        private static void ExportFromMenu()
+        public static void Open()
         {
             var window = (VRM10Window)GetWindow(typeof(VRM10Window));
             window.titleContent = new GUIContent(WINDOW_TITLE);
diff --git a/Assets/VRM10/Editor/GeneratorMenu.cs b/Assets/VRM10/Editor/GeneratorMenu.cs
index 1b4294680..f82349a1f 100644
--- a/Assets/VRM10/Editor/GeneratorMenu.cs
+++ b/Assets/VRM10/Editor/GeneratorMenu.cs
@@ -13,22 +13,8 @@ namespace UniVRM10
     /// は SubModuleになった。 `$ git submodule update --init` しておくこと。
     /// 
     /// </summary>
-    public static class Menu
+    public static class GeneratorMenu
     {
-#if VRM_DEVELOP        
-        [MenuItem(UniVRM10.VRMVersion.MENU + "/Generate from JsonSchema")]
-        public static void Generate()
-        {
-            Run(false);
-        }
-
-        [MenuItem(UniVRM10.VRMVersion.MENU + "/Generate from JsonSchema(debug)")]
-        public static void Parse()
-        {
-            Run(true);
-        }
-#endif
-
         struct GenerateInfo
         {
             public string JsonSchema;
@@ -49,7 +35,7 @@ namespace UniVRM10
 
         const string SPEC_DIR = "vrm-specification/specification";
 
-        static void Run(bool debug)
+        public static void Run(bool debug)
         {
             var projectRoot = new DirectoryInfo(Path.GetFullPath(Path.Combine(Application.dataPath, "../")));
 
diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs
index b49e234fd..2650292df 100644
--- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs
+++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs
@@ -13,10 +13,7 @@ namespace UniVRM10
 {
     public class VRM10ExportDialog : ExportDialogBase
     {
-        const string CONVERT_HUMANOID_KEY = VRMVersion.MENU + "/Export VRM-1.0";
-
-        [MenuItem(CONVERT_HUMANOID_KEY, false, 0)]
-        private static void ExportFromMenu()
+        public static void Open()
         {
             var window = (VRM10ExportDialog)GetWindow(typeof(VRM10ExportDialog));
             window.titleContent = new GUIContent("VRM-1.0 Exporter");
diff --git a/Assets/VRM10/Editor/Vrm10TopMenu.cs b/Assets/VRM10/Editor/Vrm10TopMenu.cs
new file mode 100644
index 000000000..8bb1a54c9
--- /dev/null
+++ b/Assets/VRM10/Editor/Vrm10TopMenu.cs
@@ -0,0 +1,25 @@
+using UnityEditor;
+
+namespace UniVRM10
+{
+    public static class Vrm10TopMenu
+    {
+        private const string UserMenuPrefix = VRMVersion.MENU;
+        private const string DevelopmentMenuPrefix = VRMVersion.MENU + "/Development";
+
+        const string CONVERT_HUMANOID_KEY = VRMVersion.MENU + "/Export VRM-1.0";
+        [MenuItem(UserMenuPrefix + "/Export VRM-1.0", priority = 1)]
+        static void OpenExportDialog() => VRM10ExportDialog.Open();
+
+#if VRM_DEVELOP        
+        [MenuItem(UserMenuPrefix + "/VRM1 Window", false, 2)]
+        static void OpenWindow() => VRM10Window.Open();
+
+        [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema")]
+        public static void Generate() => GeneratorMenu.Run(false);
+
+        [MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema(debug)")]
+        public static void Parse() => GeneratorMenu.Run(true);
+#endif
+    }
+}
diff --git a/Assets/VRM10/Editor/Vrm10TopMenu.cs.meta b/Assets/VRM10/Editor/Vrm10TopMenu.cs.meta
new file mode 100644
index 000000000..9750afd3e
--- /dev/null
+++ b/Assets/VRM10/Editor/Vrm10TopMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 935fd2eb9940f5d48933733f69a96113
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: