Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-13 06:20:01 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

throw if necessary.

Browse Source
This commit is contained in:
Masataka SUMI
2022-02-10 00:43:15 +09:00
parent 39a11f92f4
commit 6e4ef560fa
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,10 +104,7 @@ namespace UniVRM10
VrmMetaInformationCallback vrmMetaInformationCallback,
CancellationToken ct)
{
if (ct.IsCancellationRequested)
{
return default;
}
ct.ThrowIfCancellationRequested();
if (awaitCaller == null)
{
@@ -140,7 +137,7 @@ namespace UniVRM10
// 2. Stop loading if not allowed migration.
if (!canLoadVrm0X)
{
return default;
throw new Exception($"Failed to load as VRM 1.0: {name}");
}
// 3. Try migration from vrm-0.x into vrm-1.0
@@ -181,6 +178,12 @@ namespace UniVRM10
var vrm10Data = await awaitCaller.Run(() => Vrm10Data.Parse(gltfData));
ct.ThrowIfCancellationRequested();
if (vrm10Data == null)
{
// NOTE: Failed to parse as VRM 1.0.
return null;
}
return await LoadVrm10DataAsync(
vrm10Data,
null,
@@ -209,6 +212,11 @@ namespace UniVRM10
{
ct.ThrowIfCancellationRequested();
if (migratedVrm10Data == null)
{
throw new Exception(migrationData?.Message ?? "Failed to migrate.");
}
var migratedVrm10Instance = await LoadVrm10DataAsync(
migratedVrm10Data,
migrationData,
@@ -220,7 +228,7 @@ namespace UniVRM10
ct);
if (migratedVrm10Instance == null)
{
throw new Exception(migrationData?.Message ?? "Failed to migrate.");
throw new Exception(migrationData?.Message ?? "Failed to load migrated.");
}
return migratedVrm10Instance;
}
@@ -240,7 +248,7 @@ namespace UniVRM10
if (vrm10Data == null)
{
return default;
throw new ArgumentNullException(nameof(vrm10Data));
}
using (var loader = new Vrm10Importer(vrm10Data, materialGenerator: materialGenerator, doNormalize: normalizeTransform))