Separate eventbus

technologists-team · Aug 15, 2024 · 8fdaee2 · 8fdaee2
1 parent 770ec9f
commit 8fdaee2
Show file tree

Hide file tree

Showing 73 changed files with 155 additions and 105 deletions.
diff --git a/Hypercube.Client/Audio/Events/AudioLibraryInitializedEvent.cs b/Hypercube.Client/Audio/Events/AudioLibraryInitializedEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Audio.Events;
 

diff --git a/Hypercube.Client/Audio/Realisations/OpenAL/OpenAlAudioManager.cs b/Hypercube.Client/Audio/Realisations/OpenAL/OpenAlAudioManager.cs
@@ -2,7 +2,7 @@
 using Hypercube.Client.Audio.Events;
 using Hypercube.Client.Audio.Loading;
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Resources.Manager;
 using Hypercube.Shared.Runtimes.Event;

diff --git a/Hypercube.Client/Graphics/Events/GraphicsLibraryInitializedEvent.cs b/Hypercube.Client/Graphics/Events/GraphicsLibraryInitializedEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Events;
 

diff --git a/Hypercube.Client/Graphics/Events/MainWindowClosedEvent.cs b/Hypercube.Client/Graphics/Events/MainWindowClosedEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Graphics.Windowing;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Graphics.Windowing;
 
 namespace Hypercube.Client.Graphics.Events;
 

diff --git a/Hypercube.Client/Graphics/Events/RenderDrawingEvent.cs b/Hypercube.Client/Graphics/Events/RenderDrawingEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Events;
 

diff --git a/Hypercube.Client/Graphics/Events/WindowClosed.cs b/Hypercube.Client/Graphics/Events/WindowClosed.cs
@@ -1,5 +1,5 @@
-using Hypercube.Graphics.Windowing;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Graphics.Windowing;
 
 namespace Hypercube.Client.Graphics.Events;
 

diff --git a/Hypercube.Client/Graphics/Events/WindowFocusChangedEvent.cs b/Hypercube.Client/Graphics/Events/WindowFocusChangedEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Graphics.Windowing;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Graphics.Windowing;
 
 namespace Hypercube.Client.Graphics.Events;
 

diff --git a/Hypercube.Client/Graphics/ImGui/Events/ImGuiRenderEvent.cs b/Hypercube.Client/Graphics/ImGui/Events/ImGuiRenderEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.ImGui.Events;
 

diff --git a/Hypercube.Client/Graphics/ImGui/ImGui.cs b/Hypercube.Client/Graphics/ImGui/ImGui.cs
@@ -2,8 +2,8 @@
 using Hypercube.Client.Graphics.ImGui.Events;
 using Hypercube.Client.Graphics.Rendering;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.ImGui;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Runtimes.Loop.Event;
 using JetBrains.Annotations;

diff --git a/Hypercube.Client/Graphics/Realisation/OpenGL/Rendering/Renderer.cs b/Hypercube.Client/Graphics/Realisation/OpenGL/Rendering/Renderer.cs
@@ -5,7 +5,7 @@
 using Hypercube.Client.Graphics.Windows;
 using Hypercube.Client.Graphics.Windows.Realisation.Glfw;
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Resources.Container;
 using Hypercube.Shared.Resources.Manager;

diff --git a/Hypercube.Client/Graphics/Windows/Realisation/GLFW/GlfwWindowManager.Callbacks.cs b/Hypercube.Client/Graphics/Windows/Realisation/GLFW/GlfwWindowManager.Callbacks.cs
@@ -1,7 +1,7 @@
 using Hypercube.Client.Input.Events.Windowing;
+using Hypercube.EventBus.Events;
 using Hypercube.Input;
 using Hypercube.OpenGL.Utilities.Helpers;
-using Hypercube.Shared.EventBus.Events;
 using OpenTK.Windowing.GraphicsLibraryFramework;
 
 using GlfwKeyModifiers = OpenTK.Windowing.GraphicsLibraryFramework.KeyModifiers;

