Ellpeck/Coroutine
1
0
Fork 0
mirror of https://github.com/Ellpeck/Coroutine.git synced 2024-11-22 05:43:29 +01:00
Code Issues Projects Releases Wiki Activity

allow stopping coroutines

Browse source
This commit is contained in:
Ellpeck 2020-03-22 22:28:19 +01:00
parent 99de4c0072
commit bf792e3e73
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Coroutine/ActiveCoroutine.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Coroutine { namespace Coroutine {
@ -5,6 +6,8 @@ namespace Coroutine {
private readonly IEnumerator<IWait> enumerator; private readonly IEnumerator<IWait> enumerator;
public bool IsFinished { get; private set; } public bool IsFinished { get; private set; }
public bool WasCanceled { get; private set; }
public FinishCallback OnFinished;
internal ActiveCoroutine(IEnumerator<IWait> enumerator) { internal ActiveCoroutine(IEnumerator<IWait> enumerator) {
this.enumerator = enumerator; this.enumerator = enumerator;
@ -13,25 +16,34 @@ namespace Coroutine {
internal bool Tick(double deltaSeconds) { internal bool Tick(double deltaSeconds) {
var curr = this.enumerator.Current; var curr = this.enumerator.Current;
if (curr != null && curr.Tick(deltaSeconds)) { if (curr != null && curr.Tick(deltaSeconds))
if (!this.enumerator.MoveNext()) this.MoveNext();
this.IsFinished = true;
}
return this.IsFinished; return this.IsFinished;
} }
internal bool OnEvent(Event evt) { internal bool OnEvent(Event evt) {
var curr = this.enumerator.Current; var curr = this.enumerator.Current;
if (curr != null && curr.OnEvent(evt)) { if (curr != null && curr.OnEvent(evt))
if (!this.enumerator.MoveNext()) this.MoveNext();
this.IsFinished = true;
}
return this.IsFinished; return this.IsFinished;
} }
internal void Finish(bool cancel) {
this.IsFinished = true;
this.WasCanceled = cancel;
this.OnFinished?.Invoke(this, cancel);
}
private void MoveNext() {
if (!this.enumerator.MoveNext())
this.Finish(false);
}
internal WaitType GetCurrentType() { internal WaitType GetCurrentType() {
return this.enumerator.Current.GetWaitType(); return this.enumerator.Current.GetWaitType();
} }
public delegate void FinishCallback(ActiveCoroutine coroutine, bool canceled);
} }
} }

8
Coroutine/CoroutineHandler.cs
View file

@ -17,6 +17,14 @@ namespace Coroutine {
return inst; return inst;
} }
public static bool Stop(ActiveCoroutine coroutine) {
if (TickingCoroutines.Remove(coroutine) || EventCoroutines.Remove(coroutine)) {
coroutine.Finish(true);
return true;
}
return false;
}
public static void InvokeLater(IWait wait, Action action) { public static void InvokeLater(IWait wait, Action action) {
Start(InvokeLaterImpl(wait, action)); Start(InvokeLaterImpl(wait, action));
} }