From 2c40aab10b45164552555c8392e2adb80e0c4ea6 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 15 Dec 2021 15:00:59 +0900 Subject: [PATCH] =?UTF-8?q?[1.0][Export]=20normalize=20validation=20?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/UniGLTF/Validation/HumanoidValidator.cs | 10 +++++++++- Assets/VRM/Editor/Format/VRMExporterWizard.cs | 3 ++- Assets/VRM10/Editor/Vrm10ExportDialog.cs | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Assets/UniGLTF/Editor/UniGLTF/Validation/HumanoidValidator.cs b/Assets/UniGLTF/Editor/UniGLTF/Validation/HumanoidValidator.cs index f1735075d..1d1b36a7e 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/Validation/HumanoidValidator.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/Validation/HumanoidValidator.cs @@ -76,7 +76,7 @@ namespace UniGLTF public static IReadOnlyList MeshInformations; public static bool EnableFreeze; - public static IEnumerable Validate(GameObject ExportRoot) + public static IEnumerable Validate_Normalize(GameObject ExportRoot) { if (!ExportRoot) { @@ -114,6 +114,14 @@ namespace UniGLTF } } } + } + + public static IEnumerable Validate_TPose(GameObject ExportRoot) + { + if (!ExportRoot) + { + yield break; + } // // animator diff --git a/Assets/VRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/Editor/Format/VRMExporterWizard.cs index 8e1e94441..171533f06 100644 --- a/Assets/VRM/Editor/Format/VRMExporterWizard.cs +++ b/Assets/VRM/Editor/Format/VRMExporterWizard.cs @@ -174,7 +174,8 @@ namespace VRM // Humanoid のチェック HumanoidValidator.MeshInformations = m_meshes.Meshes; HumanoidValidator.EnableFreeze = m_settings.PoseFreeze; - yield return HumanoidValidator.Validate; + yield return HumanoidValidator.Validate_Normalize; + yield return HumanoidValidator.Validate_TPose; // // VRM のチェック diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs index f72eeff94..245e1cebf 100644 --- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs +++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs @@ -136,7 +136,7 @@ namespace UniVRM10 yield break; } - yield return HumanoidValidator.Validate; + yield return HumanoidValidator.Validate_TPose; // MeshUtility.Validators.HumanoidValidator.EnableFreeze = false; // yield return MeshUtility.Validators.HumanoidValidator.Validate;