Fix loading time issue

UnityGLTF/Assets/UnityGLTF/Scripts/Async/AsyncCoroutineHelper.cs

@@ -2,95 +2,38 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
+
 namespace UnityGLTF
 {
-	public interface IAsyncCoroutineHelper
-	{
-		Task RunAsTask(IEnumerator coroutine, string name);
-		Task YieldOnTimeout();
-	}
-
-	public class AsyncCoroutineHelper : MonoBehaviour, IAsyncCoroutineHelper
-	{
-		public float BudgetPerFrameInSeconds = 0.01f;
-
-		private Queue<CoroutineInfo> _actions = new Queue<CoroutineInfo>();
-		private WaitForEndOfFrame _waitForEndOfFrame = new WaitForEndOfFrame();
-		private float _timeout;
-
-		public Task RunAsTask(IEnumerator coroutine, string name)
-		{
-			TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
-			lock (_actions)
-			{
-				_actions.Enqueue(
-					new CoroutineInfo
-					{
-						Coroutine = coroutine,
-						Tcs = tcs,
-						Name = name
-					}
-				);
-			}
-
-			return tcs.Task;
-		}
-
-		public async Task YieldOnTimeout()
-		{
-			if (Time.realtimeSinceStartup > _timeout)
-			{
-				await RunAsTask(EmptyYieldEnum(), nameof(EmptyYieldEnum));
-			}
-		}
-
-		private void Start()
-		{
-			_timeout = Time.realtimeSinceStartup + BudgetPerFrameInSeconds;
-		}
-
-		private void Update()
-		{
-			StartCoroutine(ResetFrameTimeout());
-
-			CoroutineInfo ? coroutineInfo = null;
-
-			lock (_actions)
-			{
-				if (_actions.Count > 0)
-				{
-					coroutineInfo = _actions.Dequeue();
-				}
-			}
-
-			if (coroutineInfo != null)
-			{
-				StartCoroutine(CallMethodOnMainThread(coroutineInfo.Value));
-			}
-		}
-
-		private IEnumerator CallMethodOnMainThread(CoroutineInfo coroutineInfo)
-		{
-			yield return coroutineInfo.Coroutine;
-			coroutineInfo.Tcs.SetResult(true);
-		}
-
-		private IEnumerator EmptyYieldEnum()
-		{
-			yield break;
-		}
-
-		private IEnumerator ResetFrameTimeout()
-		{
-			yield return _waitForEndOfFrame;
-			_timeout = Time.realtimeSinceStartup + BudgetPerFrameInSeconds;
-		}
-
-		private struct CoroutineInfo
-		{
-			public IEnumerator Coroutine;
-			public TaskCompletionSource<bool> Tcs;
-			public string Name;
-		}
-	}
+    public class AsyncCoroutineHelper : MonoBehaviour
+    {
+        public float BudgetPerFrameInSeconds = 0.01f;
+
+        private WaitForEndOfFrame _waitForEndOfFrame = new WaitForEndOfFrame();
+        private float _timeout;
+
+        public async Task YieldOnTimeout()
+        {
+            if (Time.realtimeSinceStartup > _timeout)
+            {
+                await Task.Delay(1);
+            }
+        }
+
+        private void Start()
+        {
+            _timeout = Time.realtimeSinceStartup + BudgetPerFrameInSeconds;
+
+            StartCoroutine(ResetFrameTimeout());
+        }
+
+        private IEnumerator ResetFrameTimeout()
+        {
+            while (true)
+            {
+                yield return _waitForEndOfFrame;
+                _timeout = Time.realtimeSinceStartup + BudgetPerFrameInSeconds;
+            }
+        }
+    }
 }

UnityGLTF/Assets/UnityGLTF/Scripts/GLTFSceneImporter.cs

@@ -136,7 +136,7 @@ protected struct GLBStream
 			public long StartPosition;
 		}
 
-		protected IAsyncCoroutineHelper _asyncCoroutineHelper;
+		protected AsyncCoroutineHelper _asyncCoroutineHelper;
 
 		protected GameObject _lastLoadedScene;
 		protected readonly GLTFMaterial DefaultMaterial = new GLTFMaterial();