-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix message bus not handling base classes and interfaces, rename defa…
…ult implementations of some systems, add more tests
- Loading branch information
Showing
20 changed files
with
406 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
161 changes: 161 additions & 0 deletions
161
Packages/com.chark.game-management/Runtime/Messaging/DefaultMessageBus.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using CHARK.GameManagement.Utilities; | ||
|
|
||
| namespace CHARK.GameManagement.Messaging | ||
| { | ||
| internal sealed class DefaultMessageBus : IMessageBus | ||
| { | ||
| private readonly IDictionary<Type, Type[]> interfacesByListenerTypeCache = | ||
| new Dictionary<Type, Type[]>(); | ||
|
|
||
| private readonly IDictionary<Type, MessageListener> listenersByType = | ||
| new Dictionary<Type, MessageListener>(); | ||
|
|
||
| public int CachedTypeCount => interfacesByListenerTypeCache.Count; | ||
|
|
||
| public int MessageListenerCount => listenersByType.Count; | ||
|
|
||
| public int TotalListenerCount | ||
| { | ||
| get | ||
| { | ||
| var totalListenerCount = 0; | ||
| foreach (var messageListener in listenersByType.Values) | ||
| { | ||
| totalListenerCount += messageListener.ListenerCount; | ||
| } | ||
|
|
||
| return totalListenerCount; | ||
| } | ||
| } | ||
|
|
||
| public void Publish<TMessage>(TMessage message) where TMessage : IMessage | ||
| { | ||
| #if UNITY_EDITOR | ||
| if (message == null) | ||
| { | ||
| Logging.LogError($"Message of type {typeof(TMessage)} cannot be null", GetType()); | ||
| return; | ||
| } | ||
| #endif | ||
|
|
||
| if (TryGetListener<TMessage>(out var messageListener) == false) | ||
| { | ||
| #if UNITY_EDITOR | ||
| Logging.LogWarning($"Could not find a listener for {typeof(TMessage)}", GetType()); | ||
| #endif | ||
| return; | ||
| } | ||
|
|
||
| messageListener.Raise(message); | ||
| } | ||
|
|
||
| public void AddListener<TMessage>(OnMessageReceived<TMessage> listener) where TMessage : IMessage | ||
| { | ||
| #if UNITY_EDITOR | ||
| if (listener == null) | ||
| { | ||
| Logging.LogError($"Listener of type {typeof(TMessage)} cannot be null", GetType()); | ||
| return; | ||
| } | ||
| #endif | ||
|
|
||
| var listenerType = typeof(TMessage); | ||
| if (TryGetListener<TMessage>(out var messageListener)) | ||
| { | ||
| messageListener.AddListener(listener); | ||
| return; | ||
| } | ||
|
|
||
| var newMessageListener = new MessageListener(); | ||
| newMessageListener.AddListener(listener); | ||
|
|
||
| listenersByType[listenerType] = newMessageListener; | ||
| } | ||
|
|
||
| public void RemoveListener<TMessage>(OnMessageReceived<TMessage> listener) where TMessage : IMessage | ||
| { | ||
| #if UNITY_EDITOR | ||
| if (listener == null) | ||
| { | ||
| Logging.LogError($"Listener of type {typeof(TMessage)} cannot be null", GetType()); | ||
| return; | ||
| } | ||
| #endif | ||
|
|
||
| var listenerType = typeof(TMessage); | ||
| if (TryGetListener<TMessage>(out var messageListener) == false) | ||
| { | ||
| #if UNITY_EDITOR | ||
| Logging.LogWarning($"Could not find a listener for {typeof(TMessage)}", GetType()); | ||
| #endif | ||
| return; | ||
| } | ||
|
|
||
| messageListener.RemoveListener(listener); | ||
|
|
||
| if (messageListener.ListenerCount == 0) | ||
| { | ||
| interfacesByListenerTypeCache.Remove(listenerType); | ||
| listenersByType.Remove(listenerType); | ||
| } | ||
| } | ||
|
|
||
| private bool TryGetListener<TMessage>(out MessageListener listener) where TMessage : IMessage | ||
| { | ||
| var listenerType = typeof(TMessage); | ||
|
|
||
| // Simple base type listener, the most common case | ||
| { | ||
| if (listenersByType.TryGetValue(listenerType, out listener)) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| // Look up base types (abstract classes and such) | ||
| { | ||
| var listenerBaseType = listenerType.BaseType; | ||
| while (listenerBaseType != null && typeof(IMessage).IsAssignableFrom(listenerBaseType)) | ||
| { | ||
| if (listenersByType.TryGetValue(listenerBaseType, out listener)) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| listenerBaseType = listenerBaseType.BaseType; | ||
| } | ||
| } | ||
|
|
||
| // Look up interfaces | ||
| { | ||
| // ReSharper disable once InlineOutVariableDeclaration | ||
| Type[] interfaceTypes; | ||
|
|
||
| if (interfacesByListenerTypeCache.TryGetValue(listenerType, out interfaceTypes) == false) | ||
| { | ||
| interfaceTypes = listenerType.GetInterfaces(); | ||
| interfacesByListenerTypeCache[listenerType] = interfaceTypes; | ||
| } | ||
|
|
||
| // ReSharper disable once ForCanBeConvertedToForeach | ||
| for (var index = 0; index < interfaceTypes.Length; index++) | ||
| { | ||
| var interfaceType = interfaceTypes[index]; | ||
| if (typeof(IMessage).IsAssignableFrom(interfaceType) == false) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| if (listenersByType.TryGetValue(interfaceType, out listener)) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
| } | ||
| } |
File renamed without changes.
4 changes: 4 additions & 0 deletions
4
Packages/com.chark.game-management/Runtime/Messaging/Delegates.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| namespace CHARK.GameManagement.Messaging | ||
| { | ||
| public delegate void OnMessageReceived<in TMessage>(TMessage message) where TMessage : IMessage; | ||
| } |
3 changes: 3 additions & 0 deletions
3
Packages/com.chark.game-management/Runtime/Messaging/Delegates.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 0 additions & 82 deletions
82
Packages/com.chark.game-management/Runtime/Messaging/MessageBus.cs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.