diff --git a/Hypercube.Client/Graphics/Windows/Realisation/GLFW/GlfwWindowManager.cs b/Hypercube.Client/Graphics/Windows/Realisation/GLFW/GlfwWindowManager.cs
@@ -2,9 +2,9 @@
 using Hypercube.Client.Graphics.Rendering;
 using Hypercube.Client.Input.Handler;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Graphics.Windowing;
 using Hypercube.Math.Vectors;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Logging;
 using OpenTK.Windowing.GraphicsLibraryFramework;
 

diff --git a/Hypercube.Client/Input/Events/KeyHandledEvent.cs b/Hypercube.Client/Input/Events/KeyHandledEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Input;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Input;
 
 namespace Hypercube.Client.Input.Events;
 

diff --git a/Hypercube.Client/Input/Events/MouseButtonHandledEvent.cs b/Hypercube.Client/Input/Events/MouseButtonHandledEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Input;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Input;
 
 namespace Hypercube.Client.Input.Events;
 

diff --git a/Hypercube.Client/Input/Events/Windowing/WindowingCharHandledEvent.cs b/Hypercube.Client/Input/Events/Windowing/WindowingCharHandledEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Input.Events.Windowing;
 

diff --git a/Hypercube.Client/Input/Events/Windowing/WindowingKeyHandledEvent.cs b/Hypercube.Client/Input/Events/Windowing/WindowingKeyHandledEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Input;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Input;
 
 namespace Hypercube.Client.Input.Events.Windowing;
 

diff --git a/Hypercube.Client/Input/Events/Windowing/WindowingMouseButtonHandledEvent.cs b/Hypercube.Client/Input/Events/Windowing/WindowingMouseButtonHandledEvent.cs
@@ -1,5 +1,5 @@
-using Hypercube.Input;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Input;
 
 namespace Hypercube.Client.Input.Events.Windowing;
 

diff --git a/Hypercube.Client/Input/Events/Windowing/WindowingScrollHandledEvent.cs b/Hypercube.Client/Input/Events/Windowing/WindowingScrollHandledEvent.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 
 namespace Hypercube.Client.Input.Events.Windowing;
 

diff --git a/Hypercube.Client/Input/Handler/IInputHandler.cs b/Hypercube.Client/Input/Handler/IInputHandler.cs
@@ -1,6 +1,6 @@
 using Hypercube.Client.Graphics.Windows;
+using Hypercube.EventBus;
 using Hypercube.Input;
-using Hypercube.Shared.EventBus;
 
 namespace Hypercube.Client.Input.Handler;
 

diff --git a/Hypercube.Client/Input/Handler/InputHandler.cs b/Hypercube.Client/Input/Handler/InputHandler.cs
@@ -2,8 +2,8 @@
 using Hypercube.Client.Input.Events;
 using Hypercube.Client.Input.Events.Windowing;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Input;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Runtimes.Loop.Event;
 

diff --git a/Hypercube.Client/Runtimes/Loop/RuntimeLoop.cs b/Hypercube.Client/Runtimes/Loop/RuntimeLoop.cs
@@ -1,5 +1,5 @@
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Runtimes.Loop;
 using Hypercube.Shared.Runtimes.Loop.Event;
 using Hypercube.Shared.Timing;

diff --git a/Hypercube.Client/Runtimes/Runtime.cs b/Hypercube.Client/Runtimes/Runtime.cs
@@ -1,6 +1,6 @@
 using Hypercube.Client.Graphics.Events;
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Runtimes;
 using Hypercube.Shared.Runtimes.Event;

diff --git a/Hypercube.Shared/EventBus/EventBus.cs → Hypercube.EventBus/EventBus.cs b/Hypercube.Shared/EventBus/EventBus.cs → Hypercube.EventBus/EventBus.cs
@@ -1,10 +1,16 @@
 using System.Runtime.CompilerServices;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
 using Hypercube.Utilities.Ref;
 using Hypercube.Utilities.Units;
