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

Merge pull request #386 from hiroj/fix_onloadmodel_to_ienumerator

Browse Source 
onloadmodel to return ienumerator
This commit is contained in:
hiroj 2020-03-31 18:26:22 +09:00 committed by GitHub
commit e41708101c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
View File

@ -586,10 +586,10 @@ namespace UniGLTF
AnimationImporter.ImportAnimation(this);
}
})
.ContinueWithCoroutine(Scheduler.MainThread, OnLoadModel)
.ContinueWith(Scheduler.CurrentThread,
_ =>
{
OnLoadModel();
if (m_showSpeedLog)
{
Debug.Log(GetSpeedLog());
@ -598,9 +598,10 @@ namespace UniGLTF
});
}
protected virtual void OnLoadModel()
protected virtual IEnumerator OnLoadModel()
{
Root.name = "GLTF";
yield break;
}
IEnumerator TexturesProcessOnAnyThread()

10
Assets/VRM/UniVRM/Scripts/Format/VRMImporterContext.cs
View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using UniGLTF;
using UnityEngine;
using System.IO;
using System.Collections;
namespace VRM
{
@ -39,7 +39,7 @@ namespace VRM
}
#region OnLoad
protected override void OnLoadModel()
protected override IEnumerator OnLoadModel()
{
Root.name = "VRM";
@ -47,21 +47,27 @@ namespace VRM
{
LoadMeta();
}
yield return null;
using (MeasureTime("VRM LoadHumanoid"))
{
LoadHumanoid();
}
yield return null;
using (MeasureTime("VRM LoadBlendShapeMaster"))
{
LoadBlendShapeMaster();
}
yield return null;
using (MeasureTime("VRM LoadSecondary"))
{
VRMSpringUtility.LoadSecondary(Root.transform, Nodes,
GLTF.extensions.VRM.secondaryAnimation);
}
yield return null;
using (MeasureTime("VRM LoadFirstPerson"))
{
LoadFirstPerson();