Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-27 21:34:38 -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:45:23 +09:00
parent b91eb724d3
commit 8ea504653e
2 changed files with 336 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
View File

@@ -31,6 +31,9 @@ namespace VRM.SimpleViewer
[SerializeField]
Toggle m_useUrpMaterial = default;
[SerializeField]
Toggle m_useAsync = default;
[SerializeField]
Toggle m_useFastSpringBone = default;
#endregion
@@ -416,6 +419,18 @@ namespace VRM.SimpleViewer
}
}
static IAwaitCaller GetIAwaitCaller(bool useAsync)
{
if (useAsync)
{
return new RuntimeOnlyAwaitCaller();
}
else
{
return new ImmediateCaller();
}
}
async void LoadModelAsync(string path, bool isVrm)
{
if (!File.Exists(path))
@@ -444,7 +459,7 @@ namespace VRM.SimpleViewer
using (var loader = new VRMImporterContext(vrm, materialGenerator: GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm.VrmExtension)))
{
await m_texts.UpdateMetaAsync(loader);
var instance = await loader.LoadAsync();
var instance = await loader.LoadAsync(GetIAwaitCaller(m_useAsync.isOn));
SetModel(instance);
}
}
@@ -454,7 +469,7 @@ namespace VRM.SimpleViewer
Debug.LogWarning("file extension is vrm. but not vrm ?");
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetGltfMaterialGenerator(m_useUrpMaterial.isOn)))
{
var instance = await loader.LoadAsync();
var instance = await loader.LoadAsync(GetIAwaitCaller(m_useAsync.isOn));
SetModel(instance);
}
}
@@ -463,7 +478,7 @@ namespace VRM.SimpleViewer
{
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetGltfMaterialGenerator(m_useUrpMaterial.isOn)))
{
var instance = await loader.LoadAsync();
var instance = await loader.LoadAsync(GetIAwaitCaller(m_useAsync.isOn));
SetModel(instance);
}
}