Merge pull request #12 from JerryImMouse/event-bus-upgrade

Event Bus rewriting
technologists-team · Jul 13, 2024 · b73b094 · b73b094
2 parents 40edf83 + 130e287
commit b73b094
Show file tree

Hide file tree

Showing 45 changed files with 617 additions and 97 deletions.
diff --git a/Hypercube.Client/Graphics/Event/MainWindowClosedEvent.cs b/Hypercube.Client/Graphics/Event/MainWindowClosedEvent.cs
@@ -1,8 +1,9 @@
 using Hypercube.Client.Graphics.Windows;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 
-public readonly struct MainWindowClosedEvent(WindowRegistration registration)
+public readonly struct MainWindowClosedEvent(WindowRegistration registration) : IEventArgs
 {
     public readonly WindowRegistration Registration = registration;
 }
diff --git a/Hypercube.Client/Graphics/Event/WindowClosed.cs b/Hypercube.Client/Graphics/Event/WindowClosed.cs
@@ -1,8 +1,9 @@
 using Hypercube.Client.Graphics.Windows;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 
-public readonly struct WindowClosedEvent(WindowRegistration registration)
+public readonly struct WindowClosedEvent(WindowRegistration registration) : IEventArgs
 {
     public readonly WindowRegistration Registration = registration;
 }
diff --git a/Hypercube.Client/Graphics/Event/WindowFocusChangedEvent.cs b/Hypercube.Client/Graphics/Event/WindowFocusChangedEvent.cs
@@ -1,5 +1,6 @@
 using Hypercube.Client.Graphics.Windows;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Client.Graphics.Event;
 
-public readonly record struct WindowFocusChangedEvent(WindowRegistration Registration, bool Focused);
+public readonly record struct WindowFocusChangedEvent(WindowRegistration Registration, bool Focused) : IEventArgs;
diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs b/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs
@@ -59,7 +59,7 @@ private void OnLoad()
         _logger.EngineInfo("Loaded");
     }
 
-    private void OnFrameUpdate(UpdateFrameEvent args)
+    private void OnFrameUpdate(ref UpdateFrameEvent args)
     {
 #if DEBUG
         _windowManager.WindowSetTitle(MainWindow, $"FPS: {_timing.Fps} | RealTime: {_timing.RealTime} | cPos: {_cameraManager.MainCamera?.Position ?? null} | cRot: {_cameraManager.MainCamera?.Rotation ?? null}");
@@ -68,7 +68,7 @@ private void OnFrameUpdate(UpdateFrameEvent args)
         _cameraManager.UpdateInput(_cameraManager.MainCamera, args.DeltaSeconds);
     }
 
