Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-25 03:55:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

change name

Browse Source
This commit is contained in:
Masataka SUMI
2022-02-04 19:11:12 +09:00
parent 4fefbc38c3
commit d5c0d5a484
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/VRM10/Runtime/IO/Vrm10.cs
View File

@@ -24,7 +24,7 @@ namespace UniVRM10
/// </summary>
/// <param name="path">vrm file path</param>
/// <param name="canLoadVrm0X">if true, this loader can load the vrm-0.x model as vrm-1.0 model with migration.</param>
/// <param name="forceTPose">if true, vrm-1.0 models are forced to load in T-pose.</param>
/// <param name="normalizeTransform">if true, vrm-1.0 models' transforms are normalized. (e.g. rotation, scaling)</param>
/// <param name="showMeshes">if true, show meshes when loaded.</param>
/// <param name="awaitCaller">this loader use specified await strategy.</param>
/// <param name="materialGenerator">this loader use specified material generation strategy.</param>
@@ -34,7 +34,7 @@ namespace UniVRM10
public static async Task<Vrm10Instance> 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
/// </summary>
/// <param name="bytes">vrm file data</param>
/// <param name="canLoadVrm0X">if true, this loader can load the vrm-0.x model as vrm-1.0 model with migration.</param>
/// <param name="forceTPose">if true, vrm-1.0 models are forced to load in T-pose.</param>
/// <param name="normalizeTransform">if true, vrm-1.0 models' transforms are normalized. (e.g. rotation, scaling)</param>
/// <param name="showMeshes">if true, show meshes when loaded.</param>
/// <param name="awaitCaller">this loader use specified await strategy.</param>
/// <param name="materialGenerator">this loader use specified material generation strategy.</param>
@@ -68,7 +68,7 @@ namespace UniVRM10
public static async Task<Vrm10Instance> 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<Vrm10Instance> 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)

2
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -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),