Added methods

Juce-Assets · Jun 12, 2022 · 3a71761 · 3a71761
1 parent 9c9d847
commit 3a71761
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/Runtime/Loading/Services/ILoadingService.cs b/Runtime/Loading/Services/ILoadingService.cs
@@ -11,6 +11,7 @@ public interface ILoadingService
         void AddBeforeLoading(Func<CancellationToken, Task> func);
         void AddAfterLoading(Func<CancellationToken, Task> func);
 
-        void EnqueueLoad(params Func<CancellationToken, Task>[] func);
+        void Enqueue(params Func<CancellationToken, Task>[] functions);
+        void Enqueue(params Action[] actions);
     }
 }
diff --git a/Runtime/Loading/Services/LoadingService.cs b/Runtime/Loading/Services/LoadingService.cs
@@ -25,24 +25,41 @@ public void AddBeforeLoading(Func<CancellationToken, Task> func)
             afterLoad.Add(func);
         }
 
-        public void EnqueueLoad(params Func<CancellationToken, Task>[] func)
+        public void Enqueue(params Func<CancellationToken, Task>[] functions)
         {
-            if(sequencer.Count == 0)
+            OnStartLoading();
+
+            foreach (Func<CancellationToken, Task> function in functions)
             {
-                IsLoading = true;
+                sequencer.Play(function);
+            }
+        }
 
-                sequencer.OnComplete -= OnComplete;
-                sequencer.OnComplete += OnComplete;
+        public void Enqueue(params Action[] actions)
+        {
+            OnStartLoading();
+
+            foreach (Action action in actions)
+            {
+                sequencer.Play(action);
+            }
+        }
 
-                foreach (Func<CancellationToken, Task> before in beforeLoad)
-                {
-                    sequencer.Play(before.Invoke);
-                }
+        private void OnStartLoading()
+        {
+            if(sequencer.Count > 0)
+            {
+                return;
             }
 
-            foreach (Func<CancellationToken, Task> toLoad in func)
+            IsLoading = true;
+
+            sequencer.OnComplete -= OnComplete;
+            sequencer.OnComplete += OnComplete;
+
+            foreach (Func<CancellationToken, Task> before in beforeLoad)
             {
-                sequencer.Play(toLoad);
+                sequencer.Play(before.Invoke);
             }
         }