-    private void OnFrameRender(RenderFrameEvent args)
+    private void OnFrameRender(ref RenderFrameEvent args)
     {
         BatchClear();
 

diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.Window.cs b/Hypercube.Client/Graphics/Rendering/Renderer.Window.cs
@@ -39,11 +39,11 @@ public void DestroyWindow(WindowRegistration registration)
 
     public void CloseWindow(WindowRegistration registration)
     {
-        _eventBus.Invoke(new WindowClosedEvent(registration));
+        _eventBus.Raise(new WindowClosedEvent(registration));
 
         if (registration.Id == _mainWindowId)
         {
-            _eventBus.Invoke(new MainWindowClosedEvent(registration));
+            _eventBus.Raise(new MainWindowClosedEvent(registration));
             return;
         }
 
@@ -84,6 +84,6 @@ private bool InitMainWindow(ContextInfo? context, WindowCreateSettings settings)
 
     public void OnFocusChanged(WindowRegistration window, bool focused)
     {
-        _eventBus.Invoke(new WindowFocusChangedEvent(window, focused));
+        _eventBus.Raise(new WindowFocusChangedEvent(window, focused));
     }
 }
diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.cs b/Hypercube.Client/Graphics/Rendering/Renderer.cs
@@ -6,6 +6,7 @@
 using Hypercube.Client.Graphics.Windows.Manager;
 using Hypercube.Shared.Dependency;
 using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Resources.Manager;
 using Hypercube.Shared.Runtimes.Event;
@@ -17,7 +18,7 @@
 
 namespace Hypercube.Client.Graphics.Rendering;
 
-public sealed partial class Renderer : IRenderer, IPostInject
+public sealed partial class Renderer : IRenderer, IPostInject, IEventSubscriber
 {
     [Dependency] private readonly IEventBus _eventBus = default!;
     [Dependency] private readonly ITextureManager _textureManager = default!;
@@ -68,19 +69,19 @@ public sealed partial class Renderer : IRenderer, IPostInject
 
     public void PostInject()
     {
-        _eventBus.Subscribe<RuntimeInitializationEvent>(OnInitialization);
-        _eventBus.Subscribe<RuntimeStartupEvent>(OnStartup);
-        _eventBus.Subscribe<UpdateFrameEvent>(OnFrameUpdate);
-        _eventBus.Subscribe<RenderFrameEvent>(OnFrameRender);
+        _eventBus.Subscribe<RuntimeInitializationEvent>(this, OnInitialization);
+        _eventBus.Subscribe<RuntimeStartupEvent>(this, OnStartup);
+        _eventBus.Subscribe<UpdateFrameEvent>(this, OnFrameUpdate);
+        _eventBus.Subscribe<RenderFrameEvent>(this, OnFrameRender);
     }
 
-    private void OnInitialization(RuntimeInitializationEvent args)
+    private void OnInitialization(ref RuntimeInitializationEvent args)
     {
         _windowManager = CreateWindowManager();
         _bindingsContext = new BindingsContext(_windowManager);
     }
 
-    private void OnStartup(RuntimeStartupEvent args)
+    private void OnStartup(ref RuntimeStartupEvent args)
     {
         _currentThread = Thread.CurrentThread;
         _logger.EngineInfo($"Working thread {_currentThread.Name}");

diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Callbacks.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Callbacks.cs
@@ -94,4 +94,12 @@ private void OnWindowFocusChanged(Window* window, bool focused)
 
         _renderer.OnFocusChanged(registration, focused);
     }
+    private void OnWindowFocused(Window* window, bool focused)
+    {
+        if (!TryGetWindow(window, out var registration))
+            return;
+
+        _renderer.OnFocusChanged(registration, focused);
+    }
+
 }
diff --git a/Hypercube.Client/Runtimes/Loop/RuntimeLoop.cs b/Hypercube.Client/Runtimes/Loop/RuntimeLoop.cs
@@ -20,10 +20,10 @@ public void Run()
             _timing.StartFrame();
 
             var deltaTime = (float)_timing.RealFrameTime.TotalSeconds;
-            _eventBus.Invoke(new InputFrameEvent(deltaTime));
-            _eventBus.Invoke(new TickFrameEvent(deltaTime));
-            _eventBus.Invoke(new UpdateFrameEvent(deltaTime));
-            _eventBus.Invoke(new RenderFrameEvent(deltaTime));
+            _eventBus.Raise(new InputFrameEvent(deltaTime));
+            _eventBus.Raise(new TickFrameEvent(deltaTime));
+            _eventBus.Raise(new UpdateFrameEvent(deltaTime));
+            _eventBus.Raise(new RenderFrameEvent(deltaTime));
         }
     }
 

diff --git a/Hypercube.Client/Runtimes/Runtime.cs b/Hypercube.Client/Runtimes/Runtime.cs
@@ -1,15 +1,14 @@
-using Hypercube.Client.Graphics;
-using Hypercube.Client.Graphics.Event;
-using Hypercube.Client.Graphics.Rendering;
+using Hypercube.Client.Graphics.Event;
 using Hypercube.Client.Runtimes.Loop;
 using Hypercube.Shared.Dependency;
 using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Runtimes.Event;
 
 namespace Hypercube.Client.Runtimes;
 
-public sealed partial class Runtime(DependenciesContainer dependenciesContainer) : IPostInject
+public sealed partial class Runtime(DependenciesContainer dependenciesContainer) : IPostInject, IEventSubscriber
 {
     [Dependency] private readonly IEventBus _eventBus = default!;
     [Dependency] private readonly IRuntimeLoop _loop = default!;
@@ -18,7 +17,7 @@ public sealed partial class Runtime(DependenciesContainer dependenciesContainer)
 
     public void PostInject()
     {
-        _eventBus.Subscribe<MainWindowClosedEvent>(OnMainWindowClosed);
+        _eventBus.Subscribe<MainWindowClosedEvent>(this, OnMainWindowClosed);
     }
 
     /// <summary>
@@ -43,24 +42,24 @@ private void Shutdown(string? reason = null)
         reason = reason is null ? "Shutting down" : $"Shutting down, reason: {reason}";
 
         _logger.EngineInfo(reason);
-        _eventBus.Invoke(new RuntimeShutdownEvent(reason));
+        _eventBus.Raise(new RuntimeShutdownEvent(reason));
         _loop.Shutdown();
     }
 
     private void RunLoop()
     {
         _logger.EngineInfo("Startup");
-        _eventBus.Invoke(new RuntimeStartupEvent());
+        _eventBus.Raise(new RuntimeStartupEvent());
         _loop.Run();
     }
 
     private void Initialize()
     {
         _logger.EngineInfo("Initialize");
-        _eventBus.Invoke(new RuntimeInitializationEvent());
+        _eventBus.Raise(new RuntimeInitializationEvent());
     }
 
