diff --git a/Scripts/UniTask.meta b/Scripts/DepthFirstScheduler.meta similarity index 100% rename from Scripts/UniTask.meta rename to Scripts/DepthFirstScheduler.meta diff --git a/Scripts/UniTask/Functor.cs b/Scripts/DepthFirstScheduler/Functor.cs similarity index 95% rename from Scripts/UniTask/Functor.cs rename to Scripts/DepthFirstScheduler/Functor.cs index cb2a58961..506330542 100644 --- a/Scripts/UniTask/Functor.cs +++ b/Scripts/DepthFirstScheduler/Functor.cs @@ -1,7 +1,7 @@ using System; using System.Collections; -namespace UniTask +namespace DepthFirstScheduler { public enum ExecutionStatus { diff --git a/Scripts/UniTask/Functor.cs.meta b/Scripts/DepthFirstScheduler/Functor.cs.meta similarity index 100% rename from Scripts/UniTask/Functor.cs.meta rename to Scripts/DepthFirstScheduler/Functor.cs.meta diff --git a/Scripts/UniTask/LockQueue.cs b/Scripts/DepthFirstScheduler/LockQueue.cs similarity index 93% rename from Scripts/UniTask/LockQueue.cs rename to Scripts/DepthFirstScheduler/LockQueue.cs index bf369877a..3274fad27 100644 --- a/Scripts/UniTask/LockQueue.cs +++ b/Scripts/DepthFirstScheduler/LockQueue.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace UniTask +namespace DepthFirstScheduler { public class LockQueue where T : class { diff --git a/Scripts/UniTask/LockQueue.cs.meta b/Scripts/DepthFirstScheduler/LockQueue.cs.meta similarity index 100% rename from Scripts/UniTask/LockQueue.cs.meta rename to Scripts/DepthFirstScheduler/LockQueue.cs.meta diff --git a/Scripts/UniTask/MainThreadDispatcher.cs b/Scripts/DepthFirstScheduler/MainThreadDispatcher.cs similarity index 95% rename from Scripts/UniTask/MainThreadDispatcher.cs rename to Scripts/DepthFirstScheduler/MainThreadDispatcher.cs index d0bd8c208..92bcf697d 100644 --- a/Scripts/UniTask/MainThreadDispatcher.cs +++ b/Scripts/DepthFirstScheduler/MainThreadDispatcher.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace UniTask +namespace DepthFirstScheduler { /// /// UniRxのMainThreadDispatcherを参考にした。 diff --git a/Scripts/UniTask/MainThreadDispatcher.cs.meta b/Scripts/DepthFirstScheduler/MainThreadDispatcher.cs.meta similarity index 100% rename from Scripts/UniTask/MainThreadDispatcher.cs.meta rename to Scripts/DepthFirstScheduler/MainThreadDispatcher.cs.meta diff --git a/Scripts/UniTask/MonitorQueue.cs b/Scripts/DepthFirstScheduler/MonitorQueue.cs similarity index 92% rename from Scripts/UniTask/MonitorQueue.cs rename to Scripts/DepthFirstScheduler/MonitorQueue.cs index 034fc9112..bb5eeb1a7 100644 --- a/Scripts/UniTask/MonitorQueue.cs +++ b/Scripts/DepthFirstScheduler/MonitorQueue.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading; -namespace UniTask +namespace DepthFirstScheduler { /// /// http://blogs.msdn.com/b/toub/archive/2006/04/12/blocking-queues.aspx diff --git a/Scripts/UniTask/MonitorQueue.cs.meta b/Scripts/DepthFirstScheduler/MonitorQueue.cs.meta similarity index 100% rename from Scripts/UniTask/MonitorQueue.cs.meta rename to Scripts/DepthFirstScheduler/MonitorQueue.cs.meta diff --git a/Scripts/UniTask/Schedulable.cs b/Scripts/DepthFirstScheduler/Schedulable.cs similarity index 96% rename from Scripts/UniTask/Schedulable.cs rename to Scripts/DepthFirstScheduler/Schedulable.cs index db8f498ec..47dab7c66 100644 --- a/Scripts/UniTask/Schedulable.cs +++ b/Scripts/DepthFirstScheduler/Schedulable.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; #endif -namespace UniTask +namespace DepthFirstScheduler { public interface ISchedulable { diff --git a/Scripts/UniTask/Schedulable.cs.meta b/Scripts/DepthFirstScheduler/Schedulable.cs.meta similarity index 100% rename from Scripts/UniTask/Schedulable.cs.meta rename to Scripts/DepthFirstScheduler/Schedulable.cs.meta diff --git a/Scripts/UniTask/Scheduler.cs b/Scripts/DepthFirstScheduler/Scheduler.cs similarity index 75% rename from Scripts/UniTask/Scheduler.cs rename to Scripts/DepthFirstScheduler/Scheduler.cs index 90abc3e1a..20ae4d4a1 100644 --- a/Scripts/UniTask/Scheduler.cs +++ b/Scripts/DepthFirstScheduler/Scheduler.cs @@ -1,6 +1,6 @@ using System; -namespace UniTask +namespace DepthFirstScheduler { public interface IScheduler : IDisposable { diff --git a/Scripts/UniTask/Scheduler.cs.meta b/Scripts/DepthFirstScheduler/Scheduler.cs.meta similarity index 100% rename from Scripts/UniTask/Scheduler.cs.meta rename to Scripts/DepthFirstScheduler/Scheduler.cs.meta diff --git a/Scripts/UniTask/Scheduler.meta b/Scripts/DepthFirstScheduler/Scheduler.meta similarity index 100% rename from Scripts/UniTask/Scheduler.meta rename to Scripts/DepthFirstScheduler/Scheduler.meta diff --git a/Scripts/UniTask/Scheduler/CurrentThreadScheduler.cs b/Scripts/DepthFirstScheduler/Scheduler/CurrentThreadScheduler.cs similarity index 98% rename from Scripts/UniTask/Scheduler/CurrentThreadScheduler.cs rename to Scripts/DepthFirstScheduler/Scheduler/CurrentThreadScheduler.cs index 2d6c00161..2fa03e26b 100644 --- a/Scripts/UniTask/Scheduler/CurrentThreadScheduler.cs +++ b/Scripts/DepthFirstScheduler/Scheduler/CurrentThreadScheduler.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; -namespace UniTask +namespace DepthFirstScheduler { public static partial class Scheduler { diff --git a/Scripts/UniTask/Scheduler/CurrentThreadScheduler.cs.meta b/Scripts/DepthFirstScheduler/Scheduler/CurrentThreadScheduler.cs.meta similarity index 100% rename from Scripts/UniTask/Scheduler/CurrentThreadScheduler.cs.meta rename to Scripts/DepthFirstScheduler/Scheduler/CurrentThreadScheduler.cs.meta diff --git a/Scripts/UniTask/Scheduler/StepScheduler.cs b/Scripts/DepthFirstScheduler/Scheduler/StepScheduler.cs similarity index 97% rename from Scripts/UniTask/Scheduler/StepScheduler.cs rename to Scripts/DepthFirstScheduler/Scheduler/StepScheduler.cs index 76248017c..e5406ebe0 100644 --- a/Scripts/UniTask/Scheduler/StepScheduler.cs +++ b/Scripts/DepthFirstScheduler/Scheduler/StepScheduler.cs @@ -1,4 +1,4 @@ -namespace UniTask +namespace DepthFirstScheduler { public static partial class Scheduler { diff --git a/Scripts/UniTask/Scheduler/StepScheduler.cs.meta b/Scripts/DepthFirstScheduler/Scheduler/StepScheduler.cs.meta similarity index 100% rename from Scripts/UniTask/Scheduler/StepScheduler.cs.meta rename to Scripts/DepthFirstScheduler/Scheduler/StepScheduler.cs.meta diff --git a/Scripts/UniTask/Scheduler/ThreadPoolScheduler.cs b/Scripts/DepthFirstScheduler/Scheduler/ThreadPoolScheduler.cs similarity index 97% rename from Scripts/UniTask/Scheduler/ThreadPoolScheduler.cs rename to Scripts/DepthFirstScheduler/Scheduler/ThreadPoolScheduler.cs index 94e6316e7..6c2dbea93 100644 --- a/Scripts/UniTask/Scheduler/ThreadPoolScheduler.cs +++ b/Scripts/DepthFirstScheduler/Scheduler/ThreadPoolScheduler.cs @@ -1,6 +1,6 @@ using System; -namespace UniTask +namespace DepthFirstScheduler { public static partial class Scheduler { diff --git a/Scripts/UniTask/Scheduler/ThreadPoolScheduler.cs.meta b/Scripts/DepthFirstScheduler/Scheduler/ThreadPoolScheduler.cs.meta similarity index 100% rename from Scripts/UniTask/Scheduler/ThreadPoolScheduler.cs.meta rename to Scripts/DepthFirstScheduler/Scheduler/ThreadPoolScheduler.cs.meta diff --git a/Scripts/UniTask/Scheduler/ThreadScheduler.cs b/Scripts/DepthFirstScheduler/Scheduler/ThreadScheduler.cs similarity index 99% rename from Scripts/UniTask/Scheduler/ThreadScheduler.cs rename to Scripts/DepthFirstScheduler/Scheduler/ThreadScheduler.cs index 60c425bba..0c44c5507 100644 --- a/Scripts/UniTask/Scheduler/ThreadScheduler.cs +++ b/Scripts/DepthFirstScheduler/Scheduler/ThreadScheduler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace UniTask +namespace DepthFirstScheduler { public static partial class Scheduler { diff --git a/Scripts/UniTask/Scheduler/ThreadScheduler.cs.meta b/Scripts/DepthFirstScheduler/Scheduler/ThreadScheduler.cs.meta similarity index 100% rename from Scripts/UniTask/Scheduler/ThreadScheduler.cs.meta rename to Scripts/DepthFirstScheduler/Scheduler/ThreadScheduler.cs.meta diff --git a/Scripts/UniTask/TaskChain.cs b/Scripts/DepthFirstScheduler/TaskChain.cs similarity index 95% rename from Scripts/UniTask/TaskChain.cs rename to Scripts/DepthFirstScheduler/TaskChain.cs index 89b93cfe0..7928e5bd6 100644 --- a/Scripts/UniTask/TaskChain.cs +++ b/Scripts/DepthFirstScheduler/TaskChain.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Collections.Generic; -namespace UniTask +namespace DepthFirstScheduler { public enum ChainStatus { diff --git a/Scripts/UniTask/TaskChain.cs.meta b/Scripts/DepthFirstScheduler/TaskChain.cs.meta similarity index 100% rename from Scripts/UniTask/TaskChain.cs.meta rename to Scripts/DepthFirstScheduler/TaskChain.cs.meta diff --git a/Scripts/UniTask/Unit.cs b/Scripts/DepthFirstScheduler/Unit.cs similarity index 91% rename from Scripts/UniTask/Unit.cs rename to Scripts/DepthFirstScheduler/Unit.cs index 96e5194d1..c3a041d1e 100644 --- a/Scripts/UniTask/Unit.cs +++ b/Scripts/DepthFirstScheduler/Unit.cs @@ -1,6 +1,6 @@ using System; -namespace UniTask +namespace DepthFirstScheduler { [Serializable] public struct Unit : IEquatable diff --git a/Scripts/UniTask/Unit.cs.meta b/Scripts/DepthFirstScheduler/Unit.cs.meta similarity index 100% rename from Scripts/UniTask/Unit.cs.meta rename to Scripts/DepthFirstScheduler/Unit.cs.meta diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs index 5618a16d2..e0c2352f4 100644 --- a/Scripts/Format/VRMImporter.cs +++ b/Scripts/Format/VRMImporter.cs @@ -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 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 => {