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

rename UniTask to DepthFirstScheduler

Browse Source
This commit is contained in:
ousttrue
2018-08-09 12:44:08 +09:00
parent 000248e729
commit af96524b4a
27 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/Format/VRMImporter.cs
View File

@@ -5,7 +5,7 @@ using UnityEngine;
using UniGLTF;
using System.Collections.Generic;
using System.Collections;
using UniTask;
using DepthFirstScheduler;
#if (NET_4_6 && UNITY_2017_1_OR_NEWER)
using System.Threading.Tasks;
#endif
@@ -414,17 +414,14 @@ namespace VRM
private static Schedulable<GameObject> LoadVrmAsyncInternal(VRMImporterContext ctx, bool show)
{
var schedulable = Schedulable.Create();
return schedulable
return Schedulable.Create()
.AddTask(Scheduler.ThreadPool, () =>
{
return glTF_VRM_Material.Parse(ctx.Json);
})
.ContinueWith(Scheduler.MainThread, x =>
.ContinueWith(Scheduler.MainThread, gltfMaterials =>
{
// material function
ctx.MaterialImporter = new VRMMaterialImporter(ctx, x);
ctx.MaterialImporter = new VRMMaterialImporter(ctx, gltfMaterials);
})
.OnExecute(Scheduler.ThreadPool, parent =>
{