-    private void OnMainWindowClosed(MainWindowClosedEvent obj)
+    private void OnMainWindowClosed(ref MainWindowClosedEvent obj)
     {
         Shutdown("Main window closed");
     }

diff --git a/Hypercube.Shared/Entities/Realisation/EventBus/EntitiesEventBus.cs b/Hypercube.Shared/Entities/Realisation/EventBus/EntitiesEventBus.cs
@@ -1,18 +1,32 @@
-namespace Hypercube.Shared.Entities.Realisation.EventBus;
+using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
+using Hypercube.Shared.EventBus.Handlers;
+
+namespace Hypercube.Shared.Entities.Realisation.EventBus;
 
 public sealed class EntitiesEventBus : IEntitiesEventBus
 {
-    public void Subscribe<T>(Action<T> callback)
+    public void Unsubscribe<T>(IEventSubscriber subscriber) where T : IEventArgs
+    {
+        throw new NotImplementedException();
+    }
+
+    public void Subscribe<T>(IEventSubscriber subscriber, EventRefHandler<T> refHandler) where T : IEventArgs
+    {
+        throw new NotImplementedException();
+    }
+
+    public void Raise(IEventArgs receiver)
     {
         throw new NotImplementedException();
     }
 
-    public void Unsubscribe<T>(Action<T> callback)
+    public void Raise<T>(ref T receiver) where T : IEventArgs
     {
         throw new NotImplementedException();
     }
 
-    public void Invoke<T>(T signal)
+    public void Raise<T>(T receiver) where T : IEventArgs
     {
         throw new NotImplementedException();
     }

diff --git a/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/ComponentAdded.cs
@@ -1,5 +1,6 @@
 using Hypercube.Shared.Entities.Realisation.Components;
+using Hypercube.Shared.EventBus.Events;
 
 namespace Hypercube.Shared.Entities.Realisation.Events;
 
-public readonly record struct ComponentAdded(EntityUid EntityUid, IComponent Component);
+public readonly record struct ComponentAdded(EntityUid EntityUid, IComponent Component) : IEventArgs;
diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityAdded.cs
@@ -1,3 +1,5 @@
-namespace Hypercube.Shared.Entities.Realisation.Events;
+using Hypercube.Shared.EventBus.Events;
 
-public readonly record struct EntityAdded(EntityUid EntityUid);
+namespace Hypercube.Shared.Entities.Realisation.Events;
+
+public readonly record struct EntityAdded(EntityUid EntityUid) : IEventArgs;
diff --git a/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs b/Hypercube.Shared/Entities/Realisation/Events/EntityRemoved.cs
@@ -1,3 +1,5 @@
-namespace Hypercube.Shared.Entities.Realisation.Events;
+using Hypercube.Shared.EventBus.Events;
 
-public readonly record struct EntityRemoved(EntityUid EntityUid);
+namespace Hypercube.Shared.Entities.Realisation.Events;
+
+public readonly record struct EntityRemoved(EntityUid EntityUid) : IEventArgs;
diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesComponentManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesComponentManager.cs
@@ -4,12 +4,13 @@
 using Hypercube.Shared.Entities.Realisation.Components;
 using Hypercube.Shared.Entities.Realisation.Events;
 using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
 using Hypercube.Shared.Runtimes.Event;
 using Hypercube.Shared.Utilities.Helpers;
 
 namespace Hypercube.Shared.Entities.Realisation.Manager;
 
-public sealed class EntitiesComponentManager : IEntitiesComponentManager, IPostInject
+public sealed class EntitiesComponentManager : IEntitiesComponentManager, IPostInject, IEventSubscriber
 {
     private static readonly Type BaseComponentType = typeof(IComponent);
 
@@ -20,10 +21,10 @@ public sealed class EntitiesComponentManager : IEntitiesComponentManager, IPostI
 
     public void PostInject()
     {
-        _eventBus.Subscribe<RuntimeInitializationEvent>(OnInitialized);
+        _eventBus.Subscribe<RuntimeInitializationEvent>(this, OnInitialized);
     }
 
-    private void OnInitialized(RuntimeInitializationEvent args)
+    private void OnInitialized(ref RuntimeInitializationEvent args)
     {
         _components = ReflectionHelper.GetAllInstantiableSubclassOf(BaseComponentType);
 
@@ -72,7 +73,7 @@ private object AddComponent(EntityUid entityUid, Type type)
         var instance = (IComponent)constructor.Invoke(Array.Empty<object>()) ?? throw new NullReferenceException();
 
         components.Add(entityUid, instance);
-        _eventBus.Invoke(new ComponentAdded(entityUid, instance));
+        _eventBus.Raise(new ComponentAdded(entityUid, instance));
 
         return instance;
     }

diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesManager.cs
@@ -31,14 +31,14 @@ public EntityUid Create(string name, SceneCoordinates coordinates)
         var transformComponent = _entitiesComponentManager.AddComponent<TransformComponent>(newEntity);
 
         _entities.Add(newEntity);
-        _eventBus.Invoke(new EntityAdded(newEntity));
+        _eventBus.Raise(new EntityAdded(newEntity));
 
         return newEntity;
     }
 
     public void Delete(EntityUid entityUid)
     {
         _entities.Remove(entityUid);
-        _eventBus.Invoke(new EntityRemoved(entityUid));
+        _eventBus.Raise(new EntityRemoved(entityUid));
     }
 }
