コード整理

Assets/UniGLTF/Editor/Animation/AnimationValidator.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using MeshUtility;
-using MeshUtility.M17N;
 using UnityEditor;
 using UnityEngine;
 

Assets/UniGLTF/Editor/EditorSettingsValidator/Messages.cs

@@ -1,5 +1,4 @@
-using MeshUtility.M17N;
-
+
 namespace UniGLTF.EditorSettingsValidator
 {
     public enum Messages

Assets/UniGLTF/Editor/EditorSettingsValidator/UnityColorSpaceSettingsValidator.cs

@@ -1,5 +1,4 @@
-using MeshUtility.M17N;
-using UnityEditor;
+using UnityEditor;
 
 namespace UniGLTF.EditorSettingsValidator
 {

Assets/UniGLTF/Editor/EditorSettingsValidator/UnityEditorSettingsValidatorWindow.cs

@@ -1,5 +1,4 @@
 using System;
-using MeshUtility.M17N;
 using UnityEditor;
 using UnityEngine;
 

Assets/UniGLTF/MeshUtility/Editor/MeshProcessDialog.cs → Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using UnityEngine;
 using UnityEditor;
-using MeshUtility.M17N;
+using UniGLTF;
 
 namespace MeshUtility
 {

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExportDialogState.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs

@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace MeshUtility
+namespace UniGLTF
 {
     public delegate IEnumerable<Validation> Validator(GameObject root);
 

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExporterExtensions.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace MeshUtility
+namespace UniGLTF
 {
     public static class ExporterExtensions
     {

Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs

@@ -66,7 +66,7 @@ private static void Export(GameObject go, string path, MeshExportSettings settin
             }
         }
 
-        MeshUtility.ExporterDialogState m_state;
+        ExporterDialogState m_state;
         GltfExportSettings m_settings;
         Editor m_settingsInspector;
 
@@ -79,7 +79,7 @@ void OnEnable()
             m_settings = ScriptableObject.CreateInstance<GltfExportSettings>();
             m_settingsInspector = Editor.CreateEditor(m_settings);
 
-            m_state = new MeshUtility.ExporterDialogState();
+            m_state = new ExporterDialogState();
             m_state.ExportRootChanged += (root) =>
             {
                 Repaint();
@@ -120,9 +120,9 @@ static BeginVerticalScrollViewFunc BeginVerticalScrollView
         }
         private Vector2 m_ScrollPosition;
 
-        IEnumerable<MeshUtility.Validator> ValidatorFactory()
+        IEnumerable<Validator> ValidatorFactory()
         {
-            yield return MeshUtility.Validators.HierarchyValidator.ValidateRoot;
+            yield return HierarchyValidator.ValidateRoot;
             yield return AnimationValidator.Validate;
             if (!m_state.ExportRoot)
             {
@@ -143,7 +143,7 @@ private void OnGUI()
             EditorGUIUtility.labelWidth = 150;
 
             // lang
-            MeshUtility.M17N.Getter.OnGuiSelectLang();
+            Getter.OnGuiSelectLang();
 
             EditorGUILayout.LabelField("ExportRoot");
             {
@@ -198,7 +198,7 @@ bool ScrollArea()
             foreach (var v in m_state.Validations)
             {
                 v.DrawGUI();
-                if (v.ErrorLevel == MeshUtility.ErrorLevels.Critical)
+                if (v.ErrorLevel == ErrorLevels.Critical)
                 {
                     // Export UI を表示しない
                     return false;

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/M17N.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using UnityEditor;
 
-namespace MeshUtility.M17N
+namespace UniGLTF
 {
     /// <summary>
     /// 多言語対応
@@ -84,16 +84,16 @@ public static Languages Lang
 
         public static string Msg<T>(this T key) where T : Enum
         {
-            return M17N.MsgCache<T>.Get(Lang, key);
+            return MsgCache<T>.Get(Lang, key);
         }
 
         public static void OnGuiSelectLang()
         {
-            var lang = (M17N.Languages)EditorGUILayout.EnumPopup("lang", Lang);
+            var lang = (Languages)EditorGUILayout.EnumPopup("lang", Lang);
             if (lang != Lang)
             {
                 m_lang = lang;
-                EditorPrefs.SetString(LANG_KEY, M17N.Getter.Lang.ToString());
+                EditorPrefs.SetString(LANG_KEY, Getter.Lang.ToString());
             }
         }
     }

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/HierarchyValidator.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/HierarchyValidator.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using MeshUtility.M17N;
 using UnityEngine;
 
-namespace MeshUtility.Validators
+namespace UniGLTF
 {
     public static class HierarchyValidator
     {

Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/NameValidator.cs → Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/NameValidator.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using MeshUtility.M17N;
 using UnityEditor;
 using UnityEngine;
 
-namespace MeshUtility.Validators
+namespace UniGLTF
 {
     public class NameValidator
     {

Assets/UniGLTF/MeshUtility/Runtime/Validation.cs → Assets/UniGLTF/Runtime/UniGLTF/Validation.cs

@@ -4,7 +4,7 @@
 using UnityEditor;
 #endif
 
-namespace MeshUtility
+namespace UniGLTF
 {
     public enum ErrorLevels
     {

Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using MeshUtility;
+using UniGLTF;
 using UnityEngine;
 
 namespace VRM

Assets/VRM/Editor/FirstPerson/VRMFirstPersonEditor.cs

@@ -1,4 +1,4 @@
-using MeshUtility;
+using UniGLTF;
 using UnityEditor;
 using UnityEngine;
 

Assets/VRM/Editor/FirstPerson/VRMFirstPersonValidator.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MeshUtility;
+using UniGLTF;
 using UnityEngine;
 
 namespace VRM

Assets/VRM/Editor/Format/HumanoidValidator.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using MeshUtility;
-using MeshUtility.M17N;
+using UniGLTF;
 using UnityEngine;
 
 namespace VRM

Assets/VRM/Editor/Format/VRMExportMeshesEditor.cs

@@ -2,7 +2,6 @@
 using System;
 using UnityEditor;
 using UnityEngine;
-using MeshUtility.M17N;
 
 namespace VRM
 {

Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs

@@ -2,7 +2,6 @@
 using System;
 using UnityEditor;
 using UnityEngine;
-using MeshUtility.M17N;
 using System.Reflection;
 using System.Linq;
 using System.Collections.Generic;
@@ -49,7 +48,7 @@ public void Draw()
 
         static string Msg(Options key)
         {
-            return MeshUtility.M17N.Getter.Msg(key);
+            return Getter.Msg(key);
         }
 
         public enum Options

Assets/VRM/Editor/Format/VRMExporterVaildator.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-using MeshUtility;
-using MeshUtility.M17N;
+using UniGLTF;
 using UnityEngine;
 
 namespace VRM
@@ -32,9 +31,9 @@ public static IEnumerable<Validation> Validate(GameObject ExportRoot)
             if (vrmMeta != null && vrmMeta.Meta != null && vrmMeta.Meta.Thumbnail != null)
             {
                 var thumbnailName = vrmMeta.Meta.Thumbnail.name;
-                if (MeshUtility.Validators.NameValidator.IsFileNameLengthTooLong(thumbnailName))
+                if (NameValidator.IsFileNameLengthTooLong(thumbnailName))
                 {
-                    yield return Validation.Error(MeshUtility.Validators.NameValidator.ValidationMessages.FILENAME_TOO_LONG.Msg() + thumbnailName);
+                    yield return Validation.Error(NameValidator.ValidationMessages.FILENAME_TOO_LONG.Msg() + thumbnailName);
                 }
             }
         }