Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-22 18:45:06 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

use RuntimeOnlyAwaitCaller

Browse Source
This commit is contained in:
ousttrue
2021-10-18 18:48:35 +09:00
parent 8ea504653e
commit 94fe98cbd0
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,7 +433,19 @@ namespace UniVRM10.VRM10Viewer
return;
}
if (Vrm10Data.TryParseOrMigrate(data, doMigrate: true, out Vrm10Data vrm))
var vrm = await System.Threading.Tasks.Task.Run(() =>
{
if (Vrm10Data.TryParseOrMigrate(data, doMigrate: true, out Vrm10Data _vrm))
{
return _vrm;
}
else
{
return null;
}
});
if (vrm != null)
{
// vrm
using (var loader = new Vrm10Importer(vrm, materialGenerator: GetVrmMaterialDescriptorGenerator(m_useUrpMaterial.isOn)))
@@ -452,7 +464,7 @@ namespace UniVRM10.VRM10Viewer
m_texts.UpdateMeta(vrm.VrmExtension.Meta, thumbnail);
}
var instance = await loader.LoadAsync();
var instance = await loader.LoadAsync(new RuntimeOnlyAwaitCaller());
SetModel(instance);
}
}
@@ -461,7 +473,7 @@ namespace UniVRM10.VRM10Viewer
// gltf
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetMaterialDescriptorGenerator(m_useUrpMaterial.isOn)))
{
var instance = await loader.LoadAsync();
var instance = await loader.LoadAsync(new RuntimeOnlyAwaitCaller());
SetModel(instance);
}
}