mirror of
https://github.com/Ellpeck/Coroutine.git
synced 2024-11-23 22:08:35 +01:00
only move coroutines that relate to the required type
This commit is contained in:
parent
19e8a74d2b
commit
10590841d2
1 changed files with 20 additions and 13 deletions
|
@ -69,7 +69,7 @@ namespace Coroutine {
|
|||
/// </summary>
|
||||
/// <param name="deltaSeconds">The amount of seconds that have passed since the last time this method was invoked</param>
|
||||
public void Tick(double deltaSeconds) {
|
||||
this.MoveOutstandingCoroutines();
|
||||
this.MoveOutstandingCoroutines(false);
|
||||
this.tickingCoroutines.RemoveAll(c => {
|
||||
if (c.Tick(deltaSeconds)) {
|
||||
return true;
|
||||
|
@ -95,7 +95,7 @@ namespace Coroutine {
|
|||
/// </summary>
|
||||
/// <param name="evt">The event to raise</param>
|
||||
public void RaiseEvent(Event evt) {
|
||||
this.MoveOutstandingCoroutines();
|
||||
this.MoveOutstandingCoroutines(true);
|
||||
var coroutines = this.GetEventCoroutines(evt, false);
|
||||
if (coroutines != null) {
|
||||
for (var i = 0; i < coroutines.Count; i++) {
|
||||
|
@ -120,19 +120,26 @@ namespace Coroutine {
|
|||
return this.tickingCoroutines.Concat(this.eventCoroutines.Values.SelectMany(c => c));
|
||||
}
|
||||
|
||||
private void MoveOutstandingCoroutines() {
|
||||
private void MoveOutstandingCoroutines(bool evt) {
|
||||
// RemoveWhere is twice as fast as iterating and then clearing
|
||||
if (this.eventCoroutinesToRemove.Count > 0) {
|
||||
this.eventCoroutinesToRemove.RemoveWhere(c => {
|
||||
this.GetEventCoroutines(c.Event, false).Remove(c);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
if (this.outstandingCoroutines.Count > 0) {
|
||||
this.outstandingCoroutines.RemoveWhere(c => {
|
||||
var list = c.IsWaitingForEvent ? this.GetEventCoroutines(c.Event, true) : this.tickingCoroutines;
|
||||
// we only want to enqueue coroutines that relate to the current type
|
||||
if (c.IsWaitingForEvent != evt)
|
||||
return false;
|
||||
var list = evt ? this.GetEventCoroutines(c.Event, true) : this.tickingCoroutines;
|
||||
var position = list.BinarySearch(c);
|
||||
list.Insert(position < 0 ? ~position : position, c);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private List<ActiveCoroutine> GetEventCoroutines(Event evt, bool create) {
|
||||
if (!this.eventCoroutines.TryGetValue(evt, out var ret) && create) {
|
||||
|
|
Loading…
Reference in a new issue