From f7c95bcabd8dbdf28e490438c3fcc1cd87ac2a87 Mon Sep 17 00:00:00 2001 From: Yoshitaka Kimisaki Date: Fri, 5 Jul 2019 14:41:42 +0900 Subject: [PATCH] Add ToUniTask for AssetBundleRequest. --- Assets/UniRx.Async/UnityAsyncExtensions.cs | 184 +++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.cs b/Assets/UniRx.Async/UnityAsyncExtensions.cs index 7d7f0a8d..77fe595a 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.cs +++ b/Assets/UniRx.Async/UnityAsyncExtensions.cs @@ -59,6 +59,30 @@ public static ResourceRequestAwaiter GetAwaiter(this ResourceRequest resourceReq return new UniTask(awaiter); } + public static AssetBundleRequestAwaiter GetAwaiter(this AssetBundleRequest resourceRequest) + { + Error.ThrowArgumentNullException(resourceRequest, nameof(resourceRequest)); + return new AssetBundleRequestAwaiter(resourceRequest); + } + + public static UniTask ToUniTask(this AssetBundleRequest resourceRequest) + { + Error.ThrowArgumentNullException(resourceRequest, nameof(resourceRequest)); + return new UniTask(new AssetBundleRequestAwaiter(resourceRequest)); + } + + public static UniTask ConfigureAwait(this AssetBundleRequest resourceRequest, IProgress progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellation = default(CancellationToken)) + { + Error.ThrowArgumentNullException(resourceRequest, nameof(resourceRequest)); + + var awaiter = new AssetBundleRequestConfiguredAwaiter(resourceRequest, progress, cancellation); + if (!awaiter.IsCompleted) + { + PlayerLoopHelper.AddAction(timing, awaiter); + } + return new UniTask(awaiter); + } + #if ENABLE_WWW #if UNITY_2018_3_OR_NEWER @@ -443,6 +467,166 @@ public void UnsafeOnCompleted(Action continuation) } } + public struct AssetBundleRequestAwaiter : IAwaiter + { + AssetBundleRequest asyncOperation; + Action continuationAction; + AwaiterStatus status; + UnityEngine.Object result; + + public AssetBundleRequestAwaiter(AssetBundleRequest asyncOperation) + { + this.status = asyncOperation.isDone ? AwaiterStatus.Succeeded : AwaiterStatus.Pending; + this.asyncOperation = (this.status.IsCompleted()) ? null : asyncOperation; + this.result = (this.status.IsCompletedSuccessfully()) ? asyncOperation.asset : null; + this.continuationAction = null; + } + + public bool IsCompleted => status.IsCompleted(); + public AwaiterStatus Status => status; + + public UnityEngine.Object GetResult() + { + if (status == AwaiterStatus.Succeeded) return this.result; + + if (status == AwaiterStatus.Pending) + { + // first timing of call + if (asyncOperation.isDone) + { + status = AwaiterStatus.Succeeded; + } + else + { + Error.ThrowNotYetCompleted(); + } + } + + this.result = asyncOperation.asset; + + if (continuationAction != null) + { + asyncOperation.completed -= continuationAction; + asyncOperation = null; // remove reference. + continuationAction = null; + } + else + { + asyncOperation = null; // remove reference. + } + + return this.result; + } + + void IAwaiter.GetResult() => GetResult(); + + public void OnCompleted(Action continuation) + { + UnsafeOnCompleted(continuation); + } + + public void UnsafeOnCompleted(Action continuation) + { + Error.ThrowWhenContinuationIsAlreadyRegistered(continuationAction); + continuationAction = continuation.AsFuncOfT(); + asyncOperation.completed += continuationAction; + } + } + + class AssetBundleRequestConfiguredAwaiter : IAwaiter, IPlayerLoopItem + { + AssetBundleRequest asyncOperation; + IProgress progress; + CancellationToken cancellationToken; + AwaiterStatus status; + Action continuation; + UnityEngine.Object result; + + public AssetBundleRequestConfiguredAwaiter(AssetBundleRequest asyncOperation, IProgress progress, CancellationToken cancellationToken) + { + this.status = cancellationToken.IsCancellationRequested ? AwaiterStatus.Canceled + : asyncOperation.isDone ? AwaiterStatus.Succeeded + : AwaiterStatus.Pending; + + if (this.status.IsCompletedSuccessfully()) this.result = asyncOperation.asset; + if (this.status.IsCompleted()) return; + + this.asyncOperation = asyncOperation; + this.progress = progress; + this.cancellationToken = cancellationToken; + this.continuation = null; + this.result = null; + + TaskTracker.TrackActiveTask(this, 2); + } + + public bool IsCompleted => status.IsCompleted(); + public AwaiterStatus Status => status; + void IAwaiter.GetResult() => GetResult(); + + public UnityEngine.Object GetResult() + { + if (status == AwaiterStatus.Succeeded) return this.result; + + if (status == AwaiterStatus.Canceled) + { + Error.ThrowOperationCanceledException(); + } + + return Error.ThrowNotYetCompleted(); + } + + public bool MoveNext() + { + if (cancellationToken.IsCancellationRequested) + { + InvokeContinuation(AwaiterStatus.Canceled); + return false; + } + + if (progress != null) + { + progress.Report(asyncOperation.progress); + } + + if (asyncOperation.isDone) + { + this.result = asyncOperation.asset; + InvokeContinuation(AwaiterStatus.Succeeded); + return false; + } + + return true; + } + + void InvokeContinuation(AwaiterStatus status) + { + this.status = status; + var cont = this.continuation; + + // cleanup + TaskTracker.RemoveTracking(this); + this.continuation = null; + this.cancellationToken = CancellationToken.None; + this.progress = null; + this.asyncOperation = null; + + if (cont != null) cont.Invoke(); + } + + public void OnCompleted(Action continuation) + { + Error.ThrowWhenContinuationIsAlreadyRegistered(this.continuation); + this.continuation = continuation; + } + + public void UnsafeOnCompleted(Action continuation) + { + Error.ThrowWhenContinuationIsAlreadyRegistered(this.continuation); + this.continuation = continuation; + } + } + #if ENABLE_WWW #if UNITY_2018_3_OR_NEWER