diff --git a/Hypercube.Shared/Entities/Realisation/Manager/EntitiesSystemManager.cs b/Hypercube.Shared/Entities/Realisation/Manager/EntitiesSystemManager.cs
@@ -2,13 +2,14 @@
 using Hypercube.Shared.Dependency;
 using Hypercube.Shared.Entities.Realisation.Systems;
 using Hypercube.Shared.EventBus;
+using Hypercube.Shared.EventBus.Events;
 using Hypercube.Shared.Runtimes.Event;
 using Hypercube.Shared.Runtimes.Loop.Event;
 using Hypercube.Shared.Utilities.Helpers;
 
 namespace Hypercube.Shared.Entities.Realisation.Manager;
 
-public class EntitiesSystemManager : IEntitiesSystemManager, IPostInject
+public class EntitiesSystemManager : IEntitiesSystemManager, IPostInject, IEventSubscriber
 {
     [Dependency] private readonly IEventBus _eventBus = default!;
 
@@ -19,14 +20,14 @@ public class EntitiesSystemManager : IEntitiesSystemManager, IPostInject
 
     public void PostInject()
     {
-        _eventBus.Subscribe<RuntimeInitializationEvent>(OnInitialization);
-        _eventBus.Subscribe<RuntimeStartupEvent>(OnStartup);
+        _eventBus.Subscribe<RuntimeInitializationEvent>(this, OnInitialization);
+        _eventBus.Subscribe<RuntimeStartupEvent>(this, OnStartup);
 
-        _eventBus.Subscribe<UpdateFrameEvent>(OnFrameUpdate);
-        _eventBus.Subscribe<RuntimeShutdownEvent>(OnShutdown);
+        _eventBus.Subscribe<UpdateFrameEvent>(this, OnFrameUpdate);
+        _eventBus.Subscribe<RuntimeShutdownEvent>(this, OnShutdown);
     }
 
-    private void OnInitialization(RuntimeInitializationEvent args)
+    private void OnInitialization(ref RuntimeInitializationEvent args)
     {
         // Auto creating all systems
         var types = GetAllSystemTypes();
@@ -45,23 +46,23 @@ private void OnInitialization(RuntimeInitializationEvent args)
         _system = system.ToFrozenSet();
     }
 
-    private void OnStartup(RuntimeStartupEvent args)
+    private void OnStartup(ref RuntimeStartupEvent args)
     {
         foreach (var instance in _system)
         {
             instance.Initialize();
         }   
     }
 
-    private void OnFrameUpdate(UpdateFrameEvent args)
+    private void OnFrameUpdate(ref UpdateFrameEvent args)
     {
         foreach (var instance in _system)
         {
             instance.FrameUpdate(args);
         }
     }
 
-    private void OnShutdown(RuntimeShutdownEvent args)
+    private void OnShutdown(ref RuntimeShutdownEvent args)
     {
         foreach (var instance in _system)
         {