From 1582cd1c2406d2122f73ac37210a020bc603c7db Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 19 Apr 2021 15:13:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?TextureImporterConfigurator=20=E3=82=92=20V?= =?UTF-8?q?RMShaders.GLTF.IO.Editor=20=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/Editor/Format/VRMImporterMenu.cs | 2 +- .../VRM/Editor/Format/vrmAssetPostprocessor.cs | 2 +- .../ScriptedImporter/VrmScriptedImporterImpl.cs | 2 +- .../IO/Editor}/TextureImporterConfigurator.cs | 16 ++++++++-------- .../Editor}/TextureImporterConfigurator.cs.meta | 0 5 files changed, 11 insertions(+), 11 deletions(-) rename Assets/{UniGLTF/Editor/UniGLTF => VRMShaders/GLTF/IO/Editor}/TextureImporterConfigurator.cs (86%) rename Assets/{UniGLTF/Editor/UniGLTF => VRMShaders/GLTF/IO/Editor}/TextureImporterConfigurator.cs.meta (100%) diff --git a/Assets/VRM/Editor/Format/VRMImporterMenu.cs b/Assets/VRM/Editor/Format/VRMImporterMenu.cs index 2eca60a7e..fc5060f2d 100644 --- a/Assets/VRM/Editor/Format/VRMImporterMenu.cs +++ b/Assets/VRM/Editor/Format/VRMImporterMenu.cs @@ -85,7 +85,7 @@ namespace VRM var editor = new VRMEditorImporterContext(context, prefabPath); foreach (var (key, textureInfo) in new VRMMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser)) { - TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D)); + VRMShaders.TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D)); } context.Load(); editor.SaveAsAsset(); diff --git a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs index 4e35e2ad2..eba62377e 100644 --- a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs +++ b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs @@ -62,7 +62,7 @@ namespace VRM var editor = new VRMEditorImporterContext(context, prefabPath); foreach (var (key, textureInfo) in new VRMMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser)) { - TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D)); + VRMShaders.TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D)); } context.Load(); editor.SaveAsAsset(); diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs index e21721052..ed03b3ac2 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs @@ -101,7 +101,7 @@ namespace UniVRM10 // settings TextureImporters foreach (var (key, textureInfo) in Vrm10MaterialImporter.EnumerateAllTexturesDistinct(parser)) { - TextureImporterConfigurator.Configure(textureInfo, loader.TextureFactory.ExternalMap); + VRMShaders.TextureImporterConfigurator.Configure(textureInfo, loader.TextureFactory.ExternalMap); } loader.Load(); diff --git a/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs b/Assets/VRMShaders/GLTF/IO/Editor/TextureImporterConfigurator.cs similarity index 86% rename from Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs rename to Assets/VRMShaders/GLTF/IO/Editor/TextureImporterConfigurator.cs index 231f6123b..ab20a575c 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs +++ b/Assets/VRMShaders/GLTF/IO/Editor/TextureImporterConfigurator.cs @@ -2,16 +2,16 @@ using System.Collections.Generic; using UnityEditor; using UnityEngine; -using VRMShaders; -namespace UniGLTF + +namespace VRMShaders { public static class TextureImporterConfigurator { public static void ConfigureSize(Texture2D texture) { - var path = UnityPath.FromAsset(texture); - if (AssetImporter.GetAtPath(path.Value) is TextureImporter textureImporter) + var path = AssetDatabase.GetAssetPath(texture); + if (AssetImporter.GetAtPath(path) is TextureImporter textureImporter) { var maxSize = Mathf.Max(texture.width, texture.height); textureImporter.maxTextureSize @@ -30,8 +30,8 @@ namespace UniGLTF public static void ConfigureNormalMap(Texture2D texture) { - var path = UnityPath.FromAsset(texture); - if (AssetImporter.GetAtPath(path.Value) is TextureImporter textureImporter) + var path = AssetDatabase.GetAssetPath(texture); + if (AssetImporter.GetAtPath(path) is TextureImporter textureImporter) { #if VRM_DEVELOP Debug.Log($"{path} => normalmap"); @@ -47,8 +47,8 @@ namespace UniGLTF public static void ConfigureLinear(Texture2D texture) { - var path = UnityPath.FromAsset(texture); - if (AssetImporter.GetAtPath(path.Value) is TextureImporter textureImporter) + var path = AssetDatabase.GetAssetPath(texture); + if (AssetImporter.GetAtPath(path) is TextureImporter textureImporter) { #if VRM_DEVELOP Debug.Log($"{path} => linear"); diff --git a/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs.meta b/Assets/VRMShaders/GLTF/IO/Editor/TextureImporterConfigurator.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs.meta rename to Assets/VRMShaders/GLTF/IO/Editor/TextureImporterConfigurator.cs.meta From 042d5cde16f43e0ad4ff07e14e89a5edb92ba462 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 19 Apr 2021 15:16:15 +0900 Subject: [PATCH 2/4] =?UTF-8?q?VRM10=20VrmPreference=20=E3=82=92=20VRM=20?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/{VRM10 => VRM}/Editor/VrmPreference.cs | 4 ++-- Assets/{VRM10 => VRM}/Editor/VrmPreference.cs.meta | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Assets/{VRM10 => VRM}/Editor/VrmPreference.cs (96%) rename Assets/{VRM10 => VRM}/Editor/VrmPreference.cs.meta (83%) diff --git a/Assets/VRM10/Editor/VrmPreference.cs b/Assets/VRM/Editor/VrmPreference.cs similarity index 96% rename from Assets/VRM10/Editor/VrmPreference.cs rename to Assets/VRM/Editor/VrmPreference.cs index ca26b190b..ca7c1a3c0 100644 --- a/Assets/VRM10/Editor/VrmPreference.cs +++ b/Assets/VRM/Editor/VrmPreference.cs @@ -2,14 +2,14 @@ using UnityEngine; using UnityEditor; using System.Linq; -namespace UniVRM10 +namespace VRM { public static class VrmInfo { const string KEY_STOP_VRMASSETPOSTPROCESSOR = "StopVrmAssetPostProcessor"; const string ASSETPOSTPROCESSOR_STOP_SYMBOL = "VRM_STOP_ASSETPOSTPROCESSOR"; - [PreferenceItem("UniVRM")] + [PreferenceItem("VRM0")] private static void OnPreferenceGUI() { EditorGUI.BeginChangeCheck(); diff --git a/Assets/VRM10/Editor/VrmPreference.cs.meta b/Assets/VRM/Editor/VrmPreference.cs.meta similarity index 83% rename from Assets/VRM10/Editor/VrmPreference.cs.meta rename to Assets/VRM/Editor/VrmPreference.cs.meta index c58d27cfd..76225e266 100644 --- a/Assets/VRM10/Editor/VrmPreference.cs.meta +++ b/Assets/VRM/Editor/VrmPreference.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 470e88d5a064e7b4f829ab5fa8449d6e +guid: e5b8946e673f54a47bc28160002646b0 MonoImporter: externalObjects: {} serializedVersion: 2 From a07d00fcd2eda541dfefa20614ea024b08faa198 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 19 Apr 2021 15:19:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?MeshUtility=20=E3=82=92=20UniGLTF=20?= =?UTF-8?q?=E3=81=AE=20SubFolder=20=E3=81=AB=E7=A7=BB=E5=8B=95=E3=80=82asm?= =?UTF-8?q?def=20=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor.meta => Editor/MeshUtility.meta} | 0 .../MeshUtility}/AssetsPath.cs | 0 .../MeshUtility}/AssetsPath.cs.meta | 0 .../MeshUtility}/BoneMeshEraserWizard.cs | 0 .../MeshUtility}/BoneMeshEraserWizard.cs.meta | 0 .../MeshUtility}/ExportDialog.meta | 0 .../ExportDialog/ExportDialogState.cs | 0 .../ExportDialog/ExportDialogState.cs.meta | 0 .../ExportDialog/ExporterExtensions.cs | 0 .../ExportDialog/ExporterExtensions.cs.meta | 0 .../MeshUtility}/ExportDialog/M17N.cs | 0 .../MeshUtility}/ExportDialog/M17N.cs.meta | 0 .../MeshUtility}/ExportDialog/TabBar.cs | 0 .../MeshUtility}/ExportDialog/TabBar.cs.meta | 0 .../ExportDialog/Valildators.meta | 0 .../Valildators/HierarchyValidator.cs | 0 .../Valildators/HierarchyValidator.cs.meta | 0 .../ExportDialog/Valildators/NameValidator.cs | 0 .../Valildators/NameValidator.cs.meta | 0 .../MeshUtility}/HumanoidEditor.cs | 0 .../MeshUtility}/HumanoidEditor.cs.meta | 0 .../MeshUtility}/MeshProcessDialog.cs | 0 .../MeshUtility}/MeshProcessDialog.cs.meta | 0 .../MeshUtility}/MeshUtility.cs | 0 .../MeshUtility}/MeshUtility.cs.meta | 0 .../MeshUtility}/TextureSaver.cs | 0 .../MeshUtility}/TextureSaver.cs.meta | 0 Assets/UniGLTF/MeshUtility.meta | 8 ----- .../Editor/MeshUtility.Editor.asmdef | 17 --------- .../Editor/MeshUtility.Editor.asmdef.meta | 7 ---- Assets/UniGLTF/MeshUtility/LICENSE.md | 9 ----- Assets/UniGLTF/MeshUtility/LICENSE.md.meta | 7 ---- Assets/UniGLTF/MeshUtility/README.md | 36 ------------------- Assets/UniGLTF/MeshUtility/README.md.meta | 7 ---- Assets/UniGLTF/MeshUtility/README.url | 2 -- Assets/UniGLTF/MeshUtility/README.url.meta | 7 ---- .../MeshUtility/Runtime/MeshUtility.asmdef | 13 ------- .../Runtime/MeshUtility.asmdef.meta | 7 ---- .../Runtime.meta => Runtime/MeshUtility.meta} | 0 .../MeshUtility}/BindposeGizmo.cs | 0 .../MeshUtility}/BindposeGizmo.cs.meta | 0 .../MeshUtility}/BoneMeshEraser.cs | 0 .../MeshUtility}/BoneMeshEraser.cs.meta | 0 .../MeshUtility}/BoneNormalizer.cs | 0 .../MeshUtility}/BoneNormalizer.cs.meta | 0 .../MeshUtility}/Humanoid.cs | 0 .../MeshUtility}/Humanoid.cs.meta | 0 .../MeshUtility}/HumanoidLoader.cs | 0 .../MeshUtility}/HumanoidLoader.cs.meta | 0 .../MeshUtility}/MeshExtensions.cs | 0 .../MeshUtility}/MeshExtensions.cs.meta | 0 .../MeshUtility}/MeshIntegrationResult.cs | 0 .../MeshIntegrationResult.cs.meta | 0 .../MeshUtility}/MeshIntegrator.cs | 0 .../MeshUtility}/MeshIntegrator.cs.meta | 0 .../MeshUtility}/MeshIntegratorUtility.cs | 0 .../MeshIntegratorUtility.cs.meta | 0 .../MeshUtility}/StaticMeshIntegrator.cs | 0 .../MeshUtility}/StaticMeshIntegrator.cs.meta | 0 .../MeshUtility}/UnityExtensions.cs | 0 .../MeshUtility}/UnityExtensions.cs.meta | 0 .../MeshUtility}/UnityPath.cs | 0 .../MeshUtility}/UnityPath.cs.meta | 0 .../MeshUtility}/Validation.cs | 0 .../MeshUtility}/Validation.cs.meta | 0 65 files changed, 120 deletions(-) rename Assets/UniGLTF/{MeshUtility/Editor.meta => Editor/MeshUtility.meta} (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/AssetsPath.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/AssetsPath.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/BoneMeshEraserWizard.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/BoneMeshEraserWizard.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/ExportDialogState.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/ExportDialogState.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/ExporterExtensions.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/ExporterExtensions.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/M17N.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/M17N.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/TabBar.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/TabBar.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/Valildators.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/Valildators/HierarchyValidator.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/Valildators/HierarchyValidator.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/Valildators/NameValidator.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/ExportDialog/Valildators/NameValidator.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/HumanoidEditor.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/HumanoidEditor.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/MeshProcessDialog.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/MeshProcessDialog.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/MeshUtility.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/MeshUtility.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/TextureSaver.cs (100%) rename Assets/UniGLTF/{MeshUtility/Editor => Editor/MeshUtility}/TextureSaver.cs.meta (100%) delete mode 100644 Assets/UniGLTF/MeshUtility.meta delete mode 100644 Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef delete mode 100644 Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef.meta delete mode 100644 Assets/UniGLTF/MeshUtility/LICENSE.md delete mode 100644 Assets/UniGLTF/MeshUtility/LICENSE.md.meta delete mode 100644 Assets/UniGLTF/MeshUtility/README.md delete mode 100644 Assets/UniGLTF/MeshUtility/README.md.meta delete mode 100644 Assets/UniGLTF/MeshUtility/README.url delete mode 100644 Assets/UniGLTF/MeshUtility/README.url.meta delete mode 100644 Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef delete mode 100644 Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef.meta rename Assets/UniGLTF/{MeshUtility/Runtime.meta => Runtime/MeshUtility.meta} (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BindposeGizmo.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BindposeGizmo.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BoneMeshEraser.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BoneMeshEraser.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BoneNormalizer.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/BoneNormalizer.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/Humanoid.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/Humanoid.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/HumanoidLoader.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/HumanoidLoader.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshExtensions.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshExtensions.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegrationResult.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegrationResult.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegrator.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegrator.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegratorUtility.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/MeshIntegratorUtility.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/StaticMeshIntegrator.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/StaticMeshIntegrator.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/UnityExtensions.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/UnityExtensions.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/UnityPath.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/UnityPath.cs.meta (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/Validation.cs (100%) rename Assets/UniGLTF/{MeshUtility/Runtime => Runtime/MeshUtility}/Validation.cs.meta (100%) diff --git a/Assets/UniGLTF/MeshUtility/Editor.meta b/Assets/UniGLTF/Editor/MeshUtility.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor.meta rename to Assets/UniGLTF/Editor/MeshUtility.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/AssetsPath.cs b/Assets/UniGLTF/Editor/MeshUtility/AssetsPath.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/AssetsPath.cs rename to Assets/UniGLTF/Editor/MeshUtility/AssetsPath.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/AssetsPath.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/AssetsPath.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/AssetsPath.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/AssetsPath.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/BoneMeshEraserWizard.cs b/Assets/UniGLTF/Editor/MeshUtility/BoneMeshEraserWizard.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/BoneMeshEraserWizard.cs rename to Assets/UniGLTF/Editor/MeshUtility/BoneMeshEraserWizard.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/BoneMeshEraserWizard.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/BoneMeshEraserWizard.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/BoneMeshEraserWizard.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/BoneMeshEraserWizard.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExportDialogState.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExportDialogState.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExportDialogState.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExportDialogState.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExporterExtensions.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExporterExtensions.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExporterExtensions.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/ExporterExtensions.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/M17N.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/M17N.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/M17N.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/M17N.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/TabBar.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/TabBar.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/TabBar.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/TabBar.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/HierarchyValidator.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/HierarchyValidator.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/HierarchyValidator.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/HierarchyValidator.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/NameValidator.cs b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/NameValidator.cs rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/NameValidator.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/ExportDialog/Valildators/NameValidator.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/HumanoidEditor.cs b/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/HumanoidEditor.cs rename to Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/HumanoidEditor.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/HumanoidEditor.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/HumanoidEditor.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshProcessDialog.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/MeshProcessDialog.cs rename to Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshProcessDialog.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/MeshProcessDialog.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshUtility.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/MeshUtility.cs rename to Assets/UniGLTF/Editor/MeshUtility/MeshUtility.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/MeshUtility.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/MeshUtility.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/MeshUtility.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Editor/TextureSaver.cs b/Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/TextureSaver.cs rename to Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs diff --git a/Assets/UniGLTF/MeshUtility/Editor/TextureSaver.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Editor/TextureSaver.cs.meta rename to Assets/UniGLTF/Editor/MeshUtility/TextureSaver.cs.meta diff --git a/Assets/UniGLTF/MeshUtility.meta b/Assets/UniGLTF/MeshUtility.meta deleted file mode 100644 index 28298acd3..000000000 --- a/Assets/UniGLTF/MeshUtility.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f11c20c3f50e40b4f8f6259f8e0886e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef b/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef deleted file mode 100644 index 7e9613aba..000000000 --- a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "MeshUtility.Editor", - "references": [ - "MeshUtility" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef.meta b/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef.meta deleted file mode 100644 index ad84160c7..000000000 --- a/Assets/UniGLTF/MeshUtility/Editor/MeshUtility.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: eedb868807606df4db953419ab9e0780 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/LICENSE.md b/Assets/UniGLTF/MeshUtility/LICENSE.md deleted file mode 100644 index 7a9585e4b..000000000 --- a/Assets/UniGLTF/MeshUtility/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) 2020 VRM Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Assets/UniGLTF/MeshUtility/LICENSE.md.meta b/Assets/UniGLTF/MeshUtility/LICENSE.md.meta deleted file mode 100644 index 6462af9ec..000000000 --- a/Assets/UniGLTF/MeshUtility/LICENSE.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5759a25d3024bd94a92b0af38bac243c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/README.md b/Assets/UniGLTF/MeshUtility/README.md deleted file mode 100644 index 54a2405cc..000000000 --- a/Assets/UniGLTF/MeshUtility/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# MeshUtility - -Mesh processing tool in Unity platform. - -## Utilities - -[Details can be found here](https://vrm.dev/en/docs/univrm/gltf/mesh_utility/) - -## Import MeshUtility - -There are two ways to import MeshUtility into a Unity project. - -### 1. Unity Package Manager (from Unity 2019) - -You can add MeshUtility package via `UPM`. First click `Window` at the top of Unity Editor, then select `Package Manager`. - - - -In `Package Manager`, click `Add package from git URL` and paste `https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders` and `https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF` - - - -Now check your project window. In `Packages`, MeshUtility should be included in the `UniGLTF` folder. - -### 2. Add package name and its url in manifest.json - -Another way of importing MeshUtility is manually adding necessary information in manifest.json, which is in the directory of `Package folder` in your Unity project. Open manifest.json with text editor and add the followings in `dependencies`: - -```json -{ - "dependencies": { - "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders", - "com.vrmc.unigltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF", - } -} -``` diff --git a/Assets/UniGLTF/MeshUtility/README.md.meta b/Assets/UniGLTF/MeshUtility/README.md.meta deleted file mode 100644 index b5c1eb77b..000000000 --- a/Assets/UniGLTF/MeshUtility/README.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: febba2ec3ea2c9247ab21226ce81f924 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/README.url b/Assets/UniGLTF/MeshUtility/README.url deleted file mode 100644 index 9eba66bca..000000000 --- a/Assets/UniGLTF/MeshUtility/README.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://github.com/vrm-c/UniVRM/tree/master/Assets/UniGLTF/MeshUtility \ No newline at end of file diff --git a/Assets/UniGLTF/MeshUtility/README.url.meta b/Assets/UniGLTF/MeshUtility/README.url.meta deleted file mode 100644 index 6ee109b6c..000000000 --- a/Assets/UniGLTF/MeshUtility/README.url.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 42e2fc8311d7ef44fa3975996ba1645d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef b/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef deleted file mode 100644 index a7b8ef0e7..000000000 --- a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "MeshUtility", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef.meta b/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef.meta deleted file mode 100644 index 4085faa92..000000000 --- a/Assets/UniGLTF/MeshUtility/Runtime/MeshUtility.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 71ab1919192903d44971eedbc26b24d1 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/MeshUtility/Runtime.meta b/Assets/UniGLTF/Runtime/MeshUtility.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime.meta rename to Assets/UniGLTF/Runtime/MeshUtility.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BindposeGizmo.cs b/Assets/UniGLTF/Runtime/MeshUtility/BindposeGizmo.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BindposeGizmo.cs rename to Assets/UniGLTF/Runtime/MeshUtility/BindposeGizmo.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BindposeGizmo.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/BindposeGizmo.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BindposeGizmo.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/BindposeGizmo.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BoneMeshEraser.cs b/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BoneMeshEraser.cs rename to Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BoneMeshEraser.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BoneMeshEraser.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BoneNormalizer.cs b/Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BoneNormalizer.cs rename to Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/BoneNormalizer.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/BoneNormalizer.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/Humanoid.cs b/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/Humanoid.cs rename to Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/Humanoid.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/Humanoid.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/Humanoid.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/HumanoidLoader.cs b/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/HumanoidLoader.cs rename to Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/HumanoidLoader.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/HumanoidLoader.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/HumanoidLoader.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshExtensions.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshExtensions.cs rename to Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshExtensions.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshExtensions.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrationResult.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrationResult.cs rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrationResult.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrationResult.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrator.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrator.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrator.cs rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrator.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrator.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrator.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegrator.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrator.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegratorUtility.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegratorUtility.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegratorUtility.cs rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegratorUtility.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/MeshIntegratorUtility.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegratorUtility.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/MeshIntegratorUtility.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/MeshIntegratorUtility.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/StaticMeshIntegrator.cs b/Assets/UniGLTF/Runtime/MeshUtility/StaticMeshIntegrator.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/StaticMeshIntegrator.cs rename to Assets/UniGLTF/Runtime/MeshUtility/StaticMeshIntegrator.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/StaticMeshIntegrator.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/StaticMeshIntegrator.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/StaticMeshIntegrator.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/StaticMeshIntegrator.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/UnityExtensions.cs b/Assets/UniGLTF/Runtime/MeshUtility/UnityExtensions.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/UnityExtensions.cs rename to Assets/UniGLTF/Runtime/MeshUtility/UnityExtensions.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/UnityExtensions.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/UnityExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/UnityExtensions.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/UnityExtensions.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/UnityPath.cs b/Assets/UniGLTF/Runtime/MeshUtility/UnityPath.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/UnityPath.cs rename to Assets/UniGLTF/Runtime/MeshUtility/UnityPath.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/UnityPath.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/UnityPath.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/UnityPath.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/UnityPath.cs.meta diff --git a/Assets/UniGLTF/MeshUtility/Runtime/Validation.cs b/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/Validation.cs rename to Assets/UniGLTF/Runtime/MeshUtility/Validation.cs diff --git a/Assets/UniGLTF/MeshUtility/Runtime/Validation.cs.meta b/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs.meta similarity index 100% rename from Assets/UniGLTF/MeshUtility/Runtime/Validation.cs.meta rename to Assets/UniGLTF/Runtime/MeshUtility/Validation.cs.meta From 8d9de7a9d4115862e4dd5aed174a65f1fe29e6f6 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 19 Apr 2021 15:37:50 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Validation,=20=E5=A4=9A=E8=A8=80=E8=AA=9E?= =?UTF-8?q?=E5=8C=96=E3=82=92=20UniGLTF=20=E9=85=8D=E4=B8=8B=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/Animation/AnimationValidator.cs | 1 - .../Editor/EditorSettingsValidator/Messages.cs | 3 +-- .../UnityColorSpaceSettingsValidator.cs | 3 +-- .../UnityEditorSettingsValidatorWindow.cs | 1 - .../Editor/MeshUtility/MeshProcessDialog.cs | 2 +- .../{MeshUtility => UniGLTF}/ExportDialog.meta | 0 .../ExportDialog/ExportDialogState.cs | 2 +- .../ExportDialog/ExportDialogState.cs.meta | 0 .../ExportDialog/ExporterExtensions.cs | 2 +- .../ExportDialog/ExporterExtensions.cs.meta | 0 .../{ => ExportDialog}/GltfExportSettings.cs | 0 .../GltfExportSettings.cs.meta | 0 .../{ => ExportDialog}/GltfExportWindow.cs | 12 ++++++------ .../{ => ExportDialog}/GltfExportWindow.cs.meta | 0 .../ExportDialog/M17N.cs | 8 ++++---- .../ExportDialog/M17N.cs.meta | 0 .../ExportDialog/TabBar.cs | 0 .../ExportDialog/TabBar.cs.meta | 0 .../ExportDialog/Valildators.meta | 0 .../Valildators/HierarchyValidator.cs | 3 +-- .../Valildators/HierarchyValidator.cs.meta | 0 .../ExportDialog/Valildators/NameValidator.cs | 3 +-- .../Valildators/NameValidator.cs.meta | 0 .../{MeshUtility => UniGLTF}/Validation.cs | 2 +- .../{MeshUtility => UniGLTF}/Validation.cs.meta | 2 +- .../BlendShape/VRMBlendShapeProxyValidator.cs | 2 +- .../Editor/FirstPerson/VRMFirstPersonEditor.cs | 2 +- .../FirstPerson/VRMFirstPersonValidator.cs | 2 +- Assets/VRM/Editor/Format/HumanoidValidator.cs | 3 +-- .../VRM/Editor/Format/VRMExportMeshesEditor.cs | 1 - .../VRM/Editor/Format/VRMExportSettingsEditor.cs | 3 +-- Assets/VRM/Editor/Format/VRMExporterVaildator.cs | 7 +++---- Assets/VRM/Editor/Format/VRMExporterWizard.cs | 16 ++++++++-------- Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs | 10 +++++----- .../Editor/SpringBone/VRMSpringBoneValidator.cs | 2 +- Assets/VRM/Runtime/Meta/VRMMetaObject.cs | 2 +- .../SpringBone/VRMSpringBoneColliderGroup.cs | 2 +- Assets/VRM/Tests/InvalidFileNameTest.cs | 3 ++- Assets/VRM10/Editor/VRM10MetaObjectEditor.cs | 12 ++++++------ Assets/VRM10/Editor/Vrm10ExportDialog.cs | 12 ++++++------ ProjectSettings/ProjectVersion.txt | 3 +-- 41 files changed, 58 insertions(+), 68 deletions(-) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/ExportDialogState.cs (99%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/ExportDialogState.cs.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/ExporterExtensions.cs (94%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/ExporterExtensions.cs.meta (100%) rename Assets/UniGLTF/Editor/UniGLTF/{ => ExportDialog}/GltfExportSettings.cs (100%) rename Assets/UniGLTF/Editor/UniGLTF/{ => ExportDialog}/GltfExportSettings.cs.meta (100%) rename Assets/UniGLTF/Editor/UniGLTF/{ => ExportDialog}/GltfExportWindow.cs (95%) rename Assets/UniGLTF/Editor/UniGLTF/{ => ExportDialog}/GltfExportWindow.cs.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/M17N.cs (91%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/M17N.cs.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/TabBar.cs (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/TabBar.cs.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/Valildators.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/Valildators/HierarchyValidator.cs (98%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/Valildators/HierarchyValidator.cs.meta (100%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/Valildators/NameValidator.cs (98%) rename Assets/UniGLTF/Editor/{MeshUtility => UniGLTF}/ExportDialog/Valildators/NameValidator.cs.meta (100%) rename Assets/UniGLTF/Runtime/{MeshUtility => UniGLTF}/Validation.cs (99%) rename Assets/UniGLTF/Runtime/{MeshUtility => UniGLTF}/Validation.cs.meta (83%) diff --git a/Assets/UniGLTF/Editor/Animation/AnimationValidator.cs b/Assets/UniGLTF/Editor/Animation/AnimationValidator.cs index 8545cac80..120717b0e 100644 --- a/Assets/UniGLTF/Editor/Animation/AnimationValidator.cs +++ b/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; diff --git a/Assets/UniGLTF/Editor/EditorSettingsValidator/Messages.cs b/Assets/UniGLTF/Editor/EditorSettingsValidator/Messages.cs index ab55e046c..fef97c632 100644 --- a/Assets/UniGLTF/Editor/EditorSettingsValidator/Messages.cs +++ b/Assets/UniGLTF/Editor/EditorSettingsValidator/Messages.cs @@ -1,5 +1,4 @@ -using MeshUtility.M17N; - + namespace UniGLTF.EditorSettingsValidator { public enum Messages diff --git a/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityColorSpaceSettingsValidator.cs b/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityColorSpaceSettingsValidator.cs index e086636e5..6efda849a 100644 --- a/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityColorSpaceSettingsValidator.cs +++ b/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityColorSpaceSettingsValidator.cs @@ -1,5 +1,4 @@ -using MeshUtility.M17N; -using UnityEditor; +using UnityEditor; namespace UniGLTF.EditorSettingsValidator { diff --git a/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityEditorSettingsValidatorWindow.cs b/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityEditorSettingsValidatorWindow.cs index fcb8b91f7..d1f0825d5 100644 --- a/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityEditorSettingsValidatorWindow.cs +++ b/Assets/UniGLTF/Editor/EditorSettingsValidator/UnityEditorSettingsValidatorWindow.cs @@ -1,5 +1,4 @@ using System; -using MeshUtility.M17N; using UnityEditor; using UnityEngine; diff --git a/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs index f383a9885..b316f621d 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs +++ b/Assets/UniGLTF/Editor/MeshUtility/MeshProcessDialog.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using UnityEngine; using UnityEditor; -using MeshUtility.M17N; +using UniGLTF; namespace MeshUtility { diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs similarity index 99% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs index 4a5e3a7c9..b592a438a 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor; using UnityEngine; -namespace MeshUtility +namespace UniGLTF { public delegate IEnumerable Validator(GameObject root); diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExportDialogState.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs similarity index 94% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs index bc3da3375..c10c09b87 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs @@ -1,7 +1,7 @@ using System.Linq; using UnityEngine; -namespace MeshUtility +namespace UniGLTF { public static class ExporterExtensions { diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/ExporterExtensions.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExporterExtensions.cs.meta diff --git a/Assets/UniGLTF/Editor/UniGLTF/GltfExportSettings.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportSettings.cs similarity index 100% rename from Assets/UniGLTF/Editor/UniGLTF/GltfExportSettings.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportSettings.cs diff --git a/Assets/UniGLTF/Editor/UniGLTF/GltfExportSettings.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportSettings.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/UniGLTF/GltfExportSettings.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportSettings.cs.meta diff --git a/Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs similarity index 95% rename from Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs index 71f7d02e4..10ec1b905 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs @@ -66,7 +66,7 @@ namespace UniGLTF } } - MeshUtility.ExporterDialogState m_state; + ExporterDialogState m_state; GltfExportSettings m_settings; Editor m_settingsInspector; @@ -79,7 +79,7 @@ namespace UniGLTF m_settings = ScriptableObject.CreateInstance(); m_settingsInspector = Editor.CreateEditor(m_settings); - m_state = new MeshUtility.ExporterDialogState(); + m_state = new ExporterDialogState(); m_state.ExportRootChanged += (root) => { Repaint(); @@ -120,9 +120,9 @@ namespace UniGLTF } private Vector2 m_ScrollPosition; - IEnumerable ValidatorFactory() + IEnumerable ValidatorFactory() { - yield return MeshUtility.Validators.HierarchyValidator.ValidateRoot; + yield return HierarchyValidator.ValidateRoot; yield return AnimationValidator.Validate; if (!m_state.ExportRoot) { @@ -143,7 +143,7 @@ namespace UniGLTF EditorGUIUtility.labelWidth = 150; // lang - MeshUtility.M17N.Getter.OnGuiSelectLang(); + Getter.OnGuiSelectLang(); EditorGUILayout.LabelField("ExportRoot"); { @@ -198,7 +198,7 @@ namespace UniGLTF foreach (var v in m_state.Validations) { v.DrawGUI(); - if (v.ErrorLevel == MeshUtility.ErrorLevels.Critical) + if (v.ErrorLevel == ErrorLevels.Critical) { // Export UI を表示しない return false; diff --git a/Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/UniGLTF/GltfExportWindow.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs similarity index 91% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs index c3df13596..5fe1f692a 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; -namespace MeshUtility.M17N +namespace UniGLTF { /// /// 多言語対応 @@ -84,16 +84,16 @@ namespace MeshUtility.M17N public static string Msg(this T key) where T : Enum { - return M17N.MsgCache.Get(Lang, key); + return MsgCache.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()); } } } diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/M17N.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/M17N.cs.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/TabBar.cs similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/TabBar.cs diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/TabBar.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/TabBar.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/TabBar.cs.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/HierarchyValidator.cs similarity index 98% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/HierarchyValidator.cs index 5f7e238a2..ad8d4a48b 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs +++ b/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 { diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/HierarchyValidator.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/HierarchyValidator.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/HierarchyValidator.cs.meta diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/NameValidator.cs similarity index 98% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/NameValidator.cs index 74283bfcd..7db19e374 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs +++ b/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 { diff --git a/Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/NameValidator.cs.meta similarity index 100% rename from Assets/UniGLTF/Editor/MeshUtility/ExportDialog/Valildators/NameValidator.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ExportDialog/Valildators/NameValidator.cs.meta diff --git a/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs b/Assets/UniGLTF/Runtime/UniGLTF/Validation.cs similarity index 99% rename from Assets/UniGLTF/Runtime/MeshUtility/Validation.cs rename to Assets/UniGLTF/Runtime/UniGLTF/Validation.cs index ae9a00588..20e4ebdb7 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/Validation.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEditor; #endif -namespace MeshUtility +namespace UniGLTF { public enum ErrorLevels { diff --git a/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/Validation.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/MeshUtility/Validation.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/Validation.cs.meta index b7ff47730..a5bf3cd40 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/Validation.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/Validation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 703726d4973c85447a3bd2ae30c760f0 +guid: 221b6a77b68c6364a9f1387cf1ede576 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs b/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs index b660a742d..f1238fe85 100644 --- a/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs +++ b/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using MeshUtility; +using UniGLTF; using UnityEngine; namespace VRM diff --git a/Assets/VRM/Editor/FirstPerson/VRMFirstPersonEditor.cs b/Assets/VRM/Editor/FirstPerson/VRMFirstPersonEditor.cs index 53de7e2e6..1898e421d 100644 --- a/Assets/VRM/Editor/FirstPerson/VRMFirstPersonEditor.cs +++ b/Assets/VRM/Editor/FirstPerson/VRMFirstPersonEditor.cs @@ -1,4 +1,4 @@ -using MeshUtility; +using UniGLTF; using UnityEditor; using UnityEngine; diff --git a/Assets/VRM/Editor/FirstPerson/VRMFirstPersonValidator.cs b/Assets/VRM/Editor/FirstPerson/VRMFirstPersonValidator.cs index e083c2137..ed134b2d1 100644 --- a/Assets/VRM/Editor/FirstPerson/VRMFirstPersonValidator.cs +++ b/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 diff --git a/Assets/VRM/Editor/Format/HumanoidValidator.cs b/Assets/VRM/Editor/Format/HumanoidValidator.cs index c67649d78..3e81e51d8 100644 --- a/Assets/VRM/Editor/Format/HumanoidValidator.cs +++ b/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 diff --git a/Assets/VRM/Editor/Format/VRMExportMeshesEditor.cs b/Assets/VRM/Editor/Format/VRMExportMeshesEditor.cs index e48bbfd51..b1ea6c86d 100644 --- a/Assets/VRM/Editor/Format/VRMExportMeshesEditor.cs +++ b/Assets/VRM/Editor/Format/VRMExportMeshesEditor.cs @@ -2,7 +2,6 @@ using System; using UnityEditor; using UnityEngine; -using MeshUtility.M17N; namespace VRM { diff --git a/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs b/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs index 45b42e3bc..b4c24330a 100644 --- a/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs +++ b/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 @@ namespace VRM static string Msg(Options key) { - return MeshUtility.M17N.Getter.Msg(key); + return Getter.Msg(key); } public enum Options diff --git a/Assets/VRM/Editor/Format/VRMExporterVaildator.cs b/Assets/VRM/Editor/Format/VRMExporterVaildator.cs index 618ac3a94..edf3d1510 100644 --- a/Assets/VRM/Editor/Format/VRMExporterVaildator.cs +++ b/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 @@ namespace VRM 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); } } } diff --git a/Assets/VRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/Editor/Format/VRMExporterWizard.cs index 03cebe28c..756b75410 100644 --- a/Assets/VRM/Editor/Format/VRMExporterWizard.cs +++ b/Assets/VRM/Editor/Format/VRMExporterWizard.cs @@ -2,9 +2,9 @@ using System.IO; using System.Linq; using System.Reflection; -using MeshUtility.M17N; using UnityEditor; using UnityEngine; +using UniGLTF; namespace VRM { @@ -29,7 +29,7 @@ namespace VRM } Tabs _tab; - MeshUtility.ExporterDialogState m_state; + ExporterDialogState m_state; VRMExportSettings m_settings; VRMExportMeshes m_meshes; @@ -73,7 +73,7 @@ namespace VRM m_meshes = ScriptableObject.CreateInstance(); m_meshesInspector = Editor.CreateEditor(m_meshes); - m_state = new MeshUtility.ExporterDialogState(); + m_state = new ExporterDialogState(); m_state.ExportRootChanged += (root) => { // update meta @@ -151,13 +151,13 @@ namespace VRM } private Vector2 m_ScrollPosition; - IEnumerable ValidatorFactory() + IEnumerable ValidatorFactory() { HumanoidValidator.MeshInformations = m_meshes.Meshes; HumanoidValidator.EnableFreeze = m_settings.PoseFreeze; VRMExporterValidator.ReduceBlendshape = m_settings.ReduceBlendshape; - yield return MeshUtility.Validators.HierarchyValidator.Validate; + yield return HierarchyValidator.Validate; if (!m_state.ExportRoot) { yield break; @@ -198,7 +198,7 @@ namespace VRM EditorGUIUtility.labelWidth = 150; // lang - MeshUtility.M17N.Getter.OnGuiSelectLang(); + Getter.OnGuiSelectLang(); EditorGUILayout.LabelField("ExportRoot"); { @@ -253,7 +253,7 @@ namespace VRM foreach (var v in m_state.Validations) { v.DrawGUI(); - if (v.ErrorLevel == MeshUtility.ErrorLevels.Critical) + if (v.ErrorLevel == ErrorLevels.Critical) { // Export UI を表示しない return false; @@ -270,7 +270,7 @@ namespace VRM switch (meshInfo.VertexColor) { case UniGLTF.MeshExportInfo.VertexColorState.ExistsAndMixed: - MeshUtility.Validation.Warning($"{meshInfo.Renderer}: Both vcolor.multiply and not multiply unlit materials exist").DrawGUI(); + Validation.Warning($"{meshInfo.Renderer}: Both vcolor.multiply and not multiply unlit materials exist").DrawGUI(); break; } } diff --git a/Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs b/Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs index 5825cb55b..169cdac0a 100644 --- a/Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs +++ b/Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -using MeshUtility.M17N; using System.IO; +using UniGLTF; namespace VRM { @@ -55,12 +55,12 @@ namespace VRM static string RequiredMessage(string name) { - switch (MeshUtility.M17N.Getter.Lang) + switch (Getter.Lang) { - case MeshUtility.M17N.Languages.ja: + case Languages.ja: return $"必須項目。{name} を入力してください"; - case MeshUtility.M17N.Languages.en: + case Languages.en: return $"{name} is required"; default: @@ -162,7 +162,7 @@ namespace VRM static string Msg(MessageKeys key) { - return MeshUtility.M17N.Getter.Msg(key); + return Getter.Msg(key); } bool m_foldoutInfo = true; diff --git a/Assets/VRM/Editor/SpringBone/VRMSpringBoneValidator.cs b/Assets/VRM/Editor/SpringBone/VRMSpringBoneValidator.cs index 0d3b29fef..73baecc0b 100644 --- a/Assets/VRM/Editor/SpringBone/VRMSpringBoneValidator.cs +++ b/Assets/VRM/Editor/SpringBone/VRMSpringBoneValidator.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using MeshUtility; +using UniGLTF; using UnityEngine; namespace VRM diff --git a/Assets/VRM/Runtime/Meta/VRMMetaObject.cs b/Assets/VRM/Runtime/Meta/VRMMetaObject.cs index e1229d0d5..2e5848488 100644 --- a/Assets/VRM/Runtime/Meta/VRMMetaObject.cs +++ b/Assets/VRM/Runtime/Meta/VRMMetaObject.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using MeshUtility; +using UniGLTF; using UnityEngine; diff --git a/Assets/VRM/Runtime/SpringBone/VRMSpringBoneColliderGroup.cs b/Assets/VRM/Runtime/SpringBone/VRMSpringBoneColliderGroup.cs index bc4fb63ec..c7b44d23d 100644 --- a/Assets/VRM/Runtime/SpringBone/VRMSpringBoneColliderGroup.cs +++ b/Assets/VRM/Runtime/SpringBone/VRMSpringBoneColliderGroup.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using MeshUtility; +using UniGLTF; using UnityEngine; diff --git a/Assets/VRM/Tests/InvalidFileNameTest.cs b/Assets/VRM/Tests/InvalidFileNameTest.cs index 5208809c8..935bb0a41 100644 --- a/Assets/VRM/Tests/InvalidFileNameTest.cs +++ b/Assets/VRM/Tests/InvalidFileNameTest.cs @@ -1,6 +1,7 @@ using NUnit.Framework; using System.Linq; using System.IO; +using UniGLTF; namespace VRM { @@ -14,7 +15,7 @@ namespace VRM [TestCase("AliciaAliciaAliciaAliciaAliciaAliciaAliciaAliciaAliciaAliciaAliciaAlicia", true)] public void DetectFileNameLength(string fileName, bool isIllegal) { - var result = MeshUtility.Validators.NameValidator.IsFileNameLengthTooLong(fileName); + var result = NameValidator.IsFileNameLengthTooLong(fileName); Assert.AreEqual(result, isIllegal); } diff --git a/Assets/VRM10/Editor/VRM10MetaObjectEditor.cs b/Assets/VRM10/Editor/VRM10MetaObjectEditor.cs index fc568c025..3b97c6e72 100644 --- a/Assets/VRM10/Editor/VRM10MetaObjectEditor.cs +++ b/Assets/VRM10/Editor/VRM10MetaObjectEditor.cs @@ -1,6 +1,6 @@ using UnityEditor; using UnityEngine; -using MeshUtility.M17N; +using UniGLTF; namespace UniVRM10 { @@ -39,7 +39,7 @@ namespace UniVRM10 depth = iterator.depth; // using (new EditorGUI.DisabledScope("m_Script" == iterator.propertyPath)) - EditorGUILayout.PropertyField(iterator, true); + EditorGUILayout.PropertyField(iterator, true); } } else @@ -82,12 +82,12 @@ namespace UniVRM10 static string RequiredMessage(string name) { - switch (MeshUtility.M17N.Getter.Lang) + switch (Getter.Lang) { - case MeshUtility.M17N.Languages.ja: + case Languages.ja: return $"必須項目。{name} を入力してください"; - case MeshUtility.M17N.Languages.en: + case Languages.en: return $"{name} is required"; default: @@ -184,7 +184,7 @@ namespace UniVRM10 static string Msg(MessageKeys key) { - return MeshUtility.M17N.Getter.Msg(key); + return Getter.Msg(key); } bool m_foldoutInfo = true; diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs index 9cc0b8bcb..82eee3631 100644 --- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs +++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs @@ -32,7 +32,7 @@ namespace UniVRM10 } Tabs _tab; - MeshUtility.ExporterDialogState m_state; + ExporterDialogState m_state; VRM10MetaObject m_meta; VRM10MetaObject Meta @@ -72,7 +72,7 @@ namespace UniVRM10 m_tmpMeta = ScriptableObject.CreateInstance(); m_tmpMeta.Authors = new List { "" }; - m_state = new MeshUtility.ExporterDialogState(); + m_state = new ExporterDialogState(); m_state.ExportRootChanged += (root) => { // update meta @@ -130,9 +130,9 @@ namespace UniVRM10 } private Vector2 m_ScrollPosition; - IEnumerable ValidatorFactory() + IEnumerable ValidatorFactory() { - yield return MeshUtility.Validators.HierarchyValidator.Validate; + yield return HierarchyValidator.Validate; if (!m_state.ExportRoot) { yield break; @@ -173,7 +173,7 @@ namespace UniVRM10 EditorGUIUtility.labelWidth = 150; // lang - MeshUtility.M17N.Getter.OnGuiSelectLang(); + Getter.OnGuiSelectLang(); EditorGUILayout.LabelField("ExportRoot"); { @@ -228,7 +228,7 @@ namespace UniVRM10 foreach (var v in m_state.Validations) { v.DrawGUI(); - if (v.ErrorLevel == MeshUtility.ErrorLevels.Critical) + if (v.ErrorLevel == ErrorLevels.Critical) { // Export UI を表示しない return false; diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1aeef8d90..ca463ed35 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 2019.4.24f1 -m_EditorVersionWithRevision: 2019.4.24f1 (5da6f0345e82) +m_EditorVersion: 2018.4.27f1