+using JetBrains.Annotations;
 
-namespace Hypercube.Shared.EventBus;
+namespace Hypercube.EventBus;
 
+/// <summary>
+/// EventBus providing interaction between loosely coupled
+/// components according to the principle of "event publisher -> event subscriber".
+/// </summary>
+[PublicAPI]
 public sealed class EventBus : IEventBus
 {
     private readonly Dictionary<Type, HashSet<EventSubscription>> _eventRegistration = new();

diff --git a/Hypercube.EventBus/EventRefHandler.cs b/Hypercube.EventBus/EventRefHandler.cs
@@ -0,0 +1,8 @@
+using Hypercube.EventBus.Events;
+using JetBrains.Annotations;
+
+namespace Hypercube.EventBus;
+
+[PublicAPI]
+public delegate void EventRefHandler<T>(ref T args)
+    where T : IEventArgs;
diff --git a/...cube.Shared/EventBus/EventSubscription.cs → Hypercube.EventBus/EventSubscription.cs b/...cube.Shared/EventBus/EventSubscription.cs → Hypercube.EventBus/EventSubscription.cs
@@ -1,7 +1,9 @@
 using Hypercube.Utilities.Ref;
+using JetBrains.Annotations;
 
-namespace Hypercube.Shared.EventBus;
+namespace Hypercube.EventBus;
 
+[PublicAPI]
 public sealed class EventSubscription : IEquatable<EventSubscription>
 {
     public RefHandler Handler { get; }

diff --git a/...d/EventBus/Events/CancellableEventArgs.cs → ...e.EventBus/Events/CancellableEventArgs.cs b/...d/EventBus/Events/CancellableEventArgs.cs → ...e.EventBus/Events/CancellableEventArgs.cs
@@ -1,5 +1,8 @@
-namespace Hypercube.Shared.EventBus.Events;
+using JetBrains.Annotations;
 
+namespace Hypercube.EventBus.Events;
+
+[PublicAPI]
 public abstract class CancellableEventArgs : EventArgs
 {
     public bool Cancelled { get; private set; }
@@ -9,7 +12,7 @@ public void Cancel()
         Cancelled = true;
     }
 
-    public void UnCancel()
+    public void Uncancel()
     {
         Cancelled = false;
     }

diff --git a/Hypercube.EventBus/Events/EventArgs.cs b/Hypercube.EventBus/Events/EventArgs.cs
@@ -0,0 +1,6 @@
+using JetBrains.Annotations;
+
+namespace Hypercube.EventBus.Events;
+
+[PublicAPI]
+public abstract class EventArgs : IEventArgs;
diff --git a/Hypercube.EventBus/Events/IEventArgs.cs b/Hypercube.EventBus/Events/IEventArgs.cs
@@ -0,0 +1,6 @@
+using JetBrains.Annotations;
+
+namespace Hypercube.EventBus.Events;
+
+[PublicAPI]
+public interface IEventArgs;
diff --git a/Hypercube.EventBus/Hypercube.EventBus.csproj b/Hypercube.EventBus/Hypercube.EventBus.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Hypercube.Utilities\Hypercube.Utilities.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/Hypercube.Shared/EventBus/IEventBus.cs → Hypercube.EventBus/IEventBus.cs b/Hypercube.Shared/EventBus/IEventBus.cs → Hypercube.EventBus/IEventBus.cs
@@ -1,11 +1,13 @@
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using JetBrains.Annotations;
 
-namespace Hypercube.Shared.EventBus;
+namespace Hypercube.EventBus;
 
 /// <summary>
 /// EventBus providing interaction between loosely coupled
 /// components according to the principle of "event publisher -> event subscriber".
 /// </summary>
+[PublicAPI]
 public interface IEventBus
 {
     void Raise<T>(ref T eventArgs) where T : IEventArgs;

diff --git a/Hypercube.EventBus/IEventSubscriber.cs b/Hypercube.EventBus/IEventSubscriber.cs
@@ -0,0 +1,6 @@
+using JetBrains.Annotations;
+
+namespace Hypercube.EventBus;
+
+[PublicAPI]
+public interface IEventSubscriber;
diff --git a/Hypercube.Example.Client/Example.cs b/Hypercube.Example.Client/Example.cs
@@ -5,12 +5,12 @@
 using Hypercube.Client.Graphics.Rendering;
 using Hypercube.Client.Graphics.Viewports;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Example.Client.Controls;
 using Hypercube.Math.Vectors;
 using Hypercube.Shared.Entities.Realisation.Manager;
 using Hypercube.Shared.Entities.Systems.Physics;
 using Hypercube.Shared.Entities.Systems.Transform.Coordinates;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Physics;
 using Hypercube.Shared.Physics.Shapes;
 using Hypercube.Shared.Resources;

diff --git a/Hypercube.Example.Client/Program.cs b/Hypercube.Example.Client/Program.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 
 namespace Hypercube.Example.Client;
 

diff --git a/Hypercube.Example.Server/Program.cs b/Hypercube.Example.Server/Program.cs
@@ -1,4 +1,4 @@
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 
 namespace Hypercube.Example.Server;
 

diff --git a/Hypercube.Server/Runtimes/Loop/RuntimeLoop.cs b/Hypercube.Server/Runtimes/Loop/RuntimeLoop.cs
@@ -1,5 +1,5 @@
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Runtimes.Loop;
 using Hypercube.Shared.Runtimes.Loop.Event;
 using Hypercube.Shared.Timing;

diff --git a/Hypercube.Server/Runtimes/Runtime.cs b/Hypercube.Server/Runtimes/Runtime.cs
@@ -1,5 +1,5 @@
 using Hypercube.Dependencies;
-using Hypercube.Shared.EventBus;
+using Hypercube.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Runtimes;
 using Hypercube.Shared.Runtimes.Event;

diff --git a/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.Entities.Realisation.Components;
+using Hypercube.EventBus.Events;
+using Hypercube.Shared.Entities.Realisation.Components;
 using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
-using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/ComponentRemoved.cs b/Hypercube.Shared/Entities/Realisation/Events/ComponentRemoved.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.Entities.Realisation.Components;
+using Hypercube.EventBus.Events;
+using Hypercube.Shared.Entities.Realisation.Components;
 using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
-using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs
@@ -1,6 +1,6 @@
-using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
+using Hypercube.EventBus.Events;
+using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
 using Hypercube.Shared.Entities.Systems.Transform.Coordinates;
-using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs
@@ -1,5 +1,5 @@
-using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
-using Hypercube.Shared.EventBus.Events;
+using Hypercube.EventBus.Events;
+using Hypercube.Shared.Entities.Realisation.EventBus.EventArgs;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesComponentManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesComponentManager.cs
@@ -1,12 +1,12 @@
 using System.Collections.Frozen;
 using System.Reflection;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Shared.Entities.Realisation.Components;
 using Hypercube.Shared.Entities.Realisation.EventBus;
 using Hypercube.Shared.Entities.Realisation.Events;
 using Hypercube.Shared.Entities.Systems.MetaData;
 using Hypercube.Shared.Entities.Systems.Transform;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Runtimes.Event;
 using Hypercube.Utilities.Helpers;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesManager.cs
@@ -1,7 +1,7 @@
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Shared.Entities.Realisation.Events;
 using Hypercube.Shared.Entities.Systems.Transform.Coordinates;
-using Hypercube.Shared.EventBus;
 
 namespace Hypercube.Shared.Entities.Realisation.Manager;
 

diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesSystemManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesSystemManager.cs
@@ -1,7 +1,7 @@
 using System.Collections.Frozen;
 using Hypercube.Dependencies;
+using Hypercube.EventBus;
 using Hypercube.Shared.Entities.Realisation.Systems;
-using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Runtimes.Event;
 using Hypercube.Shared.Runtimes.Loop.Event;
 using Hypercube.Utilities.Helpers;