Merge pull request #66 from techno-dwarf-works/dev

Version 1.5.92

Assets/BetterExtensions/Runtime/Extensions/AssetBundleRequestAwaiterExtensions.cs → Assets/BetterExtensions/Runtime/Extensions/AssetBundleRequestExtensions.cs

@@ -4,7 +4,7 @@
 
 namespace Better.Extensions.Runtime
 {
- public static class AssetBundleRequestAwaiterExtensions
+ public static class AssetBundleRequestExtensions
  {
  public static AssetBundleRequestAwaiter GetAwaiter(this AssetBundleRequest self)
  {

Assets/BetterExtensions/Runtime/Extensions/AsyncOperationExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using Better.Extensions.Runtime.Helpers;
+using UnityEngine;
+
+namespace Better.Extensions.Runtime
+{
+ public static class AsyncOperationExtensions
+ {
+ public static bool IsRelativeCompleted(this AsyncOperation self)
+ {
+ return self.allowSceneActivation ? self.isDone : self.progress >= 0.9f;
+ }
+
+ public static AsyncOperationAwaiter GetAwaiter(this AsyncOperation self)
+ {
+ if (self == null)
+ {
+ throw new ArgumentNullException(nameof(self));
+ }
+
+ return new AsyncOperationAwaiter(self);
+ }
+
+ public static async Task AwaitCompletion(this AsyncOperation self, IProgress<float> progress = null)
+ {
+ var awaiter = new AsyncOperationCompletionAwaiter(self, progress);
+ await awaiter.Task;
+ }
+ }
+}

Assets/BetterExtensions/Runtime/Extensions/ResourceRequestAwaiterExtensions.cs → Assets/BetterExtensions/Runtime/Extensions/ResourceRequestExtensions.cs

@@ -4,7 +4,7 @@
 
 namespace Better.Extensions.Runtime
 {
- public static class ResourceRequestAwaiterExtensions
+ public static class ResourceRequestExtensions
  {
  public static ResourceRequestAwaiter GetAwaiter(this ResourceRequest self)
  {

Assets/BetterExtensions/Runtime/Extensions/TaskExtensions.cs

@@ -9,6 +9,11 @@ public static async void Forget(this Task self)
  {
  await self;
  }
+
+ public static async void Forget<T>(this Task<T> self)
+ {
+ await self;
+ }
 
  public static Task WhenAll(this IEnumerable<Task> self)
  {

Assets/BetterExtensions/Runtime/Helpers/CompletionAwaiters/AsyncOperationCompletionAwaiter.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Threading;
+using UnityEngine;
+using ThreadingTask = System.Threading.Tasks.Task;
+
+namespace Better.Extensions.Runtime.Helpers
+{
+ internal class AsyncOperationCompletionAwaiter : BaseCompletionAwaiter<bool>
+ {
+ private readonly IProgress<float> _progress;
+
+ public AsyncOperationCompletionAwaiter(AsyncOperation sourceOperation, IProgress<float> progress = null)
+ : base(CancellationToken.None)
+ {
+ _progress = progress;
+ ProcessAsync(sourceOperation);
+ }
+
+ private async void ProcessAsync(AsyncOperation asyncOperation)
+ {
+ while (!asyncOperation.IsRelativeCompleted())
+ {
+ _progress?.Report(asyncOperation.progress);
+ await ThreadingTask.Yield();
+ }
+
+ SetResult(true);
+ }
+
+ protected override void OnCompleted(bool result)
+ {
+ _progress?.Report(1f);
+ }
+ }
+}

Assets/BetterExtensions/package.json

@@ -1,7 +1,7 @@
 {
  "name": "com.uurha.betterextensions",
  "displayName": "Better Extensions",
- "version": "1.5.91",
+ "version": "1.5.92",
  "unity": "2021.3",
  "description": "Unity extensions, serialize extension, async extension, string extension and UI extensions",
  "dependencies": {