change: MA Info is now a normal editor window (#850)

bdunderscore · May 12, 2024 · bc12e3a · bc12e3a
1 parent 61a70fe
commit bc12e3a
Show file tree

Hide file tree

Showing 23 changed files with 239 additions and 472 deletions.
diff --git a/Editor/AvatarProcessor.cs b/Editor/AvatarProcessor.cs
@@ -22,25 +22,29 @@
  * SOFTWARE.
  */
 
+#region
+
 using System;
 using System.Runtime.CompilerServices;
 using nadena.dev.modular_avatar.ui;
 using UnityEditor;
 using UnityEngine;
 
+#endregion
+
 [assembly: InternalsVisibleTo("Tests")]
 
 namespace nadena.dev.modular_avatar.core.editor
 {
     public class AvatarProcessor
     {
-        [MenuItem("GameObject/ModularAvatar/Manual bake avatar", true, 100)]
+        [MenuItem(UnityMenuItems.GameObject_ManualBake, true, UnityMenuItems.GameObject_ManualBakeOrder)]
         static bool ValidateApplyToCurrentAvatarGameobject()
         {
             return ValidateApplyToCurrentAvatar();
         }
 
-        [MenuItem("GameObject/ModularAvatar/Manual bake avatar", false, 100)]
+        [MenuItem(UnityMenuItems.GameObject_ManualBake, false, UnityMenuItems.GameObject_ManualBakeOrder)]
         static void ApplyToCurrentAvatarGameobject()
         {
             ApplyToCurrentAvatar();

diff --git a/Editor/EasySetupOutfit.cs b/Editor/EasySetupOutfit.cs
@@ -2,6 +2,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using nadena.dev.modular_avatar.ui;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -114,11 +115,10 @@ private void OnGUI()
 
     internal static class EasySetupOutfit
     {
-        private const int PRIORITY = 49;
         private static string[] errorMessageGroups;
         private static string errorHeader;
 
-        [MenuItem("GameObject/ModularAvatar/Setup Outfit", false, PRIORITY)]
+        [MenuItem(UnityMenuItems.GameObject_SetupOutfit, false, UnityMenuItems.GameObject_SetupOutfitOrder)]
         internal static void SetupOutfit(MenuCommand cmd)
         {
             if (!ValidateSetupOutfit())

diff --git a/Editor/HarmonyPatches/InjectParamsUsageUI.cs b/Editor/HarmonyPatches/InjectParamsUsageUI.cs
diff --git a/Editor/HarmonyPatches/InjectParamsUsageUI.cs.meta b/Editor/HarmonyPatches/InjectParamsUsageUI.cs.meta
diff --git a/Editor/HarmonyPatches/PatchLoader.cs b/Editor/HarmonyPatches/PatchLoader.cs
@@ -17,7 +17,6 @@ internal class PatchLoader
             #if UNITY_2022_3_OR_NEWER
             HandleUtilityPatches.Patch_FilterInstanceIDs,
             PickingObjectPatch.Patch,
-            InjectParamsUsageUI.Patch,
             #endif
         };
 

diff --git a/Editor/Inspector/Common/LogoElement.cs b/Editor/Inspector/Common/LogoElement.cs
@@ -1,11 +1,13 @@
-using System.Collections.Generic;
+#region
+
+using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.TestTools;
 using UnityEngine.UIElements;
 
+#endregion
+
 namespace nadena.dev.modular_avatar.core.editor
 {
     public class LogoElement : VisualElement
@@ -85,19 +87,8 @@ void WalkTree(VisualElement visualElement)
 
         public LogoElement()
         {
-            _inner = new VisualElement();
-
+            _inner = new LogoImage();
             _inner.style.display = DisplayStyle.None;
-            _inner.style.flexDirection = FlexDirection.Row;
-            _inner.style.alignItems = Align.Center;
-            _inner.style.justifyContent = Justify.Center;
-
-            var image = new Image();
-            image.image = LogoDisplay.LOGO_ASSET;
-            image.style.width = new Length(LogoDisplay.ImageWidth(LogoDisplay.TARGET_HEIGHT), LengthUnit.Pixel);
-            image.style.height = new Length(LogoDisplay.TARGET_HEIGHT, LengthUnit.Pixel);
-
-            _inner.Add(image);
             this.Add(_inner);
 
             RegisterCallback<GeometryChangedEvent>(OnGeomChanged);

diff --git a/Editor/Inspector/Common/LogoImage.cs b/Editor/Inspector/Common/LogoImage.cs
@@ -0,0 +1,38 @@
+#region
+
+using UnityEngine.UIElements;
+
+#endregion
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    public class LogoImage : VisualElement
+    {
+        VisualElement _inner;
+
+        public new class UxmlFactory : UxmlFactory<LogoImage, UxmlTraits>
+        {
+        }
+
+        public new class UxmlTraits : VisualElement.UxmlTraits
+        {
+        }
+
+        public LogoImage()
+        {
+            _inner = new VisualElement();
+
+            _inner.style.flexDirection = FlexDirection.Row;
+            _inner.style.alignItems = Align.Center;
+            _inner.style.justifyContent = Justify.Center;
+
+            var image = new Image();
+            image.image = LogoDisplay.LOGO_ASSET;
+            image.style.width = new Length(LogoDisplay.ImageWidth(LogoDisplay.TARGET_HEIGHT), LengthUnit.Pixel);
+            image.style.height = new Length(LogoDisplay.TARGET_HEIGHT, LengthUnit.Pixel);
+
+            _inner.Add(image);
+            Add(_inner);
+        }
+    }
+}
diff --git a/Editor/Inspector/Common/LogoImage.cs.meta b/Editor/Inspector/Common/LogoImage.cs.meta
diff --git a/Editor/Inspector/LogoDisplay.cs b/Editor/Inspector/LogoDisplay.cs
@@ -1,7 +1,11 @@
-using System;
+#region
+
+using System;
 using UnityEditor;
 using UnityEngine;
 
+#endregion
+
 namespace nadena.dev.modular_avatar.core.editor
 {
     internal static class LogoDisplay
@@ -37,7 +41,7 @@ static LogoDisplay()
 
         internal static void DisplayLogo()
         {
-            if (LOGO_ASSET == null) return;
+            if (LOGO_ASSET == null || EditorStyles.label == null) return; 
 
             var height = TARGET_HEIGHT;
             var width = ImageWidth(height);

diff --git a/Editor/Localization/en-US.json b/Editor/Localization/en-US.json
@@ -246,5 +246,6 @@
   "ma_info.param_usage_ui.header": "Expressions Parameter Usage",
   "ma_info.param_usage_ui.other_objects": "Other objects on this avatar",
   "ma_info.param_usage_ui.free_space": "Unused parameter space ({0} bits)",
-  "ma_info.param_usage_ui.bits_template": "{0} ({1} bits)"
+  "ma_info.param_usage_ui.bits_template": "{0} ({1} bits)",
+  "ma_info.param_usage_ui.no_data": "[ NO DATA ]"
 }
diff --git a/Editor/Localization/ja-JP.json b/Editor/Localization/ja-JP.json
@@ -242,5 +242,6 @@
   "ma_info.param_usage_ui.header": "Expressions Parameter 使用状況",
   "ma_info.param_usage_ui.other_objects": "このアバター内の他のオブジェクト",
   "ma_info.param_usage_ui.free_space": "未使用領域 ({0} 個のビット)",
-  "ma_info.param_usage_ui.bits_template": "{0} ({1} 個のビットを使用中)"
+  "ma_info.param_usage_ui.bits_template": "{0} ({1} 個のビットを使用中)",
+  "ma_info.param_usage_ui.no_data": "[ NO DATA ]"
 }
diff --git a/Editor/Menu/MenuExtractor.cs b/Editor/Menu/MenuExtractor.cs
@@ -1,19 +1,23 @@
 #if MA_VRCSDK3_AVATARS
 
+#region
+
 using System;
+using System.IO;
 using System.Linq;
+using nadena.dev.modular_avatar.ui;
 using UnityEditor;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
 using VRC.SDK3.Avatars.ScriptableObjects;
 
+#endregion
+
 namespace nadena.dev.modular_avatar.core.editor
 {
     internal class MenuExtractor
     {
-        private const int PRIORITY = 49;
-
-        [MenuItem("GameObject/ModularAvatar/Extract menu", false, PRIORITY)]
+        [MenuItem(UnityMenuItems.GameObject_ExtractMenu, false, UnityMenuItems.GameObject_ExtractMenuOrder)]
         static void ExtractMenu(MenuCommand menuCommand)
         {
             if (!(menuCommand.context is GameObject gameObj)) return;
@@ -32,18 +36,18 @@ static void ExtractMenu(MenuCommand menuCommand)
 
             var assetPath = AssetDatabase.GetAssetPath(avatar.expressionsMenu);
             var dummyAssetPathBase = assetPath.Replace(".asset", " placeholder");
-            if (dummyAssetPathBase.StartsWith("Packages" + System.IO.Path.DirectorySeparatorChar))
+            if (dummyAssetPathBase.StartsWith("Packages" + Path.DirectorySeparatorChar))
             {
-                var filename = System.IO.Path.GetFileName(dummyAssetPathBase);
-                dummyAssetPathBase = System.IO.Path.Combine("Assets", filename);
+                var filename = Path.GetFileName(dummyAssetPathBase);
+                dummyAssetPathBase = Path.Combine("Assets", filename);
             }
 
             // Check that a similarly-named file doesn't already exist
             int i = 0;
             do
             {
                 var fullPath = dummyAssetPathBase + (i > 0 ? " " + i : "") + ".asset";
-                if (System.IO.File.Exists(fullPath))
+                if (File.Exists(fullPath))
                 {
                     var asset = AssetDatabase.LoadAssetAtPath<VRCExpressionsMenu>(fullPath);
                     if (asset != null && asset.controls.Count == 0)
@@ -52,7 +56,7 @@ static void ExtractMenu(MenuCommand menuCommand)
                         break;
                     }
                 }
-                else if (!System.IO.File.Exists(fullPath))
+                else if (!File.Exists(fullPath))
                 {
                     var dummyAsset = ScriptableObject.CreateInstance<VRCExpressionsMenu>();
                     AssetDatabase.CreateAsset(dummyAsset, fullPath);

diff --git a/Editor/ParamsUsage/ModularAvatarInformation.cs b/Editor/ParamsUsage/ModularAvatarInformation.cs
diff --git a/Editor/ParamsUsage/ModularAvatarInformation.cs.meta b/Editor/ParamsUsage/ModularAvatarInformation.cs.meta