Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-10-01 23:32:18 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1796 from matsutaka-pxv/add-iawaitcaller-to-loadfirstperson

Browse Source 
Add IAwaitCaller to VRMImporterContext.LoadFirstPerson
This commit is contained in:
ousttrue
2022-09-20 15:20:33 +09:00
committed by GitHub
parent be2b05249e 799857bb8b
commit 184d0bdc74
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@@ -66,7 +66,7 @@ namespace VRM
using (MeasureTime("VRM LoadFirstPerson"))
{
LoadFirstPerson();
await LoadFirstPerson(awaitCaller);
}
}
@@ -82,9 +82,10 @@ namespace VRM
Meta = meta;
}
void LoadFirstPerson()
async Task LoadFirstPerson(IAwaitCaller awaitCaller)
{
var firstPerson = Root.AddComponent<VRMFirstPerson>();
await awaitCaller.NextFrameIfTimedOut();
var gltfFirstPerson = VRM.firstPerson;
if (gltfFirstPerson.firstPersonBone != -1)
@@ -99,10 +100,13 @@ namespace VRM
firstPerson.FirstPersonOffset = gltfFirstPerson.firstPersonBoneOffset;
}
firstPerson.TraverseRenderers(this);
await awaitCaller.NextFrameIfTimedOut();
// LookAt
var lookAtHead = Root.AddComponent<VRMLookAtHead>();
await awaitCaller.NextFrameIfTimedOut();
lookAtHead.OnImported(this);
await awaitCaller.NextFrameIfTimedOut();
}
void LoadBlendShapeMaster()