From d5c0d5a4847c47f2ff77a66e03881ec85bf320aa Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Fri, 4 Feb 2022 19:11:12 +0900 Subject: [PATCH] change name --- Assets/VRM10/Runtime/IO/Vrm10.cs | 22 +++++++++---------- .../VRM10Viewer/VRM10ViewerUI.cs | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/VRM10/Runtime/IO/Vrm10.cs b/Assets/VRM10/Runtime/IO/Vrm10.cs index 270492451..3a2f3e452 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10.cs @@ -24,7 +24,7 @@ namespace UniVRM10 /// /// vrm file path /// if true, this loader can load the vrm-0.x model as vrm-1.0 model with migration. - /// if true, vrm-1.0 models are forced to load in T-pose. + /// if true, vrm-1.0 models' transforms are normalized. (e.g. rotation, scaling) /// if true, show meshes when loaded. /// this loader use specified await strategy. /// this loader use specified material generation strategy. @@ -34,7 +34,7 @@ namespace UniVRM10 public static async Task LoadPathAsync( string path, bool canLoadVrm0X = true, - bool forceTPose = true, + bool normalizeTransform = true, bool showMeshes = true, IAwaitCaller awaitCaller = null, IMaterialDescriptorGenerator materialGenerator = null, @@ -45,7 +45,7 @@ namespace UniVRM10 path, System.IO.File.ReadAllBytes(path), canLoadVrm0X, - forceTPose, + normalizeTransform, showMeshes, awaitCaller, materialGenerator, @@ -58,7 +58,7 @@ namespace UniVRM10 /// /// vrm file data /// if true, this loader can load the vrm-0.x model as vrm-1.0 model with migration. - /// if true, vrm-1.0 models are forced to load in T-pose. + /// if true, vrm-1.0 models' transforms are normalized. (e.g. rotation, scaling) /// if true, show meshes when loaded. /// this loader use specified await strategy. /// this loader use specified material generation strategy. @@ -68,7 +68,7 @@ namespace UniVRM10 public static async Task LoadBytesAsync( byte[] bytes, bool canLoadVrm0X = true, - bool forceTPose = true, + bool normalizeTransform = true, bool showMeshes = true, IAwaitCaller awaitCaller = null, IMaterialDescriptorGenerator materialGenerator = null, @@ -79,7 +79,7 @@ namespace UniVRM10 string.Empty, bytes, canLoadVrm0X, - forceTPose, + normalizeTransform, showMeshes, awaitCaller, materialGenerator, @@ -91,7 +91,7 @@ namespace UniVRM10 string name, byte[] bytes, bool canLoadVrm0X, - bool forceTPose, + bool normalizeTransform, bool showMeshes, IAwaitCaller awaitCaller, IMaterialDescriptorGenerator materialGenerator, @@ -105,7 +105,7 @@ namespace UniVRM10 var vrm10Instance = await LoadVrm10DataAsync( vrm10Data, null, - forceTPose, + normalizeTransform, showMeshes, awaitCaller, materialGenerator, @@ -125,7 +125,7 @@ namespace UniVRM10 var instance = await LoadVrm10DataAsync( vrm10Data, migrationData, - forceTPose, + normalizeTransform, showMeshes, awaitCaller, materialGenerator, @@ -146,7 +146,7 @@ namespace UniVRM10 private static async Task LoadVrm10DataAsync( Vrm10Data vrm10Data, MigrationData migrationData, - bool forceTPose, + bool normalizeTransform, bool showMeshes, IAwaitCaller awaitCaller, IMaterialDescriptorGenerator materialGenerator, @@ -158,7 +158,7 @@ namespace UniVRM10 return default; } - using (var loader = new Vrm10Importer(vrm10Data, materialGenerator: materialGenerator, doNormalize: forceTPose)) + using (var loader = new Vrm10Importer(vrm10Data, materialGenerator: materialGenerator, doNormalize: normalizeTransform)) { // 1. Load meta information if callback was available. if (vrmMetaInformationCallback != null) diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs index 2bb86e1ba..77f191a0a 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs @@ -417,7 +417,7 @@ namespace UniVRM10.VRM10Viewer Debug.LogFormat("{0}", path); var vrm10Instance = await Vrm10.LoadPathAsync(path, canLoadVrm0X: true, - forceTPose: m_useNormalization.isOn, + normalizeTransform: m_useNormalization.isOn, showMeshes: false, awaitCaller: new RuntimeOnlyAwaitCaller(), materialGenerator: GetVrmMaterialDescriptorGenerator(m_useUrpMaterial.isOn),