refactor: rewritten MonoGameWindow to take in a universe as a constructor parameter

All delegate events are refactored to use the Event<TSender> and Event<TSender, TArgument> for performance issues regarding delegate events creating garbage, also this gives us better control on event invocation since C# Delegates did also create unnecessary garbage during Delegate.DynamicInvoke

Engine.Core/Abstract/Assignable/IAssignable.cs

@@ -8,7 +8,7 @@ public interface IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IAssignable"/>'s fields are unassigned and completely ready to recycle.
     /// </summary> 
-    event UnassignEventHandler? OnUnassigned;
+    Event<IAssignable>? OnUnassigned { get; }
 
     /// <summary>
     /// Unassign <see cref="IAssignable"/>'s all fields and make it ready to recycle.
@@ -17,6 +17,4 @@ public interface IAssignable
     /// <see cref="true"/>, if the fields are unsigned successfully, <see cref="false"/> if not.
     /// </returns>
     bool Unassign();
-
-    delegate void UnassignEventHandler(IAssignable sender);
 }

Engine.Core/Abstract/Assignable/IHasBehaviourController.cs

@@ -8,7 +8,7 @@ public interface IHasBehaviourController : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IBehaviourController"/> value has has been assigned a new value.
     /// </summary>
-    event BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned;
+    Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; }
 
     /// <inheritdoc cref="IBehaviourController" />
     IBehaviourController BehaviourController { get; }
@@ -21,6 +21,4 @@ public interface IHasBehaviourController : IAssignable
     /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
     /// </returns>
     bool Assign(IBehaviourController behaviourController);
-
-    delegate void BehaviourControllerAssignedEventHandler(IHasBehaviourController sender);
 }

Engine.Core/Abstract/Assignable/IHasEntity.cs

@@ -8,7 +8,7 @@ public interface IHasEntity : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IEntity"/> value has has been assigned a new value.
     /// </summary>
-    event EntityAssignedEventHandler? OnEntityAssigned;
+    Event<IHasEntity> OnEntityAssigned { get; }
 
     /// <inheritdoc cref="IEntity" />
     IEntity Entity { get; }
@@ -21,6 +21,4 @@ public interface IHasEntity : IAssignable
     /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
     /// </returns>
     bool Assign(IEntity entity);
-
-    delegate void EntityAssignedEventHandler(IHasEntity sender);
 }

Engine.Core/Abstract/Assignable/IHasStateEnable.cs

@@ -8,7 +8,7 @@ public interface IHasStateEnable : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IStateEnable"/> value has has been assigned a new value.
     /// </summary>
-    event StateEnableAssignedEventHandler? OnStateEnableAssigned;
+    Event<IHasStateEnable> OnStateEnableAssigned { get; }
 
     /// <inheritdoc cref="IStateEnable" />
     IStateEnable StateEnable { get; }
@@ -21,6 +21,4 @@ public interface IHasStateEnable : IAssignable
     /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
     /// </returns>
     bool Assign(IStateEnable stateEnable);
-
-    delegate void StateEnableAssignedEventHandler(IHasStateEnable sender);
 }

Engine.Core/Abstract/Assignable/IHasUniverse.cs

@@ -8,7 +8,7 @@ public interface IHasUniverse : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IUniverse"/> value has has been assigned a new value.
     /// </summary>
-    event UniverseAssignedEventHandler? OnUniverseAssigned;
+    Event<IHasUniverse> OnUniverseAssigned { get; }
 
     /// <inheritdoc cref="IUniverse" />
     IUniverse Universe { get; }
@@ -21,6 +21,4 @@ public interface IHasUniverse : IAssignable
     /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
     /// </returns>
     bool Assign(IUniverse universe);
-
-    delegate void UniverseAssignedEventHandler(IHasUniverse sender);
 }

Engine.Core/Abstract/Assignable/IHasUniverseObject.cs

@@ -8,7 +8,7 @@ public interface IHasUniverseObject : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IUniverseObject"/> value has has been assigned a new value.
     /// </summary>
-    event UniverseObjectAssignedEventHandler? OnUniverseObjectAssigned;
+    Event<IHasUniverseObject> OnUniverseObjectAssigned { get; }
 
     /// <inheritdoc cref="IUniverseObject" />
     IUniverseObject UniverseObject { get; }
@@ -21,6 +21,4 @@ public interface IHasUniverseObject : IAssignable
     /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
     /// </returns>
     bool Assign(IUniverseObject universeObject);
-
-    delegate void UniverseObjectAssignedEventHandler(IHasUniverseObject sender);
 }

Engine.Core/Abstract/IActive.cs

@@ -8,12 +8,12 @@ public interface IActive
     /// <summary>
     /// Event triggered when the <see cref="IsActive"/> state of the <see cref="IActive"/> changes.
     /// </summary>
-    event ActiveChangedEventHandler? OnActiveChanged;
+    Event<IActive, ActiveChangedArguments> OnActiveChanged { get; }
 
     /// <summary>
     /// The value indicating whether the <see cref="IActive"/> is enabled.
     /// </summary>
     bool IsActive { get; }
 
-    delegate void ActiveChangedEventHandler(IActive sender, bool previousState);
+    readonly record struct ActiveChangedArguments(bool PreviousState);
 }

Engine.Core/Abstract/IBehaviour.cs

@@ -8,12 +8,12 @@ public interface IBehaviour : IEntity, IActive, IHasBehaviourController, IHasSta
     /// <summary>
     /// Event triggered when the priority of the <see cref="IBehaviour"/> changes.
     /// </summary>
-    event PriorityChangedEventHandler? OnPriorityChanged;
+    Event<IBehaviour, PriorityChangedArguments> OnPriorityChanged { get; }
 
     /// <summary>
     /// The priority of the <see cref="IBehaviour"/>.
     /// </summary>
     int Priority { get; set; }
 
-    delegate void PriorityChangedEventHandler(IBehaviour sender, int previousPriority);
+    readonly record struct PriorityChangedArguments(int PreviousPriority);
 }

Engine.Core/Abstract/IBehaviourCollector.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Syntriax.Engine.Core;
 
 /// <summary>
@@ -7,29 +5,38 @@ namespace Syntriax.Engine.Core;
 /// Provides mechanisms for tracking additions and removals, and notifies subscribers when such events occur on the assigned <see cref="IUniverse"/>.
 /// </summary>
 /// <typeparam name="T">The type of objects tracked by the collector.</typeparam>
-public interface IBehaviourCollector<T> : IHasUniverse, IEnumerable<T> where T : class
+public interface IBehaviourCollector<T> : IHasUniverse where T : class
 {
     /// <summary>
     /// Event triggered when an object of type <typeparamref name="T"/> is added to the collector.
     /// </summary>
-    event CollectedEventHandler? OnCollected;
+    Event<IBehaviourCollector<T>, BehaviourCollectedArguments> OnCollected { get; }
 
     /// <summary>
     /// Event triggered when an object of type <typeparamref name="T"/> is removed from the collector.
     /// </summary>
-    event RemovedEventHandler? OnRemoved;
+    Event<IBehaviourCollector<T>, BehaviourRemovedArguments> OnRemoved { get; }
+
+    /// <summary>
+    /// Amount of <typeparamref name="T"/> collected.
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+    /// Get a <typeparamref name="T"/> collected by it's index.
+    /// </summary>
+    T this[System.Index index] { get; }
 
     /// <summary>
     /// Delegate for handling the <see cref="OnCollected"/> event.
     /// </summary>
     /// <param name="sender">The instance of the <see cref="IBehaviourCollector{T}"/> that triggered the event.</param>
     /// <param name="behaviourCollected">The object of type <typeparamref name="T"/> that was added to the collector.</param>
-    delegate void CollectedEventHandler(IBehaviourCollector<T> sender, T behaviourCollected);
+    readonly record struct BehaviourCollectedArguments(T BehaviourCollected);
 
     /// <summary>
     /// Delegate for handling the <see cref="OnRemoved"/> event.
     /// </summary>
-    /// <param name="sender">The instance of the <see cref="IBehaviourCollector{T}"/> that triggered the event.</param>
+    /// <param name="BehaviourRemoved">The object of type <typeparamref name="T"/> that was removed from the collector.</param>
-    /// <param name="behaviourRemoved">The object of type <typeparamref name="T"/> that was removed from the collector.</param>
+    readonly record struct BehaviourRemovedArguments(T BehaviourRemoved);
-    delegate void RemovedEventHandler(IBehaviourCollector<T> sender, T behaviourRemoved);
 }

Engine.Core/Abstract/IBehaviourController.cs

@@ -3,34 +3,29 @@ using System.Collections.Generic;
 namespace Syntriax.Engine.Core;
 
 /// <summary>
-/// Represents a controller for managing <see cref="IBehaviour"/>s and notify them accordingly about the engine's updates. Connected to an <see cref="IUniverseObject"/>.
+/// Represents a controller for managing <see cref="IBehaviour"/>s. Connected to an <see cref="IUniverseObject"/>.
 /// </summary>
-public interface IBehaviourController : IEntity, IHasUniverseObject, IEnumerable<IBehaviour>
+public interface IBehaviourController : IEntity, IHasUniverseObject
 {
-    /// <summary>
-    /// Event triggered before the update of <see cref="IBehaviour"/>s.
-    /// </summary>
-    event PreUpdateEventHandler? OnPreUpdate;
-
-    /// <summary>
-    /// Event triggered during the update of <see cref="IBehaviour"/>s.
-    /// </summary>
-    event UpdateEventHandler? OnUpdate;
-
-    /// <summary>
-    /// Event triggered before the drawing phase.
-    /// </summary>
-    event PreDrawEventHandler? OnPreDraw;
-
     /// <summary>
     /// Event triggered when a <see cref="IBehaviour"/> is added to the <see cref="IBehaviourController"/>.
     /// </summary>
-    event BehaviourAddedEventHandler? OnBehaviourAdded;
+    Event<IBehaviourController, BehaviourAddedArguments> OnBehaviourAdded { get; }
 
     /// <summary>
     /// Event triggered when a <see cref="IBehaviour"/> is removed from the <see cref="IBehaviourController"/>.
     /// </summary>
-    event BehaviourRemovedEventHandler? OnBehaviourRemoved;
+    Event<IBehaviourController, BehaviourRemovedArguments> OnBehaviourRemoved { get; }
+
+    /// <summary>
+    /// Amount of <see cref="IBehaviour"/> collected.
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+    /// Get a <see cref="IBehaviour"/> collected by it's index.
+    /// </summary>
+    IBehaviour this[System.Index index] { get; }
 
     /// <summary>
     /// Adds a <see cref="IBehaviour"/> to the <see cref="IBehaviourController"/>.
@@ -83,20 +78,6 @@ public interface IBehaviourController : IEntity, IHasUniverseObject, IEnumerable
     /// <param name="behaviour">The <see cref="IBehaviour"/> to remove.</param>
     void RemoveBehaviour<T>(T behaviour) where T : class, IBehaviour;
 
-    /// <summary>
+    readonly record struct BehaviourAddedArguments(IBehaviour BehaviourAdded);
-    /// Updates all <see cref="IBehaviour"/>s in the <see cref="IBehaviourController"/>.
+    readonly record struct BehaviourRemovedArguments(IBehaviour BehaviourRemoved);
-    /// </summary>
-    void Update();
-
-    /// <summary>
-    /// Performs pre-draw operations.
-    /// </summary>
-    void UpdatePreDraw();
-
-    delegate void PreUpdateEventHandler(IBehaviourController sender);
-    delegate void UpdateEventHandler(IBehaviourController sender);
-    delegate void PreDrawEventHandler(IBehaviourController sender);
-    delegate void BehaviourAddedEventHandler(IBehaviourController sender, IBehaviour behaviourAdded);
-    delegate void BehaviourRemovedEventHandler(IBehaviourController sender, IBehaviour behaviourRemoved);
-
 }

Engine.Core/Abstract/IEntity.cs

@@ -9,12 +9,12 @@ public interface IEntity : IInitializable, IHasStateEnable
     /// Event triggered when the <see cref="Id"/> of the <see cref="IEntity"/> changes.
     /// The string action parameter is the previous <see cref="Id"/> of the <see cref="IEntity"/>. 
     /// </summary>
-    event IdChangedEventHandler? OnIdChanged;
+    Event<IEntity, IdChangedArguments> OnIdChanged { get; }
 
     /// <summary>
     /// The ID of the <see cref="IEntity"/>.
     /// </summary>
     string Id { get; set; }
 
-    delegate void IdChangedEventHandler(IEntity sender, string previousId);
+    readonly record struct IdChangedArguments(string PreviousId);
 }

Engine.Core/Abstract/IInitializable.cs

@@ -8,12 +8,12 @@ public interface IInitializable
     /// <summary>
     /// Event triggered when the <see cref="Initialize"/> method is called successfully.
     /// </summary>
-    event InitializedEventHandler? OnInitialized;
+    Event<IInitializable> OnInitialized { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="IInitializable"/> method is called successfully.
     /// </summary>
-    event FinalizedEventHandler? OnFinalized;
+    Event<IInitializable> OnFinalized { get; }
 
     /// <summary>
     /// The value indicating whether the entity has been initialized.
@@ -31,7 +31,4 @@ public interface IInitializable
     /// </summary>
     /// <returns><see cref="true"/> if finalization is successful, otherwise <see cref="false"/>.</returns>
     bool Finalize();
-
-    delegate void InitializedEventHandler(IInitializable sender);
-    delegate void FinalizedEventHandler(IInitializable sender);
 }

Engine.Core/Abstract/INameable.cs

@@ -8,12 +8,12 @@ public interface INameable
     /// <summary>
     /// Event triggered when the name of the entity changes.
     /// </summary>
-    event NameChangedEventHandler? OnNameChanged;
+    Event<INameable, NameChangedArguments> OnNameChanged { get; }
 
     /// <summary>
     /// The name of the entity.
     /// </summary>
     string Name { get; set; }
 
-    delegate void NameChangedEventHandler(INameable sender, string previousName);
+    readonly record struct NameChangedArguments(string PreviousName);
 }

Engine.Core/Abstract/IStateEnable.cs

@@ -8,12 +8,12 @@ public interface IStateEnable : IHasEntity
     /// <summary>
     /// Event triggered when the <see cref="Enabled"/> state of the <see cref="IStateEnable"/> changes.
     /// </summary>
-    event EnabledChangedEventHandler? OnEnabledChanged;
+    Event<IStateEnable, EnabledChangedArguments> OnEnabledChanged { get; }
 
     /// <summary>
     /// The value indicating whether the <see cref="IStateEnable"/> is enabled.
     /// </summary>
     bool Enabled { get; set; }
 
-    delegate void EnabledChangedEventHandler(IStateEnable sender, bool previousState);
+    readonly record struct EnabledChangedArguments(bool PreviousState);
 }

Engine.Core/Abstract/ITransform2D.cs

@@ -8,17 +8,17 @@ public interface ITransform2D : IBehaviour
     /// <summary>
     /// Event triggered when the <see cref="Position"/> of the <see cref="ITransform2D"/> changes.
     /// </summary>
-    event PositionChangedEventHandler? OnPositionChanged;
+    Event<ITransform2D, PositionChangedArguments> OnPositionChanged { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="Scale"/> of the <see cref="ITransform2D"/> changes.
     /// </summary>
-    event ScaleChangedEventHandler? OnScaleChanged;
+    Event<ITransform2D, ScaleChangedArguments> OnScaleChanged { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="Rotation"/> of the <see cref="ITransform"/> changes.
     /// </summary>
-    event RotationChangedEventHandler? OnRotationChanged;
+    Event<ITransform2D, RotationChangedArguments> OnRotationChanged { get; }
 
     /// <summary>
     /// The world position of the <see cref="ITransform2D"/> in 2D space.
@@ -51,23 +51,20 @@ public interface ITransform2D : IBehaviour
     float LocalRotation { get; set; }
 
     /// <summary>
-    /// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
+    /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
     /// </summary>
-    /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
+    /// <param name="PreviousPosition">The previous <see cref="Position"/> of the <see cref="ITransform2D"/>.</param>
-    /// <param name="previousPosition">The previous <see cref="Position"/> of the <see cref="ITransform2D"/>.</param>
+    readonly record struct PositionChangedArguments(Vector2D PreviousPosition);
-    delegate void PositionChangedEventHandler(ITransform2D sender, Vector2D previousPosition);
 
     /// <summary>
-    /// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
+    /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
     /// </summary>
-    /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
+    /// <param name="PreviousScale">The previous <see cref="Scale"/> of the <see cref="ITransform2D"/>.</param>
-    /// <param name="previousScale">The previous <see cref="Scale"/> of the <see cref="ITransform2D"/>.</param>
+    readonly record struct ScaleChangedArguments(Vector2D PreviousScale);
-    delegate void ScaleChangedEventHandler(ITransform2D sender, Vector2D previousScale);
 
     /// <summary>
-    /// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
+    /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
     /// </summary>
-    /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
+    /// <param name="PreviousRotation">The previous <see cref="Rotation"/> of the <see cref="ITransform2D"/>.</param>
-    /// <param name="previousRotation">The previous <see cref="Rotation"/> of the <see cref="ITransform2D"/>.</param>
+    readonly record struct RotationChangedArguments(float PreviousRotation);
-    delegate void RotationChangedEventHandler(ITransform2D sender, float previousRotation);
 }

Engine.Core/Abstract/IUniverse.cs

@@ -10,32 +10,47 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
     /// <summary>
     /// Event triggered when <see cref="Update(UniverseTime)"/> is about to be called called on the <see cref="IUniverse"/>.
     /// </summary>
-    event UpdateEventHandler? OnPreUpdate;
+    Event<IUniverse, UpdateArguments> OnPreUpdate { get; }
 
     /// <summary>
     /// Event triggered when <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>.
     /// </summary>
-    event UpdateEventHandler? OnUpdate;
+    Event<IUniverse, UpdateArguments> OnUpdate { get; }
 
     /// <summary>
-    /// Event triggered when <see cref="PreDraw"/> is called on the <see cref="IUniverse"/>.
+    /// Event triggered after <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>.
     /// </summary>
-    event PreDrawEventHandler? OnPreDraw;
+    Event<IUniverse, UpdateArguments> OnPostUpdate { get; }
+
+    /// <summary>
+    /// Event triggered when <see cref="Draw"/> is about to be called called on the <see cref="IUniverse"/>.
+    /// </summary>
+    Event<IUniverse> OnPreDraw { get; }
+
+    /// <summary>
+    /// Event triggered when <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
+    /// </summary>
+    Event<IUniverse> OnDraw { get; }
+
+    /// <summary>
+    /// Event triggered after <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
+    /// </summary>
+    Event<IUniverse> OnPostDraw { get; }
 
     /// <summary>
     /// Event triggered when a <see cref="IUniverseObject"/> is registered to the <see cref="IUniverse"/>.
     /// </summary>
-    event UniverseObjectRegisteredEventHandler? OnUniverseObjectRegistered;
+    Event<IUniverse, UniverseObjectRegisteredArguments> OnUniverseObjectRegistered { get; }
 
     /// <summary>
     /// Event triggered when a <see cref="IUniverseObject"/> is unregistered from the <see cref="IUniverse"/>.
     /// </summary>
-    event UniverseObjectUnRegisteredEventHandler? OnUniverseObjectUnRegistered;
+    Event<IUniverse, UniverseObjectUnRegisteredArguments> OnUniverseObjectUnRegistered { get; }
 
     /// <summary>
     /// Event triggered when <see cref="TimeScale"/> is changed on the <see cref="IUniverse"/>.
     /// </summary>
-    event TimeScaleChangedEventHandler? OnTimeScaleChanged;
+    Event<IUniverse, TimeScaleChangedArguments> OnTimeScaleChanged { get; }
 
     /// <summary>
     /// Current time scale the <see cref="IUniverse"/> operates on.
@@ -84,15 +99,12 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
     void Update(UniverseTime universeTime);
 
     /// <summary>
-    /// Performs operations that should be done before the draw calls.
+    /// Performs operations that should be done to the draw.
     /// </summary>
-    void PreDraw();
+    void Draw();
 
-    delegate void TimeScaleChangedEventHandler(IUniverse sender, float previousTimeScale);
+    readonly record struct TimeScaleChangedArguments(float PreviousTimeScale);
-
+    readonly record struct UpdateArguments(UniverseTime EngineTime);
-    delegate void UpdateEventHandler(IUniverse sender, UniverseTime engineTime);
+    readonly record struct UniverseObjectRegisteredArguments(IUniverseObject UniverseObjectRegistered);
-    delegate void PreDrawEventHandler(IUniverse sender);
+    readonly record struct UniverseObjectUnRegisteredArguments(IUniverseObject UniverseObjectUnregistered);
-
-    delegate void UniverseObjectRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectRegistered);
-    delegate void UniverseObjectUnRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectUnregistered);
 }

Engine.Core/Abstract/IUniverseObject.cs

@@ -12,27 +12,27 @@ public interface IUniverseObject : IEntity, IActive, INameable, IHasBehaviourCon
     /// <summary>
     /// Event triggered when the <see cref="IUniverseObject"/> enters the universe.
     /// </summary>
-    event EnteredUniverseEventHandler? OnEnteredUniverse;
+    Event<IUniverseObject, EnteredUniverseArguments> OnEnteredUniverse { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="IUniverseObject"/> exits the universe.
     /// </summary>
-    event ExitedUniverseEventHandler? OnExitedUniverse;
+    Event<IUniverseObject, ExitedUniverseArguments> OnExitedUniverse { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="Parent"/> of the <see cref="IUniverseObject"/> changes. The second parameter is the old <see cref="IUniverseObject"/>.
     /// </summary>
-    event ParentChangedEventHandler? OnParentChanged;
+    Event<IUniverseObject, ParentChangedArguments> OnParentChanged { get; }
 
     /// <summary>
     /// Event triggered when a new <see cref="IUniverseObject"/> is added to the <see cref="Children"/>.
     /// </summary>
-    event ChildrenAddedEventHandler? OnChildrenAdded;
+    Event<IUniverseObject, ChildrenAddedArguments> OnChildrenAdded { get; }
 
     /// <summary>
     /// Event triggered when an <see cref="IUniverseObject"/> is removed from the <see cref="Children"/>.
     /// </summary>
-    event ChildrenRemovedEventHandler? OnChildrenRemoved;
+    Event<IUniverseObject, ChildrenRemovedArguments> OnChildrenRemoved { get; }
 
     /// <summary>
     /// Gets the <see cref="IUniverse"/> this <see cref="IUniverseObject"/> is connected to, if any.
@@ -94,38 +94,38 @@ public interface IUniverseObject : IEntity, IActive, INameable, IHasBehaviourCon
     void RemoveChild(IUniverseObject universeObject);
 
     /// <summary>
-    /// EventHandler delegate for the event triggered when the <see cref="IUniverseObject"/> enters the universe of a <see cref="IUniverse">.
+    /// Arguments for the event triggered when the <see cref="IUniverseObject"/> enters the universe of a <see cref="IUniverse">.
     /// </summary>
     /// <param name="sender">The <see cref="IUniverseObject"/> that entered the universe.</param>
     /// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has entered it's universe.</param>
-    delegate void EnteredUniverseEventHandler(IUniverseObject sender, IUniverse universe);
+    readonly record struct EnteredUniverseArguments(IUniverse Universe);
 
     /// <summary>
-    /// EventHandler delegate for the event triggered when the <see cref="IUniverseObject"/> exits the universe of a <see cref="IUniverse">.
+    /// Arguments for the event triggered when the <see cref="IUniverseObject"/> exits the universe of a <see cref="IUniverse">.
     /// </summary>
     /// <param name="sender">The <see cref="IUniverseObject"/> that exited the universe.</param>
     /// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has exited it's universe.</param>
-    delegate void ExitedUniverseEventHandler(IUniverseObject sender, IUniverse universe);
+    readonly record struct ExitedUniverseArguments(IUniverse Universe);
 
     /// <summary>
-    /// Delegate for the event triggered when the <see cref="IUniverseObject"/>'s parent changes.
+    /// Arguments for the event triggered when the <see cref="IUniverseObject"/>'s parent changes.
     /// </summary>
     /// <param name="sender">The <see cref="IUniverseObject"/> that the parent has changed.</param>
     /// <param name="previousParent">The previous <see cref="IUniverseObject"/> the sender was a child of.</param>
     /// <param name="newParent">The new and current <see cref="IUniverseObject"/> the sender is a child of.</param>
-    delegate void ParentChangedEventHandler(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent);
+    readonly record struct ParentChangedArguments(IUniverseObject? PreviousParent, IUniverseObject? CurrentParent);
 
     /// <summary>
-    /// Delegate for the event triggered when a new <see cref="IUniverseObject"/> added as a child.
+    /// Arguments for the event triggered when a new <see cref="IUniverseObject"/> added as a child.
     /// </summary>
     /// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param>
     /// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param>
-    delegate void ChildrenAddedEventHandler(IUniverseObject sender, IUniverseObject childrenAdded);
+    readonly record struct ChildrenAddedArguments(IUniverseObject ChildrenAdded);
 
     /// <summary>
     /// Delegate for the event triggered when a new <see cref="IUniverseObject"/> removed from being a child.
     /// </summary>
     /// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param>
     /// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param>
-    delegate void ChildrenRemovedEventHandler(IUniverseObject sender, IUniverseObject childrenRemoved);
+    readonly record struct ChildrenRemovedArguments(IUniverseObject ChildrenRemoved);
 }

Engine.Core/ActiveBehaviourCollector.cs

@@ -1,89 +1,92 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : class, IBehaviour
 {
-    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
+    public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourCollectedArguments> OnCollected { get; } = new();
-    public event IHasUniverse.UniverseAssignedEventHandler? OnUniverseAssigned = null;
+    public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourRemovedArguments> OnRemoved { get; } = new();
+    public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
+    public Event<IAssignable>? OnUnassigned { get; } = new();
 
-    public event IBehaviourCollector<T>.CollectedEventHandler? OnCollected = null;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
-    public event IBehaviourCollector<T>.RemovedEventHandler? OnRemoved = null;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
+    private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler delegateOnBehaviourStateChanged = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler delegateOnUniverseObjectRegistered = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler delegateOnUniverseObjectUnregistered = null!;
 
     private readonly List<T> monitoringBehaviours = new(32);
     protected readonly List<T> activeBehaviours = new(32);
     protected readonly Dictionary<IActive, T> monitoringActiveToBehaviour = new(32);
 
-    public IReadOnlyList<T> Behaviours => activeBehaviours;
     public IUniverse Universe { get; private set; } = null!;
 
-    public T this[Index index] => activeBehaviours[index];
+    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
-
-    public ActiveBehaviourCollector() { }
-    public ActiveBehaviourCollector(IUniverse universe) => Assign(universe);
-
-    private void OnUniverseObjectRegistered(IUniverse manager, IUniverseObject universeObject)
     {
-        universeObject.BehaviourController.OnBehaviourAdded += OnBehaviourAdded;
+        IUniverseObject universeObject = args.UniverseObjectRegistered;
-        universeObject.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved;
 
-        foreach (IBehaviour item in universeObject.BehaviourController)
+        universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-            OnBehaviourAdded(universeObject.BehaviourController, item);
+        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
+
+        for (int i = 0; i < universeObject.BehaviourController.Count; i++)
+            OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
-    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverseObject universeObject)
+    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
     {
-        universeObject.BehaviourController.OnBehaviourAdded -= OnBehaviourAdded;
+        IUniverseObject universeObject = args.UniverseObjectUnregistered;
-        universeObject.BehaviourController.OnBehaviourRemoved -= OnBehaviourRemoved;
 
-        foreach (IBehaviour item in universeObject.BehaviourController)
+        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
-            OnBehaviourRemoved(universeObject.BehaviourController, item);
+        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
+
+        for (int i = 0; i < universeObject.BehaviourController.Count; i++)
+            OnBehaviourRemoved(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
     protected virtual void OnBehaviourAdd(IBehaviour behaviour) { }
-    private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments args)
     {
-        if (behaviour is not T tBehaviour)
+        if (args.BehaviourAdded is not T tBehaviour)
             return;
 
         monitoringBehaviours.Add(tBehaviour);
         monitoringActiveToBehaviour.Add(tBehaviour, tBehaviour);
-        tBehaviour.OnActiveChanged += OnBehaviourStateChanged;
+        tBehaviour.OnActiveChanged.AddListener(delegateOnBehaviourStateChanged);
-        OnBehaviourStateChanged(tBehaviour, !tBehaviour.IsActive);
+        OnBehaviourStateChanged(tBehaviour, new(!tBehaviour.IsActive));
     }
 
-    private void OnBehaviourStateChanged(IActive sender, bool previousState)
+    protected virtual void AddBehaviour(T behaviour) => activeBehaviours.Add(behaviour);
+    private void OnBehaviourStateChanged(IActive sender, IActive.ActiveChangedArguments args)
     {
         T behaviour = monitoringActiveToBehaviour[sender];
         if (sender.IsActive)
         {
-            activeBehaviours.Add(behaviour);
+            AddBehaviour(behaviour);
             OnBehaviourAdd(behaviour);
-            OnCollected?.InvokeSafe(this, behaviour);
+            OnCollected?.Invoke(this, new(behaviour));
         }
         else if (activeBehaviours.Remove(behaviour))
         {
             OnBehaviourRemove(behaviour);
-            OnRemoved?.InvokeSafe(this, behaviour);
+            OnRemoved?.Invoke(this, new(behaviour));
         }
     }
 
     protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
-    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
     {
-        if (behaviour is not T tBehaviour)
+        if (args.BehaviourRemoved is not T tBehaviour)
             return;
 
         if (!monitoringBehaviours.Remove(tBehaviour) || !monitoringActiveToBehaviour.Remove(tBehaviour))
             return;
 
-        tBehaviour.OnActiveChanged -= OnBehaviourStateChanged;
+        tBehaviour.OnActiveChanged.RemoveListener(delegateOnBehaviourStateChanged);
         if (activeBehaviours.Remove(tBehaviour))
         {
             OnBehaviourRemove(tBehaviour);
-            OnRemoved?.InvokeSafe(this, tBehaviour);
+            OnRemoved?.Invoke(this, new(tBehaviour));
         }
     }
 
@@ -93,13 +96,13 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
             return false;
 
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
-            OnUniverseObjectRegistered(universe, universeObject);
+            OnUniverseObjectRegistered(universe, new(universeObject));
 
-        universe.OnUniverseObjectRegistered += OnUniverseObjectRegistered;
+        universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered += OnUniverseObjectUnregistered;
+        universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
 
         Universe = universe;
-        OnUniverseAssigned?.InvokeSafe(this);
+        OnUniverseAssigned?.Invoke(this);
 
         return true;
     }
@@ -110,16 +113,36 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
             return false;
 
         foreach (IUniverseObject universeObject in Universe.UniverseObjects)
-            OnUniverseObjectUnregistered(Universe, universeObject);
+            OnUniverseObjectUnregistered(Universe, new(universeObject));
 
-        Universe.OnUniverseObjectRegistered -= OnUniverseObjectRegistered;
+        Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
-        Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered;
+        Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
 
         Universe = null!;
-        OnUnassigned?.InvokeSafe(this);
+        OnUnassigned?.Invoke(this);
         return true;
     }
 
-    public IEnumerator<T> GetEnumerator() => activeBehaviours.GetEnumerator();
+    public int Count => activeBehaviours.Count;
-    IEnumerator IEnumerable.GetEnumerator() => activeBehaviours.GetEnumerator();
+    public T this[Index index] => activeBehaviours[index];
+
+    public ActiveBehaviourCollector()
+    {
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        delegateOnBehaviourStateChanged = OnBehaviourStateChanged;
+        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
+    }
+
+    public ActiveBehaviourCollector(IUniverse universe)
+    {
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        delegateOnBehaviourStateChanged = OnBehaviourStateChanged;
+        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
+
+        Assign(universe);
+    }
 }

Engine.Core/ActiveBehaviourCollectorSorted.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class ActiveBehaviourCollectorSorted<T> : ActiveBehaviourCollector<T> where T : class, IBehaviour
 {
-    private Comparison<T>? _sortBy = null;
+    private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
-    public Comparison<T>? SortBy
+
+    private IComparer<T>? _sortBy = null;
+    public IComparer<T>? SortBy
     {
         get => _sortBy;
         set
@@ -17,12 +20,48 @@ public class ActiveBehaviourCollectorSorted<T> : ActiveBehaviourCollector<T> whe
         }
     }
 
-    protected override void OnBehaviourAdd(IBehaviour behaviour)
+    protected override void AddBehaviour(T behaviour)
     {
-        if (SortBy is not null)
+        if (SortBy is null)
-            activeBehaviours.Sort(SortBy);
+        {
+            activeBehaviours.Add(behaviour);
+            return;
+        }
+
+        int insertionIndex = activeBehaviours.BinarySearch(behaviour, SortBy);
+
+        if (insertionIndex < 0)
+            insertionIndex = ~insertionIndex;
+
+        activeBehaviours.Insert(insertionIndex, behaviour);
     }
 
-    public ActiveBehaviourCollectorSorted() { }
+    protected override void OnBehaviourAdd(IBehaviour behaviour)
-    public ActiveBehaviourCollectorSorted(IUniverse universe, Comparison<T> sortBy) : base(universe) => SortBy = sortBy;
+    {
+        behaviour.OnPriorityChanged.AddListener(delegateOnPriorityChanged);
+    }
+
+    protected override void OnBehaviourRemove(IBehaviour behaviour)
+    {
+        behaviour.OnPriorityChanged.RemoveListener(delegateOnPriorityChanged);
+    }
+
+    private void OnPriorityChanged(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
+    {
+        T behaviour = (T)sender;
+        activeBehaviours.Remove(behaviour);
+        AddBehaviour(behaviour);
+    }
+
+    public ActiveBehaviourCollectorSorted()
+    {
+        delegateOnPriorityChanged = OnPriorityChanged;
+    }
+
+    public ActiveBehaviourCollectorSorted(IUniverse universe, Comparison<T> sortBy) : base(universe)
+    {
+        delegateOnPriorityChanged = OnPriorityChanged;
+
+        SortBy = Comparer<T>.Create(sortBy);
+    }
 }

Engine.Core/BaseEntity.cs

@@ -4,13 +4,11 @@ namespace Syntriax.Engine.Core;
 
 public abstract class BaseEntity : IEntity
 {
-    public event IEntity.IdChangedEventHandler? OnIdChanged = null;
+    public Event<IEntity, IEntity.IdChangedArguments> OnIdChanged { get; } = new();
-
+    public Event<IInitializable> OnInitialized { get; } = new();
-    public event IInitializable.InitializedEventHandler? OnInitialized = null;
+    public Event<IInitializable> OnFinalized { get; } = new();
-    public event IInitializable.FinalizedEventHandler? OnFinalized = null;
+    public Event<IHasStateEnable> OnStateEnableAssigned { get; } = new();
-
+    public Event<IAssignable> OnUnassigned { get; } = new();
-    public event IHasStateEnable.StateEnableAssignedEventHandler? OnStateEnableAssigned = null;
-    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
 
     private IStateEnable _stateEnable = null!;
 
@@ -33,7 +31,7 @@ public abstract class BaseEntity : IEntity
             string previousId = _id;
 
             _id = value;
-            OnIdChanged?.InvokeSafe(this, previousId);
+            OnIdChanged?.Invoke(this, new(previousId));
         }
     }
 
@@ -47,9 +45,9 @@ public abstract class BaseEntity : IEntity
 
             _initialized = value;
             if (value)
-                OnInitialized?.InvokeSafe(this);
+                OnInitialized?.Invoke(this);
             else
-                OnFinalized?.InvokeSafe(this);
+                OnFinalized?.Invoke(this);
         }
     }
 
@@ -62,7 +60,7 @@ public abstract class BaseEntity : IEntity
         _stateEnable = stateEnable;
         _stateEnable.Assign(this);
         OnAssign(stateEnable);
-        OnStateEnableAssigned?.InvokeSafe(this);
+        OnStateEnableAssigned?.Invoke(this);
         return true;
     }
 
@@ -76,7 +74,7 @@ public abstract class BaseEntity : IEntity
 
         _stateEnable = null!;
         _stateEnable.Unassign();
-        OnUnassigned?.InvokeSafe(this);
+        OnUnassigned?.Invoke(this);
         return true;
     }
 

Engine.Core/Behaviour.cs

@@ -2,108 +2,49 @@ namespace Syntriax.Engine.Core;
 
 public abstract class Behaviour : BehaviourBase
 {
-    private bool isInitializedThisFrame = false;
+    private readonly Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments>.EventHandler delegateEnteredUniverse = null!;
-
+    private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateExitedUniverse = null!;
-    protected IUniverse Universe => BehaviourController.UniverseObject.Universe;
-    protected IUniverseObject UniverseObject => BehaviourController.UniverseObject;
 
     public Behaviour()
     {
-        OnInitialized += OnInitialize;
+        OnInitialized.AddListener(OnInitialize);
-        OnFinalized += OnFinalize;
+        OnFinalized.AddListener(OnFinalize);
-        OnUnassigned += OnUnassign;
+        OnUnassigned.AddListener(OnUnassign);
+
+        delegateEnteredUniverse = EnteredUniverse;
+        delegateExitedUniverse = ExitedUniverse;
     }
 
     protected virtual void OnUnassign() { }
-    protected virtual void OnUnassign(IAssignable assignable) => OnUnassign();
+    protected void OnUnassign(IAssignable assignable) => OnUnassign();
 
     protected virtual void OnInitialize() { }
-    protected virtual void OnInitialize(IInitializable _)
+    protected void OnInitialize(IInitializable _)
     {
-        isInitializedThisFrame = true;
+        BehaviourController.UniverseObject.OnEnteredUniverse.AddListener(delegateEnteredUniverse);
-
+        BehaviourController.UniverseObject.OnExitedUniverse.AddListener(delegateExitedUniverse);
-        BehaviourController.OnPreUpdate += PreUpdate;
-        BehaviourController.OnPreDraw += PreDraw;
-        BehaviourController.OnUpdate += Update;
-        BehaviourController.UniverseObject.OnEnteredUniverse += EnteredUniverse;
-        BehaviourController.UniverseObject.OnExitedUniverse += ExitedUniverse;
 
         OnInitialize();
 
         if (UniverseObject.IsInUniverse)
-            EnteredUniverse(UniverseObject, Universe);
+            EnteredUniverse(UniverseObject, new(Universe));
     }
 
     protected virtual void OnFinalize() { }
-    protected virtual void OnFinalize(IInitializable _)
+    protected void OnFinalize(IInitializable _)
     {
-        BehaviourController.OnPreUpdate -= PreUpdate;
+        BehaviourController.UniverseObject.OnEnteredUniverse.RemoveListener(delegateEnteredUniverse);
-        BehaviourController.OnPreDraw -= PreDraw;
+        BehaviourController.UniverseObject.OnExitedUniverse.RemoveListener(delegateExitedUniverse);
-        BehaviourController.OnUpdate -= Update;
-        BehaviourController.UniverseObject.OnEnteredUniverse -= EnteredUniverse;
-        BehaviourController.UniverseObject.OnExitedUniverse -= ExitedUniverse;
 
         OnFinalize();
 
         if (UniverseObject.IsInUniverse)
-            ExitedUniverse(UniverseObject, Universe);
+            ExitedUniverse(UniverseObject, new(Universe));
-    }
-
-    protected virtual void OnPreUpdatePreActiveCheck() { }
-    protected virtual void OnPreUpdate() { }
-    protected virtual void PreUpdate(IBehaviourController _)
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnPreUpdatePreActiveCheck();
-
-        if (!IsActive)
-            return;
-
-        if (isInitializedThisFrame)
-            FirstActiveFrame();
-
-        OnPreUpdate();
-    }
-
-    protected virtual void OnFirstActiveFrame() { }
-    protected virtual void FirstActiveFrame()
-    {
-        OnFirstActiveFrame();
-        isInitializedThisFrame = false;
-    }
-
-    protected virtual void OnUpdatePreActiveCheck() { }
-    protected virtual void OnUpdate() { }
-    protected virtual void Update(IBehaviourController _)
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnUpdatePreActiveCheck();
-
-        if (!IsActive)
-            return;
-
-        OnUpdate();
-    }
-
-    protected virtual void OnPreDrawPreActiveCheck() { }
-    protected virtual void OnPreDraw() { }
-    protected virtual void PreDraw(IBehaviourController _)
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        OnPreDrawPreActiveCheck();
-
-        if (!StateEnable.Enabled)
-            return;
-
-        OnPreDraw();
     }
 
     protected virtual void OnEnteredUniverse(IUniverse universe) { }
-    protected virtual void EnteredUniverse(IUniverseObject sender, IUniverse universe) => OnEnteredUniverse(universe);
+    protected void EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments args) => OnEnteredUniverse(args.Universe);
 
     protected virtual void OnExitedUniverse(IUniverse universe) { }
-    protected virtual void ExitedUniverse(IUniverseObject sender, IUniverse universe) => OnExitedUniverse(universe);
+    protected void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args) => OnExitedUniverse(args.Universe);
 }

Engine.Core/Behaviour2D.cs

@@ -4,23 +4,6 @@ public abstract class Behaviour2D : Behaviour, IBehaviour2D
 {
     public ITransform2D Transform { get; private set; } = null!;
 
-    protected sealed override void OnInitialize(IInitializable _)
+    protected override void OnInitialize() => Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
-    {
+    protected override void OnFinalize() => Transform = null!;
-        Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
-        base.OnInitialize(_);
-    }
-
-    protected sealed override void OnFinalize(IInitializable _)
-    {
-        Transform = null!;
-        base.OnFinalize(_);
-    }
-
-    protected sealed override void OnUnassign(IAssignable assignable) => base.OnUnassign(assignable);
-    protected sealed override void PreUpdate(IBehaviourController behaviourController) => base.PreUpdate(behaviourController);
-    protected sealed override void FirstActiveFrame() => base.FirstActiveFrame();
-    protected sealed override void Update(IBehaviourController behaviourController) => base.Update(behaviourController);
-    protected sealed override void PreDraw(IBehaviourController behaviourController) => base.PreDraw(behaviourController);
-    protected sealed override void EnteredUniverse(IUniverseObject sender, IUniverse universe) => base.EnteredUniverse(sender, universe);
-    protected sealed override void ExitedUniverse(IUniverseObject sender, IUniverse universe) => base.ExitedUniverse(sender, universe);
 }

Engine.Core/BehaviourBase.cs

@@ -3,9 +3,16 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("{GetType().Name, nq}, Priority: {Priority}, Initialized: {Initialized}")]
 public abstract class BehaviourBase : BaseEntity, IBehaviour
 {
-    public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
+    public Event<IBehaviour, IBehaviour.PriorityChangedArguments> OnPriorityChanged { get; } = new();
-    public event IBehaviour.PriorityChangedEventHandler? OnPriorityChanged = null;
+    public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; } = new();
-    public event IActive.ActiveChangedEventHandler? OnActiveChanged = null;
+    public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
+
+    private readonly Event<IHasUniverseObject>.EventHandler delegateOnUniverseObjectAssigned = null!;
+    private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler delegateOnUniverseObjectActiveChanged = null!;
+    private readonly Event<IStateEnable, IStateEnable.EnabledChangedArguments>.EventHandler delegateOnStateEnabledChanged = null!;
+
+    public IUniverse Universe => BehaviourController.UniverseObject.Universe;
+    public IUniverseObject UniverseObject => BehaviourController.UniverseObject;
 
     private IBehaviourController _behaviourController = null!;
     public IBehaviourController BehaviourController => _behaviourController;
@@ -21,7 +28,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
             int previousPriority = _priority;
             _priority = value;
-            OnPriorityChanged?.InvokeSafe(this, previousPriority);
+            OnPriorityChanged?.Invoke(this, new(previousPriority));
         }
     }
 
@@ -36,16 +43,16 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
         _behaviourController = behaviourController;
         OnAssign(behaviourController);
-        behaviourController.OnUniverseObjectAssigned += OnUniverseObjectAssigned;
+        behaviourController.OnUniverseObjectAssigned.AddListener(delegateOnUniverseObjectAssigned);
         if (behaviourController.UniverseObject is not null)
             OnUniverseObjectAssigned(behaviourController);
-        OnBehaviourControllerAssigned?.InvokeSafe(this);
+        OnBehaviourControllerAssigned?.Invoke(this);
         return true;
     }
 
     private void OnUniverseObjectAssigned(IHasUniverseObject sender)
     {
-        sender.UniverseObject.OnActiveChanged += OnUniverseObjectActiveChanged;
+        sender.UniverseObject.OnActiveChanged.AddListener(delegateOnUniverseObjectActiveChanged);
         UpdateActive();
     }
 
@@ -53,13 +60,14 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
     {
         base.OnAssign(stateEnable);
 
-        stateEnable.OnEnabledChanged += OnStateEnabledChanged;
+        stateEnable.OnEnabledChanged.AddListener(delegateOnStateEnabledChanged);
     }
 
     protected override void UnassignInternal()
     {
-        StateEnable.OnEnabledChanged -= OnStateEnabledChanged;
+        BehaviourController.UniverseObject.OnActiveChanged.RemoveListener(delegateOnUniverseObjectActiveChanged);
-        BehaviourController.OnUniverseObjectAssigned -= OnUniverseObjectAssigned;
+        StateEnable.OnEnabledChanged.RemoveListener(delegateOnStateEnabledChanged);
+        BehaviourController.OnUniverseObjectAssigned.RemoveListener(delegateOnUniverseObjectAssigned);
         base.UnassignInternal();
         _behaviourController = null!;
     }
@@ -70,8 +78,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
         Debug.Assert.AssertStateEnableAssigned(this);
     }
 
-    private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive();
+    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
-    private void OnUniverseObjectActiveChanged(IActive sender, bool previousState) => UpdateActive();
+    private void OnUniverseObjectActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
 
     private void UpdateActive()
     {
@@ -79,6 +87,13 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
         _isActive = StateEnable.Enabled && _behaviourController.UniverseObject.IsActive;
 
         if (previousActive != IsActive)
-            OnActiveChanged?.InvokeSafe(this, previousActive);
+            OnActiveChanged?.Invoke(this, new(previousActive));
+    }
+
+    protected BehaviourBase()
+    {
+        delegateOnUniverseObjectAssigned = OnUniverseObjectAssigned;
+        delegateOnUniverseObjectActiveChanged = OnUniverseObjectActiveChanged;
+        delegateOnStateEnabledChanged = OnStateEnabledChanged;
     }
 }

Engine.Core/BehaviourCollector.cs

@@ -1,67 +1,69 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 {
-    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
+    public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourCollectedArguments> OnCollected { get; } = new();
-    public event IHasUniverse.UniverseAssignedEventHandler? OnUniverseAssigned = null;
+    public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourRemovedArguments> OnRemoved { get; } = new();
+    public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
+    public Event<IAssignable>? OnUnassigned { get; } = new();
 
-    public event IBehaviourCollector<T>.CollectedEventHandler? OnCollected = null;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
-    public event IBehaviourCollector<T>.RemovedEventHandler? OnRemoved = null;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler delegateOnUniverseObjectRegistered = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler delegateOnUniverseObjectUnregistered = null!;
 
     protected readonly List<T> behaviours = new(32);
 
-    public IReadOnlyList<T> Behaviours => behaviours;
     public IUniverse Universe { get; private set; } = null!;
 
-    public T this[Index index] => behaviours[index];
+    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
-
-    public BehaviourCollector() { }
-    public BehaviourCollector(IUniverse universe) => Assign(universe);
-
-    private void OnUniverseObjectRegistered(IUniverse manager, IUniverseObject universeObject)
     {
-        universeObject.BehaviourController.OnBehaviourAdded += OnBehaviourAdded;
+        IUniverseObject universeObject = args.UniverseObjectRegistered;
-        universeObject.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved;
 
-        foreach (IBehaviour item in universeObject.BehaviourController)
+        universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-            OnBehaviourAdded(universeObject.BehaviourController, item);
+        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
+
+        for (int i = 0; i < universeObject.BehaviourController.Count; i++)
+            OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
-    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverseObject universeObject)
+    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
     {
-        universeObject.BehaviourController.OnBehaviourAdded -= OnBehaviourAdded;
+        IUniverseObject universeObject = args.UniverseObjectUnregistered;
-        universeObject.BehaviourController.OnBehaviourRemoved -= OnBehaviourRemoved;
 
-        foreach (IBehaviour item in universeObject.BehaviourController)
+        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
-            OnBehaviourRemoved(universeObject.BehaviourController, item);
+        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
+
+        for (int i = 0; i < universeObject.BehaviourController.Count; i++)
+            OnBehaviourRemoved(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
+    protected virtual void AddBehaviour(T behaviour) => behaviours.Add(behaviour);
     protected virtual void OnBehaviourAdd(IBehaviour behaviour) { }
-    private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments args)
     {
-        if (behaviour is not T tBehaviour)
+        if (args.BehaviourAdded is not T tBehaviour)
             return;
 
-        behaviours.Add(tBehaviour);
+        AddBehaviour(tBehaviour);
-        OnBehaviourAdd(behaviour);
+        OnBehaviourAdd(args.BehaviourAdded);
-        OnCollected?.InvokeSafe(this, tBehaviour);
+        OnCollected?.Invoke(this, new(tBehaviour));
     }
 
     protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
-    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
     {
-        if (behaviour is not T tBehaviour)
+        if (args.BehaviourRemoved is not T tBehaviour)
             return;
 
         if (!behaviours.Remove(tBehaviour))
             return;
 
-        OnBehaviourRemove(behaviour);
+        OnBehaviourRemove(args.BehaviourRemoved);
-        OnRemoved?.InvokeSafe(this, tBehaviour);
+        OnRemoved?.Invoke(this, new(tBehaviour));
     }
 
     protected virtual void OnAssign(IUniverse universe) { }
@@ -71,14 +73,14 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
             return false;
 
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
-            OnUniverseObjectRegistered(universe, universeObject);
+            OnUniverseObjectRegistered(universe, new(universeObject));
 
-        universe.OnUniverseObjectRegistered += OnUniverseObjectRegistered;
+        universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered += OnUniverseObjectUnregistered;
+        universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
 
         Universe = universe;
         OnAssign(universe);
-        OnUniverseAssigned?.InvokeSafe(this);
+        OnUniverseAssigned?.Invoke(this);
 
         return true;
     }
@@ -89,16 +91,34 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
             return false;
 
         foreach (IUniverseObject universeObject in Universe.UniverseObjects)
-            OnUniverseObjectUnregistered(Universe, universeObject);
+            OnUniverseObjectUnregistered(Universe, new(universeObject));
 
-        Universe.OnUniverseObjectRegistered -= OnUniverseObjectRegistered;
+        Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
-        Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered;
+        Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
 
         Universe = null!;
-        OnUnassigned?.InvokeSafe(this);
+        OnUnassigned?.Invoke(this);
         return true;
     }
 
-    public IEnumerator<T> GetEnumerator() => behaviours.GetEnumerator();
+    public int Count => behaviours.Count;
-    IEnumerator IEnumerable.GetEnumerator() => behaviours.GetEnumerator();
+    public T this[Index index] => behaviours[index];
+
+    public BehaviourCollector()
+    {
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
+    }
+
+    public BehaviourCollector(IUniverse universe)
+    {
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
+
+        Assign(universe);
+    }
 }

Engine.Core/BehaviourCollectorSorted.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class BehaviourCollectorSorted<T> : BehaviourCollector<T> where T : class
 {
-    private Comparison<T>? _sortBy = null;
+    private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
-    public Comparison<T>? SortBy
+
+    private IComparer<T>? _sortBy = null;
+    public IComparer<T>? SortBy
     {
         get => _sortBy;
         set
@@ -17,12 +20,48 @@ public class BehaviourCollectorSorted<T> : BehaviourCollector<T> where T : class
         }
     }
 
-    protected override void OnBehaviourAdd(IBehaviour behaviour)
+    protected override void AddBehaviour(T behaviour)
     {
-        if (SortBy is not null)
+        if (SortBy is null)
-            behaviours.Sort(SortBy);
+        {
+            behaviours.Add(behaviour);
+            return;
+        }
+
+        int insertionIndex = behaviours.BinarySearch(behaviour, SortBy);
+
+        if (insertionIndex < 0)
+            insertionIndex = ~insertionIndex;
+
+        behaviours.Insert(insertionIndex, behaviour);
     }
 
-    public BehaviourCollectorSorted() { }
+    protected override void OnBehaviourAdd(IBehaviour behaviour)
-    public BehaviourCollectorSorted(IUniverse universe, Comparison<T> sortBy) : base(universe) => SortBy = sortBy;
+    {
+        behaviour.OnPriorityChanged.AddListener(delegateOnPriorityChanged);
+    }
+
+    protected override void OnBehaviourRemove(IBehaviour behaviour)
+    {
+        behaviour.OnPriorityChanged.RemoveListener(delegateOnPriorityChanged);
+    }
+
+    private void OnPriorityChanged(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
+    {
+        T behaviour = (T)sender;
+        behaviours.Remove(behaviour);
+        AddBehaviour(behaviour);
+    }
+
+    public BehaviourCollectorSorted()
+    {
+        delegateOnPriorityChanged = OnPriorityChanged;
+    }
+
+    public BehaviourCollectorSorted(IUniverse universe, Comparison<T> sortBy) : base(universe)
+    {
+        delegateOnPriorityChanged = OnPriorityChanged;
+
+        SortBy = Comparer<T>.Create(sortBy);
+    }
 }

Engine.Core/BehaviourController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -8,19 +7,17 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Behaviour Count: {behaviours.Count}")]
 public class BehaviourController : BaseEntity, IBehaviourController
 {
-    public event IBehaviourController.PreUpdateEventHandler? OnPreUpdate = null;
+    public Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments> OnBehaviourAdded { get; } = new();
-    public event IBehaviourController.UpdateEventHandler? OnUpdate = null;
+    public Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments> OnBehaviourRemoved { get; } = new();
-    public event IBehaviourController.PreDrawEventHandler? OnPreDraw = null;
+    public Event<IHasUniverseObject> OnUniverseObjectAssigned { get; } = new();
 
-    public event IBehaviourController.BehaviourAddedEventHandler? OnBehaviourAdded = null;
+    private readonly List<IBehaviour> behaviours = new(Constants.BEHAVIOURS_SIZE_INITIAL);
-    public event IBehaviourController.BehaviourRemovedEventHandler? OnBehaviourRemoved = null;
-    public event IHasUniverseObject.UniverseObjectAssignedEventHandler? OnUniverseObjectAssigned = null;
-
-    private readonly IList<IBehaviour> behaviours = new List<IBehaviour>(Constants.BEHAVIOURS_SIZE_INITIAL);
 
     private IUniverseObject _universeObject = null!;
 
     public IUniverseObject UniverseObject => _universeObject;
+    public int Count => behaviours.Count;
+    public IBehaviour this[Index index] => behaviours[index];
 
     public T AddBehaviour<T>(T behaviour) where T : class, IBehaviour
     {
@@ -30,13 +27,17 @@ public class BehaviourController : BaseEntity, IBehaviourController
 
         if (IsInitialized)
             behaviour.Initialize();
-        behaviour.OnPriorityChanged += OnPriorityChange;
+
-        OnBehaviourAdded?.InvokeSafe(this, behaviour);
+        behaviour.OnPriorityChanged.AddListener(OnPriorityChange);
+        OnBehaviourAdded?.Invoke(this, new(behaviour));
         return behaviour;
     }
 
     public T AddBehaviour<T>(params object?[]? args) where T : class, IBehaviour
-        => AddBehaviour(Factory.BehaviourFactory.Instantiate<T>(_universeObject, args));
+    {
+        T behaviour = Factory.BehaviourFactory.Instantiate<T>(args);
+        return AddBehaviour(behaviour);
+    }
 
     public T? GetBehaviour<T>()
     {
@@ -93,10 +94,10 @@ public class BehaviourController : BaseEntity, IBehaviourController
         if (!behaviours.Contains(behaviour))
             throw new Exception($"{behaviour.GetType().Name} does not exist in {UniverseObject.Name}'s {nameof(IBehaviourController)}.");
 
-        behaviour.OnPriorityChanged -= OnPriorityChange;
+        behaviour.OnPriorityChanged.RemoveListener(OnPriorityChange);
         behaviour.Finalize();
         behaviours.Remove(behaviour);
-        OnBehaviourRemoved?.InvokeSafe(this, behaviour);
+        OnBehaviourRemoved?.Invoke(this, new(behaviour));
     }
 
     protected virtual void OnAssign(IUniverseObject universeObject) { }
@@ -107,7 +108,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
 
         _universeObject = universeObject;
         OnAssign(universeObject);
-        OnUniverseObjectAssigned?.InvokeSafe(this);
+        OnUniverseObjectAssigned?.Invoke(this);
         return true;
     }
 
@@ -125,27 +126,6 @@ public class BehaviourController : BaseEntity, IBehaviourController
             behaviour.Finalize();
     }
 
-    public void Update()
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled)
-            return;
-
-        OnPreUpdate?.InvokeSafe(this);
-        OnUpdate?.InvokeSafe(this);
-    }
-
-    public void UpdatePreDraw()
-    {
-        Debug.Assert.AssertInitialized(this);
-
-        if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled)
-            return;
-
-        OnPreDraw?.InvokeSafe(this);
-    }
-
     public BehaviourController() { }
     public BehaviourController(IUniverseObject universeObject) => Assign(universeObject);
 
@@ -166,12 +146,9 @@ public class BehaviourController : BaseEntity, IBehaviourController
             behaviours.Add(behaviour);
     }
 
-    private void OnPriorityChange(IBehaviour sender, int previousPriority)
+    private void OnPriorityChange(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
     {
         behaviours.Remove(sender);
         InsertBehaviourByPriority(sender);
     }
-
-    public IEnumerator<IBehaviour> GetEnumerator() => behaviours.GetEnumerator();
-    IEnumerator IEnumerable.GetEnumerator() => behaviours.GetEnumerator();
 }

Engine.Core/CoroutineManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
-public class CoroutineManager : UniverseObject
+public class CoroutineManager : Behaviour
 {
     private readonly List<IEnumerator> enumerators = [];
 
@@ -18,17 +18,17 @@ public class CoroutineManager : UniverseObject
         enumerators.Remove(enumerator);
     }
 
-    protected override void OnEnteringUniverse(IUniverse universe)
+    protected override void OnEnteredUniverse(IUniverse universe)
     {
-        universe.OnUpdate += OnUpdate;
+        universe.OnUpdate.AddListener(OnUpdate);
     }
 
-    protected override void OnExitingUniverse(IUniverse universe)
+    protected override void OnExitedUniverse(IUniverse universe)
     {
-        universe.OnUpdate -= OnUpdate;
+        universe.OnUpdate.RemoveListener(OnUpdate);
     }
 
-    private void OnUpdate(IUniverse sender, UniverseTime time)
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
     {
         for (int i = enumerators.Count - 1; i >= 0; i--)
         {

Engine.Core/Exceptions/BehaviourNotFoundException.cs

@@ -1,9 +1,3 @@
-using System;
-
 namespace Syntriax.Engine.Core.Exceptions;
 
-public class BehaviourNotFoundException(string? message) : Exception(message)
+public class BehaviourNotFoundException(string? message) : NotFoundException(message);
-{
-    public static NotAssignedException FromType<TBehaviour>()
-        => new($"{typeof(TBehaviour).FullName} was not found");
-}

Engine.Core/Exceptions/NotFoundException.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Syntriax.Engine.Core.Exceptions;
+
+public class NotFoundException(string? message) : Exception(message)
+{
+    public static NotAssignedException FromType<T>()
+        => new($"{typeof(T).FullName} was not found");
+}

Engine.Core/Exceptions/UniverseObjectNotFoundException.cs

@@ -1,9 +1,3 @@
-using System;
-
 namespace Syntriax.Engine.Core.Exceptions;
 
-public class UniverseObjectNotFoundException(string? message) : Exception(message)
+public class UniverseObjectNotFoundException(string? message) : NotFoundException(message);
-{
-    public static NotAssignedException FromType<TUniverseObject>()
-        => new($"{typeof(TUniverseObject).FullName} was not found");
-}

Engine.Core/Extensions/BehaviourControllerExtensions.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 using Syntriax.Engine.Core.Exceptions;
@@ -38,6 +39,19 @@ public static class BehaviourControllerExtensions
     public static T GetOrAddBehaviour<T>(this IBehaviourController behaviourController, params object?[]? args) where T : class, IBehaviour
         => behaviourController.GetBehaviour<T>() ?? behaviourController.AddBehaviour<T>(args);
 
+    /// <summary>
+    /// Gets an existing <see cref="IBehaviour"/> of the specified type, or adds and returns the fallback type if it doesn't exist.
+    /// </summary>
+    /// <typeparam name="TOriginal">The type of <see cref="IBehaviour"/> to get.</typeparam>
+    /// <typeparam name="TFallback">The type of <see cref="IBehaviour"/> to add. It must be assignable from <typeparamref name="TOriginal"/></typeparam>
+    /// <param name="behaviourController">The <see cref="IBehaviourController"/> to search in.</param>
+    /// <param name="args">Optional arguments to pass to the constructor of the <see cref="IBehaviour"/> if a new one is added.</param>
+    /// <returns>The existing or newly added <see cref="IBehaviour"/> of the specified type.</returns>
+    public static TOriginal GetOrAddBehaviour<TOriginal, TFallback>(this IBehaviourController behaviourController, params object?[]? args)
+            where TOriginal : class
+            where TFallback : class, IBehaviour, TOriginal
+        => behaviourController.GetBehaviour<TOriginal>() ?? behaviourController.AddBehaviour<TFallback>(args);
+
     /// <summary>
     /// Tries to get a <see cref="IBehaviour"/> of the specified type in it's <see cref="IUniverseObject"/>'s parents recursively.
     /// </summary>
@@ -81,6 +95,27 @@ public static class BehaviourControllerExtensions
     public static T GetRequiredBehaviourInParent<T>(this IBehaviourController behaviourController) where T : class
         => behaviourController.GetBehaviourInParent<T>() ?? throw new BehaviourNotFoundException($"{behaviourController.UniverseObject.Name}'s {nameof(IBehaviourController)} does not contain any {typeof(T).FullName} on any parent");
 
+    /// <summary>
+    /// Gets all <see cref="IBehaviour"/>s of the specified type in it's <see cref="IUniverseObject"/>'s parents recursively and stores them in the provided list.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
+    /// <param name="behavioursInParent">The list to store the <see cref="IBehaviour"/>s.</param>
+    public static void GetBehavioursInParent<T>(this IBehaviourController behaviourController, IList<T> behavioursInParent) where T : class
+    {
+        IBehaviourController? controller = behaviourController;
+        List<T> cache = [];
+        behavioursInParent.Clear();
+
+        while (controller is not null)
+        {
+            controller.GetBehaviours(cache);
+            foreach (T behaviour in cache)
+                behavioursInParent.Add(behaviour);
+
+            controller = controller.UniverseObject.Parent?.BehaviourController;
+        }
+    }
+
     /// <summary>
     /// Tries to get a <see cref="IBehaviour"/> of the specified type in it's <see cref="IUniverseObject"/>'s children recursively.
     /// </summary>
@@ -120,4 +155,28 @@ public static class BehaviourControllerExtensions
     /// <returns>The <see cref="IBehaviour"/> of the specified type if found; otherwise, throws <see cref="BehaviourNotFoundException"/>.</returns>
     public static T GetRequiredBehaviourInChildren<T>(this IBehaviourController behaviourController) where T : class
         => behaviourController.GetBehaviourInChildren<T>() ?? throw new BehaviourNotFoundException($"{behaviourController.UniverseObject.Name}'s {nameof(IBehaviourController)} does not contain any {typeof(T).FullName} on any children ");
+
+    /// <summary>
+    /// Gets all <see cref="IBehaviour"/>s of the specified type in it's <see cref="IUniverseObject"/>'s children recursively and stores them in the provided list.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
+    /// <param name="behavioursInChildren">The list to store the <see cref="IBehaviour"/>s.</param>
+    public static void GetBehavioursInChildren<T>(this IBehaviourController behaviourController, IList<T> behavioursInChildren) where T : class
+    {
+        List<T> cache = [];
+        behavioursInChildren.Clear();
+
+        TraverseChildrenForBehaviour(behaviourController.UniverseObject, behavioursInChildren, cache);
+    }
+
+    private static void TraverseChildrenForBehaviour<T>(IUniverseObject universeObject, IList<T> behaviours, IList<T> cache) where T : class
+    {
+        universeObject.BehaviourController.GetBehaviours(cache);
+
+        foreach (T behaviour in cache)
+            behaviours.Add(behaviour);
+
+        foreach (IUniverseObject child in universeObject)
+            TraverseChildrenForBehaviour(child, behaviours, cache);
+    }
 }

Engine.Core/Extensions/BehaviourExtensions.cs

@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Syntriax.Engine.Core;
-
-public static class BehaviourExtensions
-{
-    public static T? FindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
-    {
-        foreach (IUniverseObject universeObject in universeObjects)
-            if (universeObject.BehaviourController.GetBehaviour<T>() is T behaviour)
-                return behaviour;
-
-        return default;
-    }
-
-    public static bool TryFindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
-    {
-        behaviour = FindBehaviour<T>(universeObjects);
-        return behaviour is not null;
-    }
-
-    public static void FindBehaviours<T>(this IEnumerable<IUniverseObject> universeObjects, List<T> behaviours) where T : class
-    {
-        behaviours.Clear();
-        List<T> cache = [];
-
-        foreach (IUniverseObject universeObject in universeObjects)
-        {
-            universeObject.BehaviourController.GetBehaviours(cache);
-            behaviours.AddRange(cache);
-        }
-    }
-}

Engine.Core/Extensions/UniverseExtensions.cs

@@ -7,9 +7,30 @@ public static class UniverseExtensions
     public static IUniverseObject InstantiateUniverseObject(this IUniverse universe, params object?[]? args)
         => universe.InstantiateUniverseObject<UniverseObject>(args);
 
+    /// <summary>
+    /// Searches through all <see cref="IUniverseObject"/>s to find the specified instance of the type.
+    /// </summary>
+    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
+    /// <returns>The specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
     public static T GetRequiredUniverseObject<T>(this IUniverse universe) where T : class
         => universe.GetUniverseObject<T>() ?? throw new UniverseObjectNotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} object of type {typeof(T).FullName}");
 
+    /// <summary>
+    /// Searches through all <see cref="IBehaviours"/>s to find the specified instance of the type.
+    /// </summary>
+    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
+    /// <returns>The specified type if found; otherwise, throws <see cref="BehaviourNotFoundException"/>.</returns>
     public static T FindRequiredBehaviour<T>(this IUniverse universe) where T : class
         => universe.FindBehaviour<T>() ?? throw new BehaviourNotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} with {nameof(IBehaviour)} of type {typeof(T).FullName}");
+
+    /// <summary>
+    /// Searches through all <see cref="IUniverseObject"/>s and <see cref="IBehaviours"/>s to find the specified instance of the type.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: This is more expensive compared to <see cref="GetRequiredUniverseObject{T}(IUniverse)"/> or <see cref="FindRequiredBehaviour{T}(IUniverse)"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
+    /// </remarks>
+    /// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
+    /// <returns>The specified type if found; otherwise, throws <see cref="NotFoundException"/>.</returns>
+    public static T FindRequired<T>(this IUniverse universe) where T : class
+        => universe.Find<T>() ?? throw new NotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} or {nameof(IBehaviour)} of type {typeof(T).FullName}");
 }

Engine.Core/Extensions/UniverseObjectExtensions.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
+using Syntriax.Engine.Core.Exceptions;
+
 namespace Syntriax.Engine.Core;
 
 public static class UniverseObjectExtensions
@@ -14,6 +16,13 @@ public static class UniverseObjectExtensions
         return universeObject;
     }
 
+    #region Universe Object Search
+    /// <summary>
+    /// Gets a <see cref="IUniverseObject"/> of the specified type.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
+    /// <returns>The first found <see cref="IUniverseObject"/> of the specified type; otherwise, null.</returns>
     public static T? GetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
     {
         foreach (IUniverseObject universeObject in universeObjects)
@@ -23,17 +32,224 @@ public static class UniverseObjectExtensions
         return default;
     }
 
-    public static bool TryGetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    /// <summary>
+    /// Tries to get a <see cref="IUniverseObject"/> of the specified type.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
+    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the universe objects; otherwise, <see cref="false"/>.</returns>
+    public static bool TryGetUniverseObject<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? universeObject) where T : class
     {
-        behaviour = GetUniverseObject<T>(universeObjects);
+        universeObject = GetUniverseObject<T>(universeObjects);
+        return universeObject is not null;
+    }
+
+    /// <summary>
+    /// Searches through the provided <see cref="IUniverseObject"/>s to collect a list of <see cref="IUniverseObject"/>s of the specified type.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObject">The <see cref="IUniverseObject"/> to search.</param>
+    /// <returns>The found <see cref="IUniverseObject"/>s of the specified types</returns>
+    public static void GetUniverseObjects<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> foundUniverseObjects) where T : class
+    {
+        foundUniverseObjects.Clear();
+
+        foreach (IUniverseObject universeObject in universeObjects)
+            if (universeObject is T @object)
+                foundUniverseObjects.Add(@object);
+    }
+    #endregion
+
+    #region Universe Object Search In Parent
+    /// <summary>
+    /// Tries to get a <see cref="IUniverseObject"/> of the specified type in it's parents recursively.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
+    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the parent universe objects; otherwise, <see cref="false"/>.</returns>
+    public static bool TryGetUniverseObjectInParent<T>(this IUniverseObject universeObject, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    {
+        behaviour = GetUniverseObjectInParent<T>(universeObject);
         return behaviour is not null;
     }
 
-    public static void GetUniverseObjects<T>(this IEnumerable<IUniverseObject> universeObjects, List<T> behaviours) where T : class
+    /// <summary>
+    /// Gets a <see cref="IUniverseObject"/> of the specified type in it's parents recursively.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
+    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, null.</returns>
+    public static T? GetUniverseObjectInParent<T>(this IUniverseObject universeObject) where T : class
+    {
+        if (universeObject.GetUniverseObject<T>() is T localUniverseObject)
+            return localUniverseObject;
+
+        IUniverseObject? parent = universeObject;
+
+        while (parent is not null)
+        {
+            if (parent is T behaviour)
+                return behaviour;
+
+            parent = universeObject.Parent;
+        }
+
+        return default;
+    }
+
+    /// <summary>
+    /// Gets a <see cref="IUniverseObject"/> of the specified type in the parents recursively. Throws an error if not found.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
+    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
+    public static T GetRequiredUniverseObjectInParent<T>(this IUniverseObject universeObject) where T : class
+        => universeObject.GetUniverseObjectInParent<T>() ?? throw new UniverseObjectNotFoundException($"{universeObject.Name}'s {nameof(IUniverseObject)} does not contain any {typeof(T).FullName} on any parent ");
+
+    #endregion
+
+    #region Universe Object Search In Children
+    /// <summary>
+    /// Tries to get a <see cref="IUniverseObject"/> of the specified type in it's children recursively.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
+    /// <returns><see cref="true"/> if a <see cref="IUniverseObject"/> of the specified type was found in the child universe objects; otherwise, <see cref="false"/>.</returns>
+    public static bool TryGetUniverseObjectInChildren<T>(this IUniverseObject universeObject, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    {
+        behaviour = GetUniverseObjectInChildren<T>(universeObject);
+        return behaviour is not null;
+    }
+
+    /// <summary>
+    /// Gets a <see cref="IUniverseObject"/> of the specified type in it's children recursively.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
+    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, null.</returns>
+    public static T? GetUniverseObjectInChildren<T>(this IUniverseObject universeObject) where T : class
+    {
+        if (universeObject.GetUniverseObject<T>() is T localUniverseObject)
+            return localUniverseObject;
+
+        foreach (IUniverseObject child in universeObject)
+            if (GetUniverseObjectInChildren<T>(child) is T behaviour)
+                return behaviour;
+
+        return default;
+    }
+
+    /// <summary>
+    /// Gets a <see cref="IUniverseObject"/> of the specified type in the children recursively. Throws an error if not found.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IUniverseObject"/> to get.</typeparam>
+    /// <param name="universeObject">The <see cref="IUniverseObject"/> to start searching from.</param>
+    /// <returns>The <see cref="IUniverseObject"/> of the specified type if found; otherwise, throws <see cref="UniverseObjectNotFoundException"/>.</returns>
+    public static T GetRequiredUniverseObjectInChildren<T>(this IUniverseObject universeObject) where T : class
+        => universeObject.GetUniverseObjectInChildren<T>() ?? throw new UniverseObjectNotFoundException($"{universeObject.Name}'s {nameof(IUniverseObject)} does not contain any {typeof(T).FullName} on any children ");
+    #endregion
+
+    #region Behaviour Search
+    /// <summary>
+    /// Finds a <see cref="IBehaviour"/> of the specified type in the provided <see cref="IUniverseObject"/>s.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
+    /// <returns>The first found <see cref="IBehaviour"/> of the specified type; otherwise, null.</returns>
+    public static T? FindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
+    {
+        foreach (IUniverseObject universeObject in universeObjects)
+            if (universeObject.BehaviourController.GetBehaviour<T>() is T behaviour)
+                return behaviour;
+
+        return default;
+    }
+
+    /// <summary>
+    /// Tries to find a <see cref="IBehaviour"/> of the specified type in the provided <see cref="IUniverseObject"/>s.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
+    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
+    /// <returns><see cref="true"/> if a <see cref="IBehaviour"/> of the specified type was found in the provided <see cref="IUniverseObject"/>s; otherwise, <see cref="false"/>.</returns>
+    public static bool TryFindBehaviour<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    {
+        behaviour = FindBehaviour<T>(universeObjects);
+        return behaviour is not null;
+    }
+
+    /// <summary>
+    /// Searches through the provided <see cref="IUniverseObject"/>s to collect a list of <see cref="IBehaviour"/>s of the specified type.
+    /// </summary>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to get.</typeparam>
+    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
+    public static void FindBehaviours<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> behaviours) where T : class
     {
         behaviours.Clear();
+        List<T> cache = [];
+
         foreach (IUniverseObject universeObject in universeObjects)
-            if (universeObject is T @object)
+        {
-                behaviours.Add(@object);
+            universeObject.BehaviourController.GetBehaviours(cache);
+            foreach (T behaviour in cache)
+                behaviours.Add(behaviour);
+        }
     }
+    #endregion
+
+    #region General Search
+    /// <summary>
+    /// Finds an object of the specified type in the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: This is more expensive compared to <see cref="GetUniverseObject{T}(IEnumerable{IUniverseObject})"/> or <see cref="FindBehaviour{T}(IEnumerable{IUniverseObject})"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
+    /// </remarks>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
+    /// <returns>The first found instance of the specified type; otherwise, null.</returns>
+    public static T? Find<T>(this IEnumerable<IUniverseObject> universeObjects) where T : class
+    {
+        if (universeObjects.GetUniverseObject<T>() is T foundUniverseObject)
+            return foundUniverseObject;
+
+        if (universeObjects.FindBehaviour<T>() is T foundBehaviour)
+            return foundBehaviour;
+
+        return null;
+    }
+
+    /// <summary>
+    /// Tries to find an object of the specified type in the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: This is more expensive compared to <see cref="TryGetUniverseObject{T}(IEnumerable{IUniverseObject}, out T?)"/> or <see cref="TryFindBehaviour{T}(IEnumerable{IUniverseObject}, out T?)"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
+    /// </remarks>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to find.</typeparam>
+    /// <param name="behaviour">When this method returns, contains the <see cref="IUniverseObject"/> of the specified type, if found; otherwise, null.</param>
+    /// <returns><see cref="true"/> if an object of the specified type was found in the provided <see cref="IUniverseObject"/>s; otherwise, <see cref="false"/>.</returns>
+    public static bool TryFind<T>(this IEnumerable<IUniverseObject> universeObjects, [NotNullWhen(returnValue: true)] out T? behaviour) where T : class
+    {
+        behaviour = Find<T>(universeObjects);
+        return behaviour is not null;
+    }
+
+    /// <summary>
+    /// Searches through the provided <see cref="IUniverseObject"/>s and their <see cref="IBehaviour"/>s to collect a list of the specified type.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: This is more expensive compared to <see cref="GetUniverseObjects{T}(IEnumerable{IUniverseObject}, IList{T})"/> or <see cref="FindBehaviours{T}(IEnumerable{IUniverseObject}, IList{T})"/> as it combines the two. If you know whether the type is either a type that gets implemented on an <see cref="IBehaviour"/> or <see cref="IUniverseObject"/> use the method appropriate for it for performance.
+    /// </remarks>
+    /// <typeparam name="T">The type of <see cref="IBehaviour"/> to get.</typeparam>
+    /// <param name="instances">List of objects found wit the specified type.</param>
+    /// <param name="universeObjects">The <see cref="IUniverseObject"/>s to search.</param>
+    public static void Find<T>(this IEnumerable<IUniverseObject> universeObjects, IList<T> instances) where T : class
+    {
+        instances.Clear();
+        List<T> cache = [];
+
+        foreach (IUniverseObject universeObject in universeObjects)
+        {
+            universeObject.Find(cache);
+            foreach (T behaviour in cache)
+                instances.Add(behaviour);
+        }
+    }
+    #endregion
 }

Engine.Core/Factory/BehaviourFactory.cs

@@ -4,10 +4,10 @@ namespace Syntriax.Engine.Core.Factory;
 
 public class BehaviourFactory
 {
-    public static T Instantiate<T>(IUniverseObject universeObject, params object?[]? args) where T : class, IBehaviour
+    public static T Instantiate<T>(params object?[]? args) where T : class, IBehaviour
-        => Instantiate<T>(universeObject, stateEnable: null, args);
+        => Instantiate<T>(stateEnable: null, args);
 
-    public static T Instantiate<T>(IUniverseObject universeObject, IStateEnable? stateEnable, params object?[]? args)
+    public static T Instantiate<T>(IStateEnable? stateEnable, params object?[]? args)
         where T : class, IBehaviour
     {
         T behaviour = TypeFactory.Get<T>(args);
@@ -18,8 +18,6 @@ public class BehaviourFactory
 
         if (!behaviour.Assign(stateEnable))
             throw AssignFailedException.From(behaviour, stateEnable);
-        if (!behaviour.Assign(universeObject.BehaviourController))
-            throw AssignFailedException.From(behaviour, universeObject.BehaviourController);
 
         return behaviour;
     }

Engine.Core/Helpers/DelegateExtensions.cs

@@ -4,9 +4,10 @@ namespace Syntriax.Engine.Core;
 
 public static class DelegateExtensions
 {
+    [Obsolete($"{nameof(InvokeSafe)} causes memory allocation, please use Invoke() instead.")]
     public static void InvokeSafe(this Delegate @delegate, params object?[] args)
     {
-        foreach (Delegate invocation in @delegate.GetInvocationList())
+        foreach (Delegate invocation in Delegate.EnumerateInvocationList(@delegate))
             try { invocation.DynamicInvoke(args); }
             catch (Exception exception)
             {

Engine.Core/Helpers/Event.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+
+namespace Syntriax.Engine.Core;
+
+public class Event
+{
+    private readonly List<EventHandler> listeners = new(4);
+    private readonly List<EventHandler> onceListeners = new(2);
+
+    public void AddListener(EventHandler listener) => listeners.Add(listener);
+    public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
+    public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
+    public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
+    public void Clear() { listeners.Clear(); onceListeners.Clear(); }
+    public void Invoke()
+    {
+        for (int i = 0; i < listeners.Count; i++)
+            try { listeners[i].Invoke(); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}()";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+
+        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        {
+            try { onceListeners[i].Invoke(); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}()";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+            onceListeners.RemoveAt(i);
+        }
+    }
+
+    public delegate void EventHandler();
+}
+
+public class Event<TSender>
+{
+    private readonly List<EventHandler> listeners = new(4);
+    private readonly List<EventHandler> onceListeners = new(2);
+
+    public void AddListener(EventHandler listener) => listeners.Add(listener);
+    public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
+    public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
+    public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
+    public void Clear() { listeners.Clear(); onceListeners.Clear(); }
+    public void Invoke(TSender sender)
+    {
+        for (int i = 0; i < listeners.Count; i++)
+            try { listeners[i].Invoke(sender); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({sender})";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+
+        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        {
+            try { onceListeners[i].Invoke(sender); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}({sender})";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+            onceListeners.RemoveAt(i);
+        }
+    }
+
+    public delegate void EventHandler(TSender sender);
+}
+
+public class Event<TSender, TArguments>
+{
+    private readonly List<EventHandler> listeners = new(4);
+    private readonly List<EventHandler> onceListeners = new(2);
+
+    public void AddListener(EventHandler listener) => listeners.Add(listener);
+    public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
+    public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
+    public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
+    public void Clear() { listeners.Clear(); onceListeners.Clear(); }
+    public void Invoke(TSender sender, TArguments args)
+    {
+        for (int i = 0; i < listeners.Count; i++)
+            try { listeners[i].Invoke(sender, args); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({string.Join(", ", sender, args)})";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+
+        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        {
+            try { onceListeners[i].Invoke(sender, args); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}({string.Join(", ", sender, args)})";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+            onceListeners.RemoveAt(i);
+        }
+    }
+
+    public delegate void EventHandler(TSender sender, TArguments args);
+}

Engine.Core/Helpers/Progression/IReadOnlyProgressionTracker.cs

@@ -2,12 +2,11 @@ namespace Syntriax.Engine.Core;
 
 public interface IReadOnlyProgressionTracker
 {
-    event ProgressionUpdatedEventHandler? OnUpdated;
+    Event<IReadOnlyProgressionTracker, ProgressionUpdatedArguments> OnUpdated { get; }
-    event ProgressionEndedEventHandler? OnEnded;
+    Event<IReadOnlyProgressionTracker> OnEnded { get; }
 
     float Progression { get; }
     string Status { get; }
 
-    delegate void ProgressionUpdatedEventHandler(IReadOnlyProgressionTracker sender, float previousProgression, string previousStatus);
+    readonly record struct ProgressionUpdatedArguments(float PreviousProgression, string PreviousStatus);
-    delegate void ProgressionEndedEventHandler(IReadOnlyProgressionTracker sender);
 }

Engine.Core/Helpers/Progression/ProgressionTracker.cs

@@ -2,8 +2,8 @@ namespace Syntriax.Engine.Core;
 
 public class ProgressionTracker : IProgressionTracker
 {
-    public event IReadOnlyProgressionTracker.ProgressionUpdatedEventHandler? OnUpdated = null;
+    public Event<IReadOnlyProgressionTracker, IReadOnlyProgressionTracker.ProgressionUpdatedArguments> OnUpdated { get; } = new();
-    public event IReadOnlyProgressionTracker.ProgressionEndedEventHandler? OnEnded = null;
+    public Event<IReadOnlyProgressionTracker> OnEnded { get; } = new();
 
     public float Progression { get; private set; } = 0f;
     public string Status { get; private set; } = "Default";
@@ -19,10 +19,10 @@ public class ProgressionTracker : IProgressionTracker
         Progression = progression.Clamp(Progression, 1f);
         Status = status;
 
-        OnUpdated?.InvokeSafe(this, previousProgression, previousStatus);
+        OnUpdated?.Invoke(this, new(previousProgression, previousStatus));
 
         if (progression >= 1f)
-            OnEnded?.InvokeSafe(this);
+            OnEnded?.Invoke(this);
     }
 
     void IProgressionTracker.Reset()
@@ -30,7 +30,7 @@ public class ProgressionTracker : IProgressionTracker
         Progression = 0f;
         Status = "Default";
 
-        OnUpdated = null;
+        OnUpdated.Clear();
-        OnEnded = null;
+        OnEnded.Clear();
     }
 }

Engine.Core/Primitives/Shape2D.cs

@@ -18,7 +18,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
     public static Shape2D Pentagon => CreateNgon(5, Vector2D.Up);
     public static Shape2D Hexagon => CreateNgon(6, Vector2D.Right);
 
-    public event ShapeUpdatedEventHandler? OnShapeUpdated = null;
+    public Event<Shape2D> OnShapeUpdated { get; } = new();
 
     private List<Vector2D> _vertices = vertices;
 
@@ -35,7 +35,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
             foreach (Vector2D vertex in value)
                 _vertices.Add(vertex);
 
-            OnShapeUpdated?.InvokeSafe(this);
+            OnShapeUpdated?.Invoke(this);
         }
     }
 
@@ -229,7 +229,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
         for (int i = 0; i < count; i++)
             to._vertices.Add(transform.Transform(from[i]));
 
-        to.OnShapeUpdated?.InvokeSafe(to);
+        to.OnShapeUpdated?.Invoke(to);
     }
 
     /// <summary>
@@ -256,8 +256,6 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => Vertices.GetEnumerator();
-
-    public delegate void ShapeUpdatedEventHandler(Shape2D shape2D);
 }
 
 /// <summary>

Engine.Core/Serialization/EntityRegistry.cs

@@ -5,7 +5,7 @@ namespace Syntriax.Engine.Core.Serialization;
 
 public class EntityRegistry
 {
-    public event EntityRegisteredEventHandler? OnEntityRegistered = null!;
+    public Event<EntityRegistry, EntityRegisteredArguments> OnEntityRegistered = null!;
 
     private readonly Dictionary<string, Action<IEntity>?> assignCallbacks = [];
     private readonly Dictionary<string, IEntity> registeredEntities = [];
@@ -14,7 +14,7 @@ public class EntityRegistry
     public void Add(IEntity entity)
     {
         if (registeredEntities.TryAdd(entity.Id, entity))
-            OnEntityRegistered?.InvokeSafe(this, entity);
+            OnEntityRegistered?.Invoke(this, new(entity));
     }
 
     public void QueueAssign(string id, Action<IEntity> setMethod)
@@ -26,7 +26,7 @@ public class EntityRegistry
     public void AssignAll()
     {
         foreach ((string id, Action<IEntity>? action) in assignCallbacks)
-            action?.InvokeSafe(registeredEntities[id]);
+            action?.Invoke(registeredEntities[id]);
     }
 
     public void Reset()
@@ -35,5 +35,5 @@ public class EntityRegistry
         registeredEntities.Clear();
     }
 
-    public delegate void EntityRegisteredEventHandler(EntityRegistry sender, IEntity entity);
+    public readonly record struct EntityRegisteredArguments(IEntity Entity);
 }

Engine.Core/StateEnable.cs

@@ -2,9 +2,9 @@ namespace Syntriax.Engine.Core;
 
 public class StateEnable : IStateEnable
 {
-    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
+    public Event<IStateEnable, IStateEnable.EnabledChangedArguments> OnEnabledChanged { get; } = new();
-    public event IHasEntity.EntityAssignedEventHandler? OnEntityAssigned = null;
+    public Event<IHasEntity> OnEntityAssigned { get; } = new();
-    public event IStateEnable.EnabledChangedEventHandler? OnEnabledChanged = null;
+    public Event<IAssignable>? OnUnassigned { get; } = new();
 
     private bool _enabled = true;
     private IEntity _entity = null!;
@@ -21,7 +21,7 @@ public class StateEnable : IStateEnable
 
             bool previousState = _enabled;
             _enabled = value;
-            OnEnabledChanged?.InvokeSafe(this, previousState);
+            OnEnabledChanged?.Invoke(this, new(previousState));
         }
     }
 
@@ -33,7 +33,7 @@ public class StateEnable : IStateEnable
 
         _entity = entity;
         OnAssign(entity);
-        OnEntityAssigned?.InvokeSafe(this);
+        OnEntityAssigned?.Invoke(this);
         return true;
     }
 
@@ -43,7 +43,7 @@ public class StateEnable : IStateEnable
             return false;
 
         _entity = null!;
-        OnUnassigned?.InvokeSafe(this);
+        OnUnassigned?.Invoke(this);
         return true;
     }
 }

Engine.Core/Systems/Abstract/IDraw.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified when the draw phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IDraw : IBehaviour
+{
+    /// <summary>
+    /// Calls draw logic for the <see cref="IBehaviour"/> to be displayed visually.
+    /// </summary>
+    void Draw();
+}

Engine.Core/Systems/Abstract/IFirstFrameUpdate.cs

@@ -0,0 +1,6 @@
+namespace Syntriax.Engine.Core;
+
+public interface IFirstFrameUpdate : IBehaviour
+{
+    void FirstActiveFrame();
+}

Engine.Core/Systems/Abstract/IPostDraw.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified after the draw phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IPostDraw : IBehaviour
+{
+    /// <summary>
+    /// Updates the state of the <see cref="IBehaviour"/> after the main draw phase happens.
+    /// </summary>
+    void PostDraw();
+}

Engine.Core/Systems/Abstract/IPostUpdate.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified after the update phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IPostUpdate : IBehaviour
+{
+    /// <summary>
+    /// Updates the state of the <see cref="IBehaviour"/> after the main update phase happens.
+    /// </summary>
+    void PostUpdate();
+}

Engine.Core/Systems/Abstract/IPreDraw.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified before the draw phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IPreDraw : IBehaviour
+{
+    /// <summary>
+    /// Updates the state of the <see cref="IBehaviour"/> before the main draw phase happens.
+    /// </summary>
+    void PreDraw();
+}

Engine.Core/Systems/Abstract/IPreUpdate.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified before the update phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IPreUpdate : IBehaviour
+{
+    /// <summary>
+    /// Updates the state of the <see cref="IBehaviour"/> before the main update phase happens.
+    /// </summary>
+    void PreUpdate();
+}

Engine.Core/Systems/Abstract/IUpdate.cs

@@ -0,0 +1,12 @@
+namespace Syntriax.Engine.Core;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> to be notified when the update phase of the <see cref="IUniverse"/> occurs.
+/// </summary>
+public interface IUpdate : IBehaviour
+{
+    /// <summary>
+    /// Updates the state of the <see cref="IBehaviour"/>.
+    /// </summary>
+    void Update();
+}

Engine.Core/Systems/DrawManager.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+
+namespace Syntriax.Engine.Core;
+
+public class DrawManager : Behaviour
+{
+    // We use Descending order because draw calls are running from last to first
+    private static Comparer<IBehaviour> SortByDescendingPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
+
+    private readonly ActiveBehaviourCollectorSorted<IPreDraw> preDrawEntities = new() { SortBy = SortByDescendingPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IDraw> drawEntities = new() { SortBy = SortByDescendingPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPostDraw> postDrawEntities = new() { SortBy = SortByDescendingPriority() };
+
+    private void OnPreDraw(IUniverse sender)
+    {
+        for (int i = preDrawEntities.Count - 1; i >= 0; i--)
+            preDrawEntities[i].PreDraw();
+    }
+
+    private void OnDraw(IUniverse sender)
+    {
+        for (int i = drawEntities.Count - 1; i >= 0; i--)
+            drawEntities[i].Draw();
+    }
+
+    private void OnPostDraw(IUniverse sender)
+    {
+        for (int i = postDrawEntities.Count - 1; i >= 0; i--)
+            postDrawEntities[i].PostDraw();
+    }
+
+    protected override void OnEnteredUniverse(IUniverse universe)
+    {
+        preDrawEntities.Assign(universe);
+        drawEntities.Assign(universe);
+        postDrawEntities.Assign(universe);
+
+        universe.OnPreDraw.AddListener(OnPreDraw);
+        universe.OnDraw.AddListener(OnDraw);
+        universe.OnPostDraw.AddListener(OnPostDraw);
+    }
+
+    protected override void OnExitedUniverse(IUniverse universe)
+    {
+        preDrawEntities.Unassign();
+        drawEntities.Unassign();
+        postDrawEntities.Unassign();
+
+        universe.OnPreDraw.RemoveListener(OnPreDraw);
+        universe.OnDraw.RemoveListener(OnDraw);
+        universe.OnPostDraw.RemoveListener(OnPostDraw);
+    }
+}

Engine.Core/Systems/UpdateManager.cs

@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+
+namespace Syntriax.Engine.Core;
+
+public class UpdateManager : Behaviour
+{
+    // We use Ascending order because draw calls are running from last to first
+    private static Comparer<IBehaviour> SortByAscendingPriority() => Comparer<IBehaviour>.Create((x, y) => x.Priority.CompareTo(y.Priority));
+
+    private readonly ActiveBehaviourCollectorSorted<IFirstFrameUpdate> firstFrameUpdates = new() { SortBy = SortByAscendingPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPreUpdate> preUpdateEntities = new() { SortBy = SortByAscendingPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IUpdate> updateEntities = new() { SortBy = SortByAscendingPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPostUpdate> postUpdateEntities = new() { SortBy = SortByAscendingPriority() };
+
+    private readonly List<IFirstFrameUpdate> toCallFirstFrameUpdates = new(32);
+
+    protected override void OnEnteredUniverse(IUniverse universe)
+    {
+        firstFrameUpdates.Assign(universe);
+        preUpdateEntities.Assign(universe);
+        updateEntities.Assign(universe);
+        postUpdateEntities.Assign(universe);
+
+        universe.OnPreUpdate.AddListener(OnPreUpdate);
+        universe.OnUpdate.AddListener(OnUpdate);
+        universe.OnPostUpdate.AddListener(OnPostUpdate);
+    }
+
+    protected override void OnExitedUniverse(IUniverse universe)
+    {
+        firstFrameUpdates.Unassign();
+        preUpdateEntities.Unassign();
+        updateEntities.Unassign();
+        postUpdateEntities.Unassign();
+
+        universe.OnPreUpdate.RemoveListener(OnPreUpdate);
+        universe.OnUpdate.RemoveListener(OnUpdate);
+        universe.OnPostUpdate.RemoveListener(OnPostUpdate);
+    }
+
+    private void OnPreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    {
+        for (int i = toCallFirstFrameUpdates.Count - 1; i >= 0; i--)
+        {
+            toCallFirstFrameUpdates[i].FirstActiveFrame();
+            toCallFirstFrameUpdates.RemoveAt(i);
+        }
+
+        for (int i = preUpdateEntities.Count - 1; i >= 0; i--)
+            preUpdateEntities[i].PreUpdate();
+    }
+
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    {
+        for (int i = updateEntities.Count - 1; i >= 0; i--)
+            updateEntities[i].Update();
+    }
+
+    private void OnPostUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    {
+        for (int i = postUpdateEntities.Count - 1; i >= 0; i--)
+            postUpdateEntities[i].PostUpdate();
+    }
+
+    private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IBehaviourCollector<IFirstFrameUpdate>.BehaviourCollectedArguments args)
+    {
+        toCallFirstFrameUpdates.Add(args.BehaviourCollected);
+    }
+
+    public UpdateManager()
+    {
+        firstFrameUpdates.OnCollected.AddListener(OnFirstFrameCollected);
+    }
+}

Engine.Core/Transform2D.cs

@@ -5,9 +5,9 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Name: {UniverseObject.Name, nq} Position: {Position.ToString(), nq}, Scale: {Scale.ToString(), nq}, Rotation: {Rotation}")]
 public class Transform2D : Behaviour, ITransform2D
 {
-    public event ITransform2D.PositionChangedEventHandler? OnPositionChanged = null;
+    public Event<ITransform2D, ITransform2D.PositionChangedArguments> OnPositionChanged { get; } = new();
-    public event ITransform2D.ScaleChangedEventHandler? OnScaleChanged = null;
+    public Event<ITransform2D, ITransform2D.ScaleChangedArguments> OnScaleChanged { get; } = new();
-    public event ITransform2D.RotationChangedEventHandler? OnRotationChanged = null;
+    public Event<ITransform2D, ITransform2D.RotationChangedArguments> OnRotationChanged { get; } = new();
 
     private Vector2D _position = Vector2D.Zero;
     private Vector2D _scale = Vector2D.One;
@@ -31,7 +31,7 @@ public class Transform2D : Behaviour, ITransform2D
             _position = value;
 
             UpdateLocalPosition();
-            OnPositionChanged?.InvokeSafe(this, previousPosition);
+            OnPositionChanged?.Invoke(this, new(previousPosition));
         }
     }
 
@@ -47,7 +47,7 @@ public class Transform2D : Behaviour, ITransform2D
             _scale = value;
 
             UpdateLocalScale();
-            OnScaleChanged?.InvokeSafe(this, previousScale);
+            OnScaleChanged?.Invoke(this, new(previousScale));
         }
     }
 
@@ -63,7 +63,7 @@ public class Transform2D : Behaviour, ITransform2D
             _rotation = value;
 
             UpdateLocalRotation();
-            OnRotationChanged?.InvokeSafe(this, previousRotation);
+            OnRotationChanged?.Invoke(this, new(previousRotation));
         }
     }
 
@@ -79,7 +79,7 @@ public class Transform2D : Behaviour, ITransform2D
             _localPosition = value;
 
             UpdatePosition();
-            OnPositionChanged?.InvokeSafe(this, previousPosition);
+            OnPositionChanged?.Invoke(this, new(previousPosition));
         }
     }
 
@@ -97,8 +97,8 @@ public class Transform2D : Behaviour, ITransform2D
 
             UpdateScale();
             UpdatePosition();
-            OnScaleChanged?.InvokeSafe(this, previousScale);
+            OnScaleChanged?.Invoke(this, new(previousScale));
-            OnPositionChanged?.InvokeSafe(this, previousPosition);
+            OnPositionChanged?.Invoke(this, new(previousPosition));
         }
     }
 
@@ -114,21 +114,21 @@ public class Transform2D : Behaviour, ITransform2D
             _localRotation = value;
 
             UpdateRotation();
-            OnRotationChanged?.InvokeSafe(this, previousRotation);
+            OnRotationChanged?.Invoke(this, new(previousRotation));
         }
     }
 
-    private void RecalculatePosition(ITransform2D _, Vector2D previousPosition)
+    private void RecalculatePosition(ITransform2D _, ITransform2D.PositionChangedArguments args)
     {
         if (parentTransform is null)
             return;
 
         UpdatePosition();
 
-        OnPositionChanged?.InvokeSafe(this, previousPosition);
+        OnPositionChanged?.Invoke(this, args);
     }
 
-    private void RecalculateScale(ITransform2D _, Vector2D previousScale)
+    private void RecalculateScale(ITransform2D _, ITransform2D.ScaleChangedArguments args)
     {
         if (parentTransform is null)
             return;
@@ -138,11 +138,11 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateScale();
         UpdatePosition();
 
-        OnScaleChanged?.InvokeSafe(this, previousScale);
+        OnScaleChanged?.Invoke(this, args);
-        OnPositionChanged?.InvokeSafe(this, previousPosition);
+        OnPositionChanged?.Invoke(this, new(previousPosition));
     }
 
-    private void RecalculateRotation(ITransform2D _, float previousRotation)
+    private void RecalculateRotation(ITransform2D _, ITransform2D.RotationChangedArguments args)
     {
         if (parentTransform is null)
             return;
@@ -152,8 +152,8 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateRotation();
         UpdatePosition();
 
-        OnRotationChanged?.InvokeSafe(this, previousRotation);
+        OnRotationChanged?.Invoke(this, args);
-        OnPositionChanged?.InvokeSafe(this, previousPosition);
+        OnPositionChanged?.Invoke(this, new(previousPosition));
     }
 
     private void UpdateLocalPosition()
@@ -207,12 +207,12 @@ public class Transform2D : Behaviour, ITransform2D
     protected override void InitializeInternal()
     {
         UpdateReferences(UniverseObject.Parent);
-        UniverseObject.OnParentChanged += OnParentChanged;
+        UniverseObject.OnParentChanged.AddListener(OnParentChanged);
     }
 
     protected override void FinalizeInternal()
     {
-        UniverseObject.OnParentChanged -= OnParentChanged;
+        UniverseObject.OnParentChanged.RemoveListener(OnParentChanged);
     }
 
     private void UpdateReferences(IUniverseObject? parent)
@@ -220,48 +220,48 @@ public class Transform2D : Behaviour, ITransform2D
         ITransform2D? previousParent = parentTransform;
         if (previousParent is not null)
         {
-            previousParent.OnPositionChanged -= RecalculatePosition;
+            previousParent.OnPositionChanged.RemoveListener(RecalculatePosition);
-            previousParent.OnScaleChanged -= RecalculateScale;
+            previousParent.OnScaleChanged.RemoveListener(RecalculateScale);
-            previousParent.OnRotationChanged -= RecalculateRotation;
+            previousParent.OnRotationChanged.RemoveListener(RecalculateRotation);
-            previousParent.BehaviourController.UniverseObject.OnParentChanged -= OnParentChanged;
+            previousParent.BehaviourController.UniverseObject.OnParentChanged.RemoveListener(OnParentChanged);
-            previousParent.BehaviourController.OnBehaviourAdded -= LookForTransform2D;
+            previousParent.BehaviourController.OnBehaviourAdded.RemoveListener(LookForTransform2D);
         }
 
         parentTransform = parent?.BehaviourController.GetBehaviour<ITransform2D>();
 
         if (parentTransform is not null)
         {
-            parentTransform.OnPositionChanged += RecalculatePosition;
+            parentTransform.OnPositionChanged.AddListener(RecalculatePosition);
-            parentTransform.OnScaleChanged += RecalculateScale;
+            parentTransform.OnScaleChanged.AddListener(RecalculateScale);
-            parentTransform.OnRotationChanged += RecalculateRotation;
+            parentTransform.OnRotationChanged.AddListener(RecalculateRotation);
-            parentTransform.BehaviourController.UniverseObject.OnParentChanged += OnParentChanged;
+            parentTransform.BehaviourController.UniverseObject.OnParentChanged.AddListener(OnParentChanged);
 
             UpdatePosition();
             UpdateScale();
             UpdateRotation();
         }
         else if (UniverseObject.Parent is not null)
-            UniverseObject.Parent.BehaviourController.OnBehaviourAdded += LookForTransform2D;
+            UniverseObject.Parent.BehaviourController.OnBehaviourAdded.AddListener(LookForTransform2D);
 
         UpdateLocalPosition();
         UpdateLocalScale();
         UpdateLocalRotation();
 
-        OnPositionChanged?.InvokeSafe(this, Position);
+        OnPositionChanged?.Invoke(this, new(Position));
-        OnScaleChanged?.InvokeSafe(this, Scale);
+        OnScaleChanged?.Invoke(this, new(Scale));
-        OnRotationChanged?.InvokeSafe(this, Rotation);
+        OnRotationChanged?.Invoke(this, new(Rotation));
     }
 
-    private void LookForTransform2D(IBehaviourController sender, IBehaviour behaviourAdded)
+    private void LookForTransform2D(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
     {
-        if (behaviourAdded is not ITransform2D transform2D)
+        if (args.BehaviourAdded is not ITransform2D)
             return;
 
         UpdateReferences(UniverseObject.Parent);
     }
 
-    private void OnParentChanged(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent)
+    private void OnParentChanged(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
     {
-        UpdateReferences(newParent);
+        UpdateReferences(args.CurrentParent);
     }
 }

Engine.Core/Universe.cs

@@ -7,18 +7,28 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("UniverseObject Count: {_universeObjects.Count}")]
 public class Universe : BaseEntity, IUniverse
 {
-    public event IUniverse.UpdateEventHandler? OnPreUpdate = null;
+    public Event<IUniverse, IUniverse.UpdateArguments> OnPreUpdate { get; } = new();
-    public event IUniverse.UpdateEventHandler? OnUpdate = null;
+    public Event<IUniverse, IUniverse.UpdateArguments> OnUpdate { get; } = new();
-    public event IUniverse.PreDrawEventHandler? OnPreDraw = null;
+    public Event<IUniverse, IUniverse.UpdateArguments> OnPostUpdate { get; } = new();
+    public Event<IUniverse> OnPreDraw { get; } = new();
+    public Event<IUniverse> OnDraw { get; } = new();
+    public Event<IUniverse> OnPostDraw { get; } = new();
+    public Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments> OnUniverseObjectRegistered { get; } = new();
+    public Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments> OnUniverseObjectUnRegistered { get; } = new();
+    public Event<IUniverse, IUniverse.TimeScaleChangedArguments> OnTimeScaleChanged { get; } = new();
 
-    public event IUniverse.UniverseObjectRegisteredEventHandler? OnUniverseObjectRegistered = null;
+    private readonly Event<IInitializable>.EventHandler delegateOnUniverseObjectFinalize = null!;
-    public event IUniverse.UniverseObjectUnRegisteredEventHandler? OnUniverseObjectUnRegistered = null;
+    private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateOnUniverseObjectExitedUniverse = null!;
-
-    public event IUniverse.TimeScaleChangedEventHandler? OnTimeScaleChanged = null;
 
     private readonly List<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL);
     private float _timeScale = 1f;
 
+    public Universe()
+    {
+        delegateOnUniverseObjectFinalize = OnUniverseObjectFinalize;
+        delegateOnUniverseObjectExitedUniverse = OnUniverseObjectExitedUniverse;
+    }
+
     public IReadOnlyList<IUniverseObject> UniverseObjects => _universeObjects;
 
     public UniverseTime Time { get; private set; } = new();
@@ -34,7 +44,7 @@ public class Universe : BaseEntity, IUniverse
 
             float previousTimeScale = _timeScale;
             _timeScale = value;
-            OnTimeScaleChanged?.InvokeSafe(this, previousTimeScale);
+            OnTimeScaleChanged?.Invoke(this, new(previousTimeScale));
         }
     }
 
@@ -43,8 +53,8 @@ public class Universe : BaseEntity, IUniverse
         if (_universeObjects.Contains(universeObject))
             throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is already registered to the {nameof(Universe)}.");
 
-        universeObject.OnFinalized += OnUniverseObjectFinalize;
+        universeObject.OnFinalized.AddListener(delegateOnUniverseObjectFinalize);
-        universeObject.OnExitedUniverse += OnUniverseObjectExitedUniverse;
+        universeObject.OnExitedUniverse.AddListener(delegateOnUniverseObjectExitedUniverse);
 
         if (!universeObject.Initialize())
             throw new Exception($"{universeObject.Name} can't be initialized");
@@ -57,7 +67,7 @@ public class Universe : BaseEntity, IUniverse
         if (!universeObject.EnterUniverse(this))
             throw new Exception($"{universeObject.Name} can't enter the universe");
 
-        OnUniverseObjectRegistered?.InvokeSafe(this, universeObject);
+        OnUniverseObjectRegistered?.Invoke(this, new(universeObject));
     }
 
     public T InstantiateUniverseObject<T>(params object?[]? args) where T : class, IUniverseObject
@@ -78,8 +88,8 @@ public class Universe : BaseEntity, IUniverse
         if (!_universeObjects.Contains(universeObject))
             throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is not registered to the {nameof(Universe)}.");
 
-        universeObject.OnFinalized -= OnUniverseObjectFinalize;
+        universeObject.OnFinalized.RemoveListener(delegateOnUniverseObjectFinalize);
-        universeObject.OnExitedUniverse -= OnUniverseObjectExitedUniverse;
+        universeObject.OnExitedUniverse.RemoveListener(delegateOnUniverseObjectExitedUniverse);
 
         for (int i = universeObject.Children.Count - 1; i >= 0; i--)
             Remove(universeObject.Children[i]);
@@ -92,7 +102,7 @@ public class Universe : BaseEntity, IUniverse
         if (!universeObject.Finalize())
             throw new Exception($"{universeObject.Name} can't be finalized");
 
-        OnUniverseObjectUnRegistered?.InvokeSafe(this, universeObject);
+        OnUniverseObjectUnRegistered?.Invoke(this, new(universeObject));
     }
 
     protected override void InitializeInternal()
@@ -115,22 +125,18 @@ public class Universe : BaseEntity, IUniverse
         UnscaledTime = engineTime;
         Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale)));
 
-        OnPreUpdate?.InvokeSafe(this, Time);
+        OnPreUpdate?.Invoke(this, new(Time));
-
+        OnUpdate?.Invoke(this, new(Time));
-        for (int i = 0; i < UniverseObjects.Count; i++)
+        OnPostUpdate?.Invoke(this, new(Time));
-            UniverseObjects[i].BehaviourController.Update();
-
-        OnUpdate?.InvokeSafe(this, Time);
     }
 
-    public void PreDraw()
+    public void Draw()
     {
         Debug.Assert.AssertInitialized(this);
 
-        for (int i = 0; i < UniverseObjects.Count; i++)
+        OnPreDraw?.Invoke(this);
-            UniverseObjects[i].BehaviourController.UpdatePreDraw();
+        OnDraw?.Invoke(this);
-
+        OnPostDraw?.Invoke(this);
-        OnPreDraw?.InvokeSafe(this);
     }
 
     private void OnUniverseObjectFinalize(IInitializable initializable)
@@ -139,7 +145,7 @@ public class Universe : BaseEntity, IUniverse
             Remove(universeObject);
     }
 
-    private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverse universe)
+    private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args)
     {
         if (sender is IUniverseObject universeObject)
             Remove(universeObject);

Engine.Core/UniverseObject.cs

@@ -6,14 +6,15 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Name: {Name}, Initialized: {Initialized}")]
 public class UniverseObject : BaseEntity, IUniverseObject
 {
-    public event IUniverseObject.EnteredUniverseEventHandler? OnEnteredUniverse = null;
+    public Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments> OnEnteredUniverse { get; } = new();
-    public event IUniverseObject.ExitedUniverseEventHandler? OnExitedUniverse = null;
+    public Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments> OnExitedUniverse { get; } = new();
-    public event IUniverseObject.ParentChangedEventHandler? OnParentChanged = null;
+    public Event<IUniverseObject, IUniverseObject.ParentChangedArguments> OnParentChanged { get; } = new();
-    public event IUniverseObject.ChildrenAddedEventHandler? OnChildrenAdded = null;
+    public Event<IUniverseObject, IUniverseObject.ChildrenAddedArguments> OnChildrenAdded { get; } = new();
-    public event IUniverseObject.ChildrenRemovedEventHandler? OnChildrenRemoved = null;
+    public Event<IUniverseObject, IUniverseObject.ChildrenRemovedArguments> OnChildrenRemoved { get; } = new();
-    public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
+
-    public event INameable.NameChangedEventHandler? OnNameChanged = null;
+    public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; } = new();
-    public event IActive.ActiveChangedEventHandler? OnActiveChanged = null;
+    public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
+    public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
 
     private string _name = nameof(UniverseObject);
     private IUniverse _universe = null!;
@@ -37,7 +38,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
             string previousName = _name;
             _name = value;
-            OnNameChanged?.InvokeSafe(this, previousName);
+            OnNameChanged?.Invoke(this, new(previousName));
         }
     }
 
@@ -50,7 +51,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _universe = universe;
         UpdateActive();
         OnEnteringUniverse(universe);
-        OnEnteredUniverse?.InvokeSafe(this, universe);
+        OnEnteredUniverse?.Invoke(this, new(universe));
         return true;
     }
 
@@ -62,7 +63,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         OnExitingUniverse(universe);
         _universe = null!;
-        OnExitedUniverse?.InvokeSafe(this, universe);
+        OnExitedUniverse?.Invoke(this, new(universe));
         return true;
     }
 
@@ -78,7 +79,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
         if (previousParent is not null)
         {
             previousParent.RemoveChild(this);
-            previousParent.OnActiveChanged -= OnParentActiveChanged;
+            previousParent.OnActiveChanged.RemoveListener(OnParentActiveChanged);
         }
 
         Parent = parent;
@@ -89,11 +90,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
                 parent.Universe.Register(this);
 
             parent.AddChild(this);
-            parent.OnActiveChanged += OnParentActiveChanged;
+            parent.OnActiveChanged.AddListener(OnParentActiveChanged);
         }
 
         UpdateActive();
-        OnParentChanged?.InvokeSafe(this, previousParent, parent);
+        OnParentChanged?.Invoke(this, new(previousParent, parent));
     }
 
     public void AddChild(IUniverseObject parent)
@@ -103,7 +104,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         _children.Add(parent);
         parent.SetParent(this);
-        OnChildrenAdded?.InvokeSafe(this, parent);
+        OnChildrenAdded?.Invoke(this, new(parent));
     }
 
     public void RemoveChild(IUniverseObject child)
@@ -112,7 +113,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
             return;
 
         child.SetParent(null);
-        OnChildrenRemoved?.InvokeSafe(this, child);
+        OnChildrenRemoved?.Invoke(this, new(child));
     }
 
     protected virtual void OnAssign(IBehaviourController behaviourController) { }
@@ -123,7 +124,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
 
         _behaviourController = behaviourController;
         OnAssign(behaviourController);
-        OnBehaviourControllerAssigned?.InvokeSafe(this);
+        OnBehaviourControllerAssigned?.Invoke(this);
         return true;
     }
 
@@ -131,11 +132,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
     {
         base.OnAssign(stateEnable);
 
-        stateEnable.OnEnabledChanged += OnStateEnabledChanged;
+        stateEnable.OnEnabledChanged.AddListener(OnStateEnabledChanged);
     }
 
-    private void OnParentActiveChanged(IActive sender, bool previousState) => UpdateActive();
+    private void OnParentActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
-    private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive();
+    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
 
     private void UpdateActive()
     {
@@ -143,13 +144,13 @@ public class UniverseObject : BaseEntity, IUniverseObject
         _isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
 
         if (previousActive != IsActive)
-            OnActiveChanged?.InvokeSafe(this, previousActive);
+            OnActiveChanged?.Invoke(this, new(previousActive));
     }
 
     protected override void UnassignInternal()
     {
         base.UnassignInternal();
-        StateEnable.OnEnabledChanged -= OnStateEnabledChanged;
+        StateEnable.OnEnabledChanged.RemoveListener(OnStateEnabledChanged);
     }
 
     protected override void InitializeInternal()

Engine.Integration/Engine.Integration.MonoGame/Abstract/IDrawableSprite.cs

@@ -0,0 +1,8 @@
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public interface IDrawableSprite : IBehaviour
+{
+    void Draw(ISpriteBatch spriteBatch);
+}

Engine.Integration/Engine.Integration.MonoGame/Abstract/IDrawableTriangle.cs

@@ -0,0 +1,8 @@
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public interface IDrawableTriangle : IBehaviour
+{
+    void Draw(ITriangleBatch triangleBatch);
+}

Engine.Integration/Engine.Integration.MonoGame/Abstract/ISpriteBatch.cs

@@ -0,0 +1,29 @@
+using System.Text;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public interface ISpriteBatch
+{
+    void Begin(SpriteSortMode sortMode = SpriteSortMode.Deferred, BlendState? blendState = null, SamplerState? samplerState = null, DepthStencilState? depthStencilState = null, RasterizerState? rasterizerState = null, Effect? effect = null, Matrix? transformMatrix = null);
+    void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
+    void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
+    void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth);
+    void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color);
+    void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color);
+    void Draw(Texture2D texture, Vector2D position, Color color);
+    void Draw(Texture2D texture, AABB destinationAABB, Color color);
+    void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color);
+    void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
+    void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
+    void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl);
+    void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color);
+    void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
+    void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
+    void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl);
+    void End();
+}

Engine.Integration/Engine.Integration.MonoGame/Abstract/ITriangleBatch.cs

@@ -0,0 +1,12 @@
+using Microsoft.Xna.Framework;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public interface ITriangleBatch
+{
+    void Begin(Matrix? view = null, Matrix? projection = null);
+    void Draw(Triangle triangle, ColorRGBA colorRGBA);
+    void End();
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/DrawableShapeBehaviour.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class DrawableShapeBehaviour : Behaviour2D, IDrawableTriangle, IPreDraw
+{
+    private readonly Shape2D shape = new([]);
+    private readonly List<Triangle> worldTriangles = [];
+    private readonly Shape2D worldShape = new([]);
+    protected ColorRGB color = new(255, 255, 255);
+
+    public void PreDraw() => UpdateWorldShape();
+
+    public void Draw(ITriangleBatch triangleBatch)
+    {
+        worldShape.ToTrianglesConvex(worldTriangles);
+
+        foreach (Triangle triangle in worldTriangles)
+            triangleBatch.Draw(new(triangle.C, triangle.B, triangle.A), color);
+    }
+
+    protected void UpdateWorldShape() => shape.Transform(Transform, worldShape);
+
+    public DrawableShapeBehaviour() => shape = Shape2D.Triangle;
+    public DrawableShapeBehaviour(Shape2D shape) => this.shape = shape;
+    public DrawableShapeBehaviour(Shape2D shape, ColorRGB color) { this.shape = shape; this.color = color; }
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/KeyboardInputsBehaviour.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Xna.Framework.Input;
+
+using Syntriax.Engine.Core;
+using Syntriax.Engine.Systems.Input;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class KeyboardInputsBehaviour : Behaviour, IButtonInputs<Keys>, IUpdate
+{
+    public Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments> OnAnyButtonPressed { get; } = new();
+    public Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments> OnAnyButtonReleased { get; } = new();
+
+    private readonly Dictionary<Keys, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>> OnPressed = new(256);
+    private readonly Dictionary<Keys, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>> OnReleased = new(256);
+
+    private int cachePressedCurrentlyCount = 0;
+    private readonly Keys[] cachePressedCurrently = new Keys[256];
+
+    private int cachePressedPreviouslyCount = 0;
+    private readonly Keys[] cachePressedPreviously = new Keys[256];
+
+    public void RegisterOnPress(Keys key, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>.EventHandler callback)
+    {
+        if (!OnPressed.TryGetValue(key, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? delegateCallback))
+        {
+            delegateCallback = new();
+            OnPressed.Add(key, delegateCallback);
+        }
+
+        delegateCallback.AddListener(callback);
+    }
+
+    public void UnregisterOnPress(Keys key, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>.EventHandler callback)
+    {
+        if (OnPressed.TryGetValue(key, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? delegateCallback))
+            delegateCallback.RemoveListener(callback);
+    }
+
+    public void RegisterOnRelease(Keys key, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>.EventHandler callback)
+    {
+        if (!OnReleased.TryGetValue(key, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? delegateCallback))
+        {
+            delegateCallback = new();
+            OnReleased.Add(key, delegateCallback);
+        }
+
+        delegateCallback.AddListener(callback);
+    }
+
+    public void UnregisterOnRelease(Keys key, Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>.EventHandler callback)
+    {
+        if (OnReleased.TryGetValue(key, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? delegateCallback))
+            delegateCallback.RemoveListener(callback);
+    }
+
+    public void Update()
+    {
+        KeyboardState keyboardState = Keyboard.GetState();
+        keyboardState.GetPressedKeys(cachePressedCurrently);
+        cachePressedCurrentlyCount = keyboardState.GetPressedKeyCount();
+
+        for (int i = 0; i < cachePressedCurrentlyCount; i++)
+        {
+            Keys currentlyPressedKey = cachePressedCurrently[i];
+
+            if (WasPressed(currentlyPressedKey))
+                continue;
+
+            if (OnPressed.TryGetValue(currentlyPressedKey, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? callback))
+                callback?.Invoke(this, new(currentlyPressedKey));
+
+            OnAnyButtonPressed?.Invoke(this, new(currentlyPressedKey));
+        }
+
+        for (int i = 0; i < cachePressedPreviouslyCount; i++)
+        {
+            Keys previouslyPressedKey = cachePressedPreviously[i];
+
+            if (IsPressed(previouslyPressedKey))
+                continue;
+
+            if (OnReleased.TryGetValue(previouslyPressedKey, out Event<IButtonInputs<Keys>, IButtonInputs<Keys>.ButtonCallbackArguments>? callback))
+                callback?.Invoke(this, new(previouslyPressedKey));
+
+            OnAnyButtonReleased?.Invoke(this, new(previouslyPressedKey));
+        }
+
+        Array.Copy(cachePressedCurrently, cachePressedPreviously, cachePressedCurrentlyCount);
+        cachePressedPreviouslyCount = cachePressedCurrentlyCount;
+    }
+
+    public bool IsPressed(Keys key)
+    {
+        for (int i = 0; i < cachePressedCurrentlyCount; i++)
+            if (cachePressedCurrently[i] == key)
+                return true;
+        return false;
+    }
+
+    private bool WasPressed(Keys key)
+    {
+        for (int i = 0; i < cachePressedPreviouslyCount; i++)
+            if (cachePressedPreviously[i] == key)
+                return true;
+        return false;
+    }
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/MonoGameCamera2DBehaviour.cs

@@ -0,0 +1,109 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class MonoGameCamera2DBehaviour : BehaviourBase, ICamera2D, IFirstFrameUpdate, IPreDraw
+{
+    public event MatrixTransformChangedArguments? OnMatrixTransformChanged = null;
+    public event ViewportChangedArguments? OnViewportChanged = null;
+    public event ZoomChangedArguments? OnZoomChanged = null;
+
+    private Matrix _matrixTransform = Matrix.Identity;
+
+    private Viewport _viewport = default;
+    private float _zoom = 1f;
+
+    public GraphicsDeviceManager Graphics { get; private set; } = null!;
+    public ITransform2D Transform { get; private set; } = null!;
+
+    public Matrix MatrixTransform
+    {
+        get => _matrixTransform;
+        set
+        {
+            if (_matrixTransform == value)
+                return;
+
+            _matrixTransform = value;
+            OnMatrixTransformChanged?.Invoke(this);
+        }
+    }
+
+    public Vector2D Position
+    {
+        get => Transform.Position;
+        set => Transform.Position = value;
+    }
+
+    public Viewport Viewport
+    {
+        get => _viewport;
+        set
+        {
+            if (_viewport.Equals(value))
+                return;
+
+            _viewport = value;
+            OnViewportChanged?.Invoke(this);
+        }
+    }
+
+    public float Zoom
+    {
+        get => _zoom;
+        set
+        {
+            float newValue = Syntriax.Engine.Core.Math.Max(0.1f, value);
+
+            if (_zoom == newValue)
+                return;
+
+            _zoom = newValue;
+            OnZoomChanged?.Invoke(this);
+        }
+    }
+
+    public float Rotation
+    {
+        get => Transform.Rotation;
+        set => Transform.Rotation = value;
+    }
+
+    // TODO This causes delay since OnPreDraw calls assuming this is called in in Update 
+    public Vector2D ScreenToWorldPosition(Vector2D screenPosition)
+    {
+        Vector2D worldPosition = Vector2.Transform(screenPosition.ToVector2(), Matrix.Invert(MatrixTransform)).ToVector2D();
+        return worldPosition.Scale(EngineConverterExtensions.screenScale);
+    }
+    public Vector2D WorldToScreenPosition(Vector2D worldPosition)
+    {
+        Vector2D screenPosition = Vector2.Transform(worldPosition.ToVector2(), MatrixTransform).ToVector2D();
+        return screenPosition.Scale(EngineConverterExtensions.screenScale);
+    }
+
+    public void FirstActiveFrame()
+    {
+        Graphics = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.Graphics;
+        Viewport = Graphics.GraphicsDevice.Viewport;
+    }
+
+    public void PreDraw()
+    {
+        MatrixTransform =
+            Matrix.CreateTranslation(new Vector3(-Position.X, Position.Y, 0f)) *
+            Matrix.CreateRotationZ(Rotation * Syntriax.Engine.Core.Math.DegreeToRadian) *
+            Matrix.CreateScale(Transform.Scale.X.Max(Transform.Scale.Y)) *
+            Matrix.CreateScale(Zoom) *
+            Matrix.CreateTranslation(new Vector3(_viewport.Width * .5f, _viewport.Height * .5f, 0f));
+    }
+
+    protected sealed override void InitializeInternal() => Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
+    protected sealed override void FinalizeInternal() => Transform = null!;
+
+    public delegate void MatrixTransformChangedArguments(MonoGameCamera2DBehaviour sender);
+    public delegate void ViewportChangedArguments(MonoGameCamera2DBehaviour sender);
+    public delegate void ZoomChangedArguments(MonoGameCamera2DBehaviour sender);
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/SpriteBatchWrapper.cs

@@ -0,0 +1,64 @@
+using System.Text;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class SpriteBatchWrapper(GraphicsDevice graphicsDevice) : ISpriteBatch
+{
+    private readonly SpriteBatch spriteBatch = new(graphicsDevice);
+
+    public void Begin(SpriteSortMode sortMode = SpriteSortMode.Deferred, BlendState? blendState = null, SamplerState? samplerState = null, DepthStencilState? depthStencilState = null, RasterizerState? rasterizerState = null, Effect? effect = null, Matrix? transformMatrix = null)
+        => spriteBatch.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, transformMatrix);
+
+    public void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
+
+    public void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
+
+    public void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth)
+        => spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), effects, layerDepth);
+
+    public void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color)
+        => spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color);
+
+    public void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color)
+        => spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color);
+
+    public void Draw(Texture2D texture, Vector2D position, Color color)
+        => spriteBatch.Draw(texture, position.ToDisplayVector2(), color);
+
+    public void Draw(Texture2D texture, AABB destinationAABB, Color color)
+        => spriteBatch.Draw(texture, destinationAABB.ToRectangle(), color);
+
+    public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color);
+
+    public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
+
+    public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
+
+    public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth, rtl);
+
+    public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color);
+
+    public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
+
+    public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
+
+    public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl)
+        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth, rtl);
+
+    public void End()
+        => spriteBatch.End();
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/SpriteBatcher.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class SpriteBatcher : BehaviourBase, IFirstFrameUpdate, IDraw
+{
+    private static Comparer<IBehaviour> SortByPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
+
+    private ISpriteBatch spriteBatch = null!;
+    private MonoGameCamera2DBehaviour camera2D = null!;
+
+    private readonly ActiveBehaviourCollectorSorted<IDrawableSprite> drawableSprites = new() { SortBy = SortByPriority() };
+
+    public void FirstActiveFrame()
+    {
+        MonoGameWindowContainer windowContainer = Universe.FindRequiredBehaviour<MonoGameWindowContainer>();
+        camera2D = Universe.FindRequiredBehaviour<MonoGameCamera2DBehaviour>();
+
+        spriteBatch = new SpriteBatchWrapper(windowContainer.Window.GraphicsDevice);
+        drawableSprites.Unassign();
+        drawableSprites.Assign(Universe);
+    }
+
+    public void Draw()
+    {
+        spriteBatch.Begin(transformMatrix: camera2D.MatrixTransform);
+        for (int i = 0; i < drawableSprites.Count; i++)
+            drawableSprites[i].Draw(spriteBatch);
+        spriteBatch.End();
+    }
+}

Engine.Integration/Engine.Integration.MonoGame/Behaviours/TriangleBatcher.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+
+using Microsoft.Xna.Framework;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class TriangleBatcher : BehaviourBase, ITriangleBatch, IFirstFrameUpdate, IDraw
+{
+    private static Comparer<IBehaviour> SortByAscendingPriority() => Comparer<IBehaviour>.Create((x, y) => x.Priority.CompareTo(y.Priority));
+
+    private TriangleBatch triangleBatch = null!;
+    private MonoGameCamera2DBehaviour camera2D = null!;
+    private readonly ActiveBehaviourCollectorSorted<IDrawableTriangle> drawableShapes = new() { SortBy = SortByAscendingPriority() };
+
+    public void FirstActiveFrame()
+    {
+        MonoGameWindowContainer windowContainer = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>();
+        camera2D = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameCamera2DBehaviour>();
+
+        triangleBatch = new(windowContainer.Window.GraphicsDevice);
+        drawableShapes.Unassign();
+        drawableShapes.Assign(BehaviourController.UniverseObject.Universe);
+    }
+
+    public void Draw()
+    {
+        triangleBatch.Begin(camera2D.MatrixTransform);
+        for (int i = 0; i < drawableShapes.Count; i++)
+            drawableShapes[i].Draw(triangleBatch);
+        triangleBatch.End();
+    }
+
+    public void Begin(Matrix? view = null, Matrix? projection = null) => triangleBatch.Begin(view, projection);
+    public void Draw(Triangle triangle, ColorRGBA colorRGBA) => triangleBatch.Draw(triangle, colorRGBA);
+    public void End() => triangleBatch.End();
+}

Engine.Integration/Engine.Integration.MonoGame/Engine.Integration.MonoGame.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <RootNamespace>Syntriax.Engine.Integration.MonoGame</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Engine\Engine.csproj" />
+  </ItemGroup>
+</Project>

Engine.Integration/Engine.Integration.MonoGame/EngineConverter.cs

@@ -0,0 +1,52 @@
+using System.Runtime.CompilerServices;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public static class EngineConverterExtensions
+{
+    public readonly static Vector2D screenScale = Vector2D.Down + Vector2D.Right;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static UniverseTime ToEngineTime(this GameTime gameTime) => new(gameTime.TotalGameTime, gameTime.ElapsedGameTime);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector2D ToVector2D(this Vector2 vector) => new(vector.X, vector.Y);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Color ToColor(this ColorRGBA rgba) => new(rgba.R, rgba.G, rgba.B, rgba.A);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector2D ToVector2D(this Point point) => new(point.X, point.Y);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector2 ToVector2(this Vector2D vector) => new(vector.X, vector.Y);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector2 ToDisplayVector2(this Vector2D vector) => vector.Scale(screenScale).ToVector2();
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector2D ApplyDisplayScale(this Vector2D vector) => vector.Scale(screenScale);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Rectangle ToDisplayRectangle(this Rectangle rectangle, DisplayMode displayMode) => new()
+    {
+        X = rectangle.X,
+        Y = displayMode.Height - rectangle.Y - rectangle.Height,
+        Width = rectangle.Width,
+        Height = rectangle.Height
+    };
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Rectangle ToRectangle(this AABB aabb) => new()
+    {
+        X = (int)(aabb.LowerBoundary.X * screenScale.X),
+        Y = (int)(aabb.LowerBoundary.Y * screenScale.Y),
+        Width = (int)(aabb.UpperBoundary.X - aabb.LowerBoundary.X),
+        Height = (int)(aabb.UpperBoundary.Y - aabb.LowerBoundary.Y)
+    };
+}

Engine.Integration/Engine.Integration.MonoGame/MonoGameWindow.cs

@@ -0,0 +1,48 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class MonoGameWindow : Game
+{
+    public GraphicsDeviceManager Graphics { get; protected set; } = null!;
+    public IUniverse Universe { get; protected set; } = null!;
+    public ColorRGB BackgroundColor { get; set; } = new ColorRGB(35, 20, 35);
+
+    public MonoGameWindow(IUniverse? universe = null)
+    {
+        Preserver.Preserve();
+        Graphics = new GraphicsDeviceManager(this);
+        Content.RootDirectory = "Content";
+        IsMouseVisible = true;
+        Universe = universe ?? new Universe();
+
+        Universe.InstantiateUniverseObject().SetUniverseObject("Window Container")
+            .BehaviourController.AddBehaviour<MonoGameWindowContainer>(this);
+    }
+
+    protected override void Initialize()
+    {
+        Universe.Initialize();
+
+        base.Initialize();
+    }
+
+    protected override void Update(GameTime gameTime)
+    {
+        Universe.Update(gameTime.ToEngineTime());
+
+        base.Update(gameTime);
+    }
+
+    protected override void Draw(GameTime gameTime)
+    {
+        GraphicsDevice.Clear(((ColorRGBA)BackgroundColor).ToColor());
+
+        Universe.Draw();
+
+        base.Draw(gameTime);
+    }
+}

Engine.Integration/Engine.Integration.MonoGame/TriangleBatch.cs

@@ -0,0 +1,74 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+public class TriangleBatch : ITriangleBatch
+{
+    private readonly GraphicsDevice graphicsDevice;
+    private VertexBuffer vertexBuffer = default!;
+    private readonly VertexPositionColor[] vertices = new VertexPositionColor[1024];
+    private int verticesIndex = 0;
+    private Matrix _view;
+    private Matrix _projection;
+    private readonly BasicEffect basicEffect;
+
+    public TriangleBatch(GraphicsDevice graphicsDevice)
+    {
+        this.graphicsDevice = graphicsDevice;
+        this.graphicsDevice.RasterizerState = new RasterizerState() { CullMode = CullMode.None };
+        basicEffect = new(graphicsDevice);
+        basicEffect.VertexColorEnabled = true;
+    }
+
+    public void Draw(Triangle triangle, ColorRGBA colorRGBA)
+    {
+        if (verticesIndex + 3 >= vertices.Length)
+            Flush();
+
+        Vector2 A = triangle.A.ToDisplayVector2();
+        Vector2 B = triangle.B.ToDisplayVector2();
+        Vector2 C = triangle.C.ToDisplayVector2();
+        Color color = colorRGBA.ToColor();
+
+        vertices[verticesIndex++] = new(new(A.X, A.Y, 0f), color);
+        vertices[verticesIndex++] = new(new(B.X, B.Y, 0f), color);
+        vertices[verticesIndex++] = new(new(C.X, C.Y, 0f), color);
+    }
+
+    public void Begin(Matrix? view = null, Matrix? projection = null)
+    {
+        if (view != null)
+            _view = view.Value;
+        else
+            _view = Matrix.Identity;
+
+        if (projection != null)
+            _projection = projection.Value;
+        else
+        {
+            Viewport viewport = graphicsDevice.Viewport;
+            _projection = Matrix.CreateOrthographicOffCenter(viewport.X, viewport.Width, viewport.Height, viewport.Y, 0, 1);
+        }
+    }
+
+    public void End() => Flush();
+
+    private void Flush()
+    {
+        basicEffect.Projection = _projection;
+        basicEffect.View = _view;
+        vertexBuffer = new VertexBuffer(graphicsDevice, typeof(VertexPositionColor), 1024, BufferUsage.WriteOnly);
+        vertexBuffer.SetData(vertices);
+
+        graphicsDevice.SetVertexBuffer(vertexBuffer);
+
+        foreach (EffectPass pass in basicEffect.CurrentTechnique.Passes)
+            pass.Apply();
+        graphicsDevice.DrawPrimitives(PrimitiveType.TriangleList, 0, verticesIndex / 3);
+
+        verticesIndex = 0;
+    }
+}

Engine.Integration/Engine.Integration.MonoGame/UniverseObjects/MonoGameWindowContainer.cs

@@ -0,0 +1,10 @@
+using Syntriax.Engine.Core;
+using Syntriax.Engine.Core.Serialization;
+
+namespace Syntriax.Engine.Integration.MonoGame;
+
+[IgnoreSerialization]
+public class MonoGameWindowContainer(MonoGameWindow GameWindow) : BehaviourBase
+{
+    public MonoGameWindow Window { get; } = GameWindow;
+}

Engine.Physics2D/Abstract/ICollider2D.cs

@@ -10,17 +10,17 @@ public interface ICollider2D : IBehaviour
     /// <summary>
     /// Event triggered when a collision is detected.
     /// </summary>
-    event CollisionDetectedEventHandler? OnCollisionDetected;
+    Event<ICollider2D, CollisionDetectionInformation> OnCollisionDetected { get; }
 
     /// <summary>
     /// Event triggered when a collision is resolved.
     /// </summary>
-    event CollisionResolvedEventHandler? OnCollisionResolved;
+    Event<ICollider2D, CollisionDetectionInformation> OnCollisionResolved { get; }
 
     /// <summary>
     /// Event triggered when another <see cref="ICollider2D"/> triggers this <see cref="ICollider2D"/>.
     /// </summary>
-    event TriggeredEventHandler? OnTriggered;
+    Event<ICollider2D, ICollider2D> OnTriggered { get; }
 
     /// <inheritdoc cref="ITransform2D" />
     ITransform2D Transform { get; }
@@ -44,7 +44,7 @@ public interface ICollider2D : IBehaviour
     void Resolve(CollisionDetectionInformation collisionDetectionInformation);
     void Trigger(ICollider2D initiator);
 
-    delegate void CollisionDetectedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    readonly record struct CollisionDetectedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
-    delegate void CollisionResolvedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    readonly record struct CollisionResolvedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
-    delegate void TriggeredEventHandler(ICollider2D sender, ICollider2D initiatorCollider);
+    readonly record struct TriggeredArguments(ICollider2D sender, ICollider2D initiatorCollider);
 }

Engine.Physics2D/Abstract/IPhysicsEngine2D.cs

@@ -1,3 +1,5 @@
+using Syntriax.Engine.Core;
+
 namespace Syntriax.Engine.Physics2D;
 
 /// <summary>
@@ -8,12 +10,12 @@ public interface IPhysicsEngine2D
     /// <summary>
     /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a single physics iteration.
     /// </summary>
-    event PhysicsIterationEventHandler? OnPhysicsIteration;
+    Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; }
 
     /// <summary>
     /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a full physics step/>.
     /// </summary>
-    event PhysicsStepEventHandler? OnPhysicsStep;
+    Event<IPhysicsEngine2D, float> OnPhysicsStep { get; }
 
     /// <summary>
     /// The number of iterations the <see cref="IPhysicsEngine2D"/> performs per step.
@@ -26,6 +28,13 @@ public interface IPhysicsEngine2D
     /// <param name="deltaTime">The time step.</param>
     void Step(float deltaTime);
 
-    delegate void PhysicsIterationEventHandler(IPhysicsEngine2D sender, float iterationDeltaTime);
+    /// <summary>
-    delegate void PhysicsStepEventHandler(IPhysicsEngine2D sender, float stepDeltaTime);
+    /// Advances the physics simulation by the specified time on a single <see cref="IRigidBody2D"/>.
+    /// </summary>
+    /// <param name="rigidBody">The <see cref="IRigidBody2D"/> to be progressed individually.</param>
+    /// <param name="deltaTime">The time step.</param>
+    void StepIndividual(IRigidBody2D rigidBody, float deltaTime);
+
+    readonly record struct PhysicsIterationArguments(IPhysicsEngine2D sender, float iterationDeltaTime);
+    readonly record struct PhysicsStepArguments(IPhysicsEngine2D sender, float stepDeltaTime);
 }

Engine.Physics2D/Abstract/Updates/IPostPhysicsUpdate.cs

@@ -0,0 +1,15 @@
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Physics2D;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> that listens to the phase after the physics simulation phase.
+/// </summary>
+public interface IPostPhysicsUpdate : IBehaviour
+{
+    /// <summary>
+    /// Execute logic that should occur after the physics simulation has been updated.
+    /// </summary>
+    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
+    void PostPhysicsUpdate(float delta);
+}

Engine.Physics2D/Abstract/Updates/IPrePhysicsUpdate.cs

@@ -0,0 +1,15 @@
+using Syntriax.Engine.Core;
+
+namespace Syntriax.Engine.Physics2D;
+
+/// <summary>
+/// Represents a <see cref="IBehaviour"/> that listens to the phase before the physics simulation phase.
+/// </summary>
+public interface IPrePhysicsUpdate : IBehaviour
+{
+    /// <summary>
+    /// Execute logic that should occur before the physics simulation is updated.
+    /// </summary>
+    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
+    void PrePhysicsUpdate(float delta);
+}

Engine.Physics2D/Collider2DBehaviourBase.cs

@@ -4,13 +4,30 @@ namespace Syntriax.Engine.Physics2D;
 
 public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
 {
-    public event ICollider2D.CollisionDetectedEventHandler? OnCollisionDetected = null;
+    public Event<ICollider2D, CollisionDetectionInformation> OnCollisionDetected { get; } = new();
-    public event ICollider2D.CollisionResolvedEventHandler? OnCollisionResolved = null;
+    public Event<ICollider2D, CollisionDetectionInformation> OnCollisionResolved { get; } = new();
-    public event ICollider2D.TriggeredEventHandler? OnTriggered = null;
+    public Event<ICollider2D, ICollider2D> OnTriggered { get; } = new();
+
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAddedToController = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemovedFromController = null!;
+    private readonly Event<ITransform2D, ITransform2D.PositionChangedArguments>.EventHandler delegateSetNeedsRecalculationFromPosition = null!;
+    private readonly Event<ITransform2D, ITransform2D.RotationChangedArguments>.EventHandler delegateSetNeedsRecalculationFromRotation = null!;
+    private readonly Event<ITransform2D, ITransform2D.ScaleChangedArguments>.EventHandler delegateSetNeedsRecalculationFromScale = null!;
+    private readonly Event<IUniverseObject, IUniverseObject.ParentChangedArguments>.EventHandler delegateUpdateRigidBody2D = null!;
 
     protected bool NeedsRecalculation { get; set; } = true;
     protected IRigidBody2D? _rigidBody2D = null;
 
+    protected Collider2DBehaviourBase()
+    {
+        delegateOnBehaviourAddedToController = OnBehaviourAddedToController;
+        delegateOnBehaviourRemovedFromController = OnBehaviourRemovedFromController;
+        delegateSetNeedsRecalculationFromPosition = SetNeedsRecalculationFromPosition;
+        delegateSetNeedsRecalculationFromRotation = SetNeedsRecalculationFromRotation;
+        delegateSetNeedsRecalculationFromScale = SetNeedsRecalculationFromScale;
+        delegateUpdateRigidBody2D = UpdateRigidBody2D;
+    }
+
     public IRigidBody2D? RigidBody2D => _rigidBody2D;
     public bool IsTrigger { get; set; } = false;
 
@@ -27,49 +44,53 @@ public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
 
     protected override void OnInitialize()
     {
+        base.OnInitialize();
+
         BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
 
-        BehaviourController.OnBehaviourAdded += OnBehaviourAddedToController;
+        BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAddedToController);
-        BehaviourController.OnBehaviourRemoved += OnBehaviourRemovedFromController;
+        BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemovedFromController);
 
-        Transform.OnPositionChanged += SetNeedsRecalculationFromPosition;
+        Transform.OnPositionChanged.AddListener(delegateSetNeedsRecalculationFromPosition);
-        Transform.OnRotationChanged += SetNeedsRecalculationFromRotation;
+        Transform.OnRotationChanged.AddListener(delegateSetNeedsRecalculationFromRotation);
-        Transform.OnScaleChanged += SetNeedsRecalculationFromScale;
+        Transform.OnScaleChanged.AddListener(delegateSetNeedsRecalculationFromScale);
-        UniverseObject.OnParentChanged += UpdateRigidBody2D;
+        UniverseObject.OnParentChanged.AddListener(delegateUpdateRigidBody2D);
     }
 
-    private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent)
+    private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
     {
         BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
     }
 
-    private void OnBehaviourAddedToController(IBehaviourController _, IBehaviour behaviour)
+    private void OnBehaviourAddedToController(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
     {
-        if (behaviour is IRigidBody2D rigidBody)
+        if (args.BehaviourAdded is IRigidBody2D rigidBody)
             _rigidBody2D = rigidBody;
     }
 
-    private void OnBehaviourRemovedFromController(IBehaviourController _, IBehaviour behaviour)
+    private void OnBehaviourRemovedFromController(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
     {
-        if (behaviour is IRigidBody2D _)
+        if (args.BehaviourRemoved is IRigidBody2D)
             _rigidBody2D = null;
     }
 
-    private void SetNeedsRecalculationFromScale(ITransform2D sender, Vector2D previousScale) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromPosition(ITransform2D sender, ITransform2D.PositionChangedArguments args) => NeedsRecalculation = true;
-    private void SetNeedsRecalculationFromPosition(ITransform2D sender, Vector2D previousPosition) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromScale(ITransform2D sender, ITransform2D.ScaleChangedArguments args) => NeedsRecalculation = true;
-    private void SetNeedsRecalculationFromRotation(ITransform2D sender, float previousRotation) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromRotation(ITransform2D sender, ITransform2D.RotationChangedArguments args) => NeedsRecalculation = true;
 
     protected override void OnFinalize()
     {
-        BehaviourController.OnBehaviourAdded -= OnBehaviourAddedToController;
+        base.OnFinalize();
-        BehaviourController.OnBehaviourRemoved -= OnBehaviourRemovedFromController;
-        Transform.OnScaleChanged -= SetNeedsRecalculationFromScale;
 
-        Transform.OnPositionChanged -= SetNeedsRecalculationFromPosition;
+        BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAddedToController);
-        Transform.OnRotationChanged -= SetNeedsRecalculationFromRotation;
+        BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemovedFromController);
+        Transform.OnScaleChanged.RemoveListener(delegateSetNeedsRecalculationFromScale);
+
+        Transform.OnPositionChanged.RemoveListener(delegateSetNeedsRecalculationFromPosition);
+        Transform.OnRotationChanged.RemoveListener(delegateSetNeedsRecalculationFromRotation);
     }
 
-    public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.InvokeSafe(this, collisionDetectionInformation);
+    public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation);
-    public void Resolve(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionResolved?.InvokeSafe(this, collisionDetectionInformation);
+    public void Resolve(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionResolved?.Invoke(this, collisionDetectionInformation);
-    public void Trigger(ICollider2D initiator) => OnTriggered?.InvokeSafe(this, initiator);
+    public void Trigger(ICollider2D initiator) => OnTriggered?.Invoke(this, initiator);
 }

Engine.Physics2D/PhysicsCoroutineManager.cs

@@ -5,8 +5,10 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Physics2D;
 
-public class PhysicsCoroutineManager : UniverseObject
+public class PhysicsCoroutineManager : Behaviour
 {
+    private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnUpdate = null!;
+
     private readonly List<IEnumerator> enumerators = [];
     private IPhysicsEngine2D? physicsEngine = null;
 
@@ -21,13 +23,13 @@ public class PhysicsCoroutineManager : UniverseObject
         enumerators.Remove(enumerator);
     }
 
-    protected override void OnEnteringUniverse(IUniverse universe)
+    protected override void OnEnteredUniverse(IUniverse universe)
     {
-        physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
+        physicsEngine = universe.FindRequiredBehaviour<IPhysicsEngine2D>();
         if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
-            foundPhysicsEngine.OnPhysicsStep += OnPhysicsStep;
+            foundPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
         else
-            universe.OnUpdate += OnUpdate;
+            universe.OnUpdate.AddListener(OnUpdate);
     }
 
     private void OnPhysicsStep(IPhysicsEngine2D sender, float stepDeltaTime)
@@ -42,23 +44,28 @@ public class PhysicsCoroutineManager : UniverseObject
         }
     }
 
-    protected override void OnExitingUniverse(IUniverse universe)
+    protected override void OnExitedUniverse(IUniverse universe)
     {
         if (physicsEngine is IPhysicsEngine2D existingPhysicsEngine)
-            existingPhysicsEngine.OnPhysicsStep -= OnPhysicsStep;
+            existingPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
-        universe.OnUpdate -= OnUpdate;
+        universe.OnUpdate.RemoveListener(delegateOnUpdate);
     }
 
-    private void OnUpdate(IUniverse sender, UniverseTime engineTime)
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
     {
         if (Universe is not IUniverse universe)
             return;
 
-        physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
+        physicsEngine = universe.FindRequiredBehaviour<IPhysicsEngine2D>();
         if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
         {
-            foundPhysicsEngine.OnPhysicsStep += OnPhysicsStep;
+            foundPhysicsEngine.OnPhysicsStep.AddListener(OnPhysicsStep);
-            universe.OnUpdate -= OnUpdate;
+            universe.OnUpdate.RemoveListener(delegateOnUpdate);
         }
     }
+
+    public PhysicsCoroutineManager()
+    {
+        delegateOnUpdate = OnUpdate;
+    }
 }

Engine.Physics2D/PhysicsEngine2D.cs

@@ -1,11 +1,15 @@
+using System.Collections.Generic;
+
 using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Physics2D;
 
-public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
+public class PhysicsEngine2D : Behaviour, IPhysicsEngine2D
 {
-    public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null;
+    public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
-    public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null;
+    public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
+
+    private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnPreUpdate = null!;
 
     private float physicsTicker = 0f;
     private int _iterationPerStep = 1;
@@ -14,9 +18,12 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
     protected readonly ICollisionDetector2D collisionDetector = null!;
     protected readonly ICollisionResolver2D collisionResolver = null!;
 
+    private static Comparer<IBehaviour> SortByPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
+    protected ActiveBehaviourCollectorSorted<IPrePhysicsUpdate> physicsPreUpdateCollector = new() { SortBy = SortByPriority() };
+    protected ActiveBehaviourCollectorSorted<IPhysicsUpdate> physicsUpdateCollector = new() { SortBy = SortByPriority() };
+    protected ActiveBehaviourCollectorSorted<IPostPhysicsUpdate> physicsPostUpdateCollector = new() { SortBy = SortByPriority() };
     protected BehaviourCollector<IRigidBody2D> rigidBodyCollector = new();
     protected BehaviourCollector<ICollider2D> colliderCollector = new();
-    protected BehaviourCollector<IPhysicsUpdate> physicsUpdateCollector = new();
 
     public int IterationPerStep { get => _iterationPerStep; set => _iterationPerStep = value < 1 ? 1 : value; }
     public float IterationPeriod { get => _iterationPeriod; set => _iterationPeriod = value.Max(0.0001f); }
@@ -25,77 +32,137 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
     {
         float intervalDeltaTime = deltaTime / IterationPerStep;
 
+        for (int i = physicsPreUpdateCollector.Count - 1; i >= 0; i--)
+            physicsPreUpdateCollector[i].PrePhysicsUpdate(deltaTime);
+
+        for (int i = physicsUpdateCollector.Count - 1; i >= 0; i--)
+            physicsUpdateCollector[i].PhysicsUpdate(deltaTime);
+
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
             // Can Parallel
-            foreach (IRigidBody2D rigidBody in rigidBodyCollector)
+            for (int i = rigidBodyCollector.Count - 1; i >= 0; i--)
-                StepRigidBody(rigidBody, intervalDeltaTime);
+                StepRigidBody(rigidBodyCollector[i], intervalDeltaTime);
 
             // Can Parallel
-            foreach (ICollider2D collider in colliderCollector)
+            for (int i = colliderCollector.Count - 1; i >= 0; i--)
-                collider.Recalculate();
+                colliderCollector[i].Recalculate();
 
             // Can Parallel
-            for (int x = 0; x < colliderCollector.Behaviours.Count; x++)
+            for (int x = 0; x < colliderCollector.Count; x++)
             {
-                ICollider2D? colliderX = colliderCollector.Behaviours[x];
+                ICollider2D? colliderX = colliderCollector[x];
                 if (!colliderX.IsActive)
-                    return;
+                    continue;
 
-                for (int y = x + 1; y < colliderCollector.Behaviours.Count; y++)
+                for (int y = x + 1; y < colliderCollector.Count; y++)
                 {
-                    ICollider2D? colliderY = colliderCollector.Behaviours[y];
+                    ICollider2D? colliderY = colliderCollector[y];
 
                     if (!colliderY.IsActive)
-                        return;
-
-                    if (colliderX.RigidBody2D == colliderY.RigidBody2D)
                         continue;
 
-                    bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
+                    ResolveColliders(colliderX, colliderY);
-                    if (bothCollidersAreTriggers)
-                        continue;
-
-                    bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
-                    if (bothCollidersAreStatic)
-                        continue;
-
-                    if (collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
-                    {
-                        if (colliderX.IsTrigger)
-                        {
-                            colliderX.Trigger(colliderY);
-                            continue;
-                        }
-                        else if (colliderY.IsTrigger)
-                        {
-                            colliderY.Trigger(colliderX);
-                            continue;
-                        }
-
-                        if (information.Detector == colliderX)
-                        {
-                            colliderX.Detect(information);
-                            colliderY.Detect(information.Reverse());
-                        }
-                        else
-                        {
-                            colliderX.Detect(information.Reverse());
-                            colliderY.Detect(information);
-                        }
-
-                        collisionResolver?.Resolve(information);
-                    }
                 }
             }
 
-            OnPhysicsIteration?.InvokeSafe(this, intervalDeltaTime);
+            OnPhysicsIteration?.Invoke(this, intervalDeltaTime);
         }
 
-        foreach (IPhysicsUpdate physicsUpdate in physicsUpdateCollector)
+        for (int i = physicsPostUpdateCollector.Count - 1; i >= 0; i--)
+            physicsPostUpdateCollector[i].PostPhysicsUpdate(deltaTime);
+
+        OnPhysicsStep?.Invoke(this, deltaTime);
+    }
+
+    public void StepIndividual(IRigidBody2D rigidBody, float deltaTime)
+    {
+        float intervalDeltaTime = deltaTime / IterationPerStep;
+
+        List<ICollider2D> childColliders = [];
+        List<IPrePhysicsUpdate> physicsPreUpdates = [];
+        List<IPhysicsUpdate> physicsUpdates = [];
+        List<IPostPhysicsUpdate> physicsPostUpdates = [];
+
+        rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
+
+        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
+            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
+
+        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
             physicsUpdate.PhysicsUpdate(deltaTime);
 
-        OnPhysicsStep?.InvokeSafe(this, deltaTime);
+        for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
+        {
+            StepRigidBody(rigidBody, intervalDeltaTime);
+
+            for (int i = childColliders.Count - 1; i >= 0; i--)
+                childColliders[i].Recalculate();
+
+            for (int x = 0; x < childColliders.Count; x++)
+            {
+                ICollider2D? colliderX = childColliders[x];
+                if (!colliderX.IsActive)
+                    continue;
+
+                for (int y = 0; y < colliderCollector.Count; y++)
+                {
+                    ICollider2D? colliderY = colliderCollector[y];
+
+                    if (!colliderY.IsActive)
+                        continue;
+
+                    ResolveColliders(colliderX, colliderY);
+                }
+            }
+        }
+
+        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
+            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
+    }
+
+    private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
+    {
+        if (colliderX.RigidBody2D == colliderY.RigidBody2D)
+            return;
+
+        bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
+        if (bothCollidersAreTriggers)
+            return;
+
+        bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
+        if (bothCollidersAreStatic)
+            return;
+
+        if (!collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
+            return;
+
+        if (colliderX.IsTrigger)
+        {
+            colliderX.Trigger(colliderY);
+            return;
+        }
+        else if (colliderY.IsTrigger)
+        {
+            colliderY.Trigger(colliderX);
+            return;
+        }
+
+        if (information.Detector == colliderX)
+        {
+            colliderX.Detect(information);
+            colliderY.Detect(information.Reverse());
+        }
+        else
+        {
+            colliderX.Detect(information.Reverse());
+            colliderY.Detect(information);
+        }
+
+        collisionResolver?.Resolve(information);
     }
 
     private static void StepRigidBody(IRigidBody2D rigidBody, float intervalDeltaTime)
@@ -107,27 +174,31 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
         rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
     }
 
-    protected override void OnEnteringUniverse(IUniverse universe)
+    protected override void OnEnteredUniverse(IUniverse universe)
     {
+        physicsPreUpdateCollector.Assign(universe);
         physicsUpdateCollector.Assign(universe);
+        physicsPostUpdateCollector.Assign(universe);
         colliderCollector.Assign(universe);
         rigidBodyCollector.Assign(universe);
 
-        universe.OnPreUpdate += OnEnginePreUpdate;
+        universe.OnPreUpdate.AddListener(OnEnginePreUpdate);
     }
 
-    protected override void OnExitingUniverse(IUniverse universe)
+    protected override void OnExitedUniverse(IUniverse universe)
     {
+        physicsPreUpdateCollector.Unassign();
         physicsUpdateCollector.Unassign();
+        physicsPostUpdateCollector.Unassign();
         colliderCollector.Unassign();
         rigidBodyCollector.Unassign();
 
-        universe.OnPreUpdate -= OnEnginePreUpdate;
+        universe.OnPreUpdate.RemoveListener(OnEnginePreUpdate);
     }
 
-    private void OnEnginePreUpdate(IUniverse sender, UniverseTime engineTime)
+    private void OnEnginePreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
     {
-        physicsTicker += engineTime.DeltaTime;
+        physicsTicker += args.EngineTime.DeltaTime;
 
         while (physicsTicker >= IterationPeriod)
         {
@@ -140,11 +211,15 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
     {
         collisionDetector = new CollisionDetector2D();
         collisionResolver = new CollisionResolver2D();
+
+        delegateOnPreUpdate = OnEnginePreUpdate;
     }
 
     public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
     {
         this.collisionDetector = collisionDetector;
         this.collisionResolver = collisionResolver;
+
+        delegateOnPreUpdate = OnEnginePreUpdate;
     }
 }

Engine.Physics2D/PhysicsEngine2DStandalone.cs

@@ -6,8 +6,11 @@ namespace Syntriax.Engine.Physics2D;
 
 public class PhysicsEngine2DStandalone : IPhysicsEngine2D
 {
-    public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null;
+    public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
-    public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null;
+    public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
+
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
 
     private readonly List<IRigidBody2D> rigidBodies = new(32);
     private readonly List<ICollider2D> colliders = new(64);
@@ -29,13 +32,16 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         foreach (ICollider2D collider2D in rigidBody.BehaviourController.GetBehaviours<ICollider2D>())
             colliders.Add(collider2D);
 
-        rigidBody.BehaviourController.OnBehaviourAdded += OnBehaviourAdded;
+        rigidBody.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-        rigidBody.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved;
+        rigidBody.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
     }
 
     public void RemoveRigidBody(IRigidBody2D rigidBody)
     {
         rigidBodies.Remove(rigidBody);
+
+        rigidBody.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
+        rigidBody.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
     }
 
     public void Step(float deltaTime)
@@ -45,69 +51,122 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
             // Can Parallel
-            for (int i = 0; i < rigidBodies.Count; i++)
+            for (int i = rigidBodies.Count - 1; i >= 0; i--)
                 StepRigidBody(rigidBodies[i], intervalDeltaTime);
 
             // Can Parallel
-            foreach (ICollider2D collider in colliders)
+            for (int i = colliders.Count - 1; i >= 0; i--)
-                collider.Recalculate();
+                colliders[i].Recalculate();
 
             // Can Parallel
             for (int x = 0; x < colliders.Count; x++)
             {
                 ICollider2D? colliderX = colliders[x];
                 if (!colliderX.IsActive)
-                    return;
+                    continue;
 
                 for (int y = x + 1; y < colliders.Count; y++)
                 {
                     ICollider2D? colliderY = colliders[y];
-
                     if (!colliderY.IsActive)
                         return;
 
-                    if (colliderX.RigidBody2D == colliderY.RigidBody2D)
+                    ResolveColliders(colliderX, colliderY);
-                        continue;
-
-                    bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
-                    if (bothCollidersAreTriggers)
-                        continue;
-
-                    bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
-                    if (bothCollidersAreStatic)
-                        continue;
-
-                    if (collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
-                    {
-                        if (colliderX.IsTrigger)
-                        {
-                            colliderX.Trigger(colliderY);
-                            continue;
-                        }
-                        else if (colliderY.IsTrigger)
-                        {
-                            colliderY.Trigger(colliderX);
-                            continue;
-                        }
-
-                        if (information.Detector == colliderX)
-                        {
-                            colliderX.Detect(information);
-                            colliderY.Detect(information.Reverse());
-                        }
-                        else
-                        {
-                            colliderX.Detect(information.Reverse());
-                            colliderY.Detect(information);
-                        }
-
-                        collisionResolver?.Resolve(information);
-                    }
                 }
             }
-            OnPhysicsIteration?.InvokeSafe(this, intervalDeltaTime);
+            OnPhysicsIteration?.Invoke(this, intervalDeltaTime);
         }
-        OnPhysicsStep?.InvokeSafe(this, deltaTime);
+        OnPhysicsStep?.Invoke(this, deltaTime);
+    }
+
+    public void StepIndividual(IRigidBody2D rigidBody, float deltaTime)
+    {
+        float intervalDeltaTime = deltaTime / IterationPerStep;
+
+        List<ICollider2D> childColliders = [];
+        List<IPrePhysicsUpdate> physicsPreUpdates = [];
+        List<IPhysicsUpdate> physicsUpdates = [];
+        List<IPostPhysicsUpdate> physicsPostUpdates = [];
+
+        rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
+        rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
+
+        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
+            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
+
+        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
+            physicsUpdate.PhysicsUpdate(deltaTime);
+
+        for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
+        {
+            StepRigidBody(rigidBody, intervalDeltaTime);
+
+            foreach (ICollider2D collider in childColliders)
+                collider.Recalculate();
+
+            for (int x = 0; x < childColliders.Count; x++)
+            {
+                ICollider2D? colliderX = childColliders[x];
+                if (!colliderX.IsActive)
+                    continue;
+
+                for (int y = 0; y < colliders.Count; y++)
+                {
+                    ICollider2D? colliderY = colliders[y];
+
+                    if (!colliderY.IsActive)
+                        continue;
+
+                    ResolveColliders(colliderX, colliderY);
+                }
+            }
+        }
+
+        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
+            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
+    }
+
+    private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
+    {
+        if (colliderX.RigidBody2D == colliderY.RigidBody2D)
+            return;
+
+        bool bothCollidersAreTriggers = colliderX.IsTrigger && colliderX.IsTrigger == colliderY.IsTrigger;
+        if (bothCollidersAreTriggers)
+            return;
+
+        bool bothCollidersAreStatic = (colliderX.RigidBody2D?.IsStatic ?? true) && (colliderY.RigidBody2D?.IsStatic ?? true);
+        if (bothCollidersAreStatic)
+            return;
+
+        if (!collisionDetector.TryDetect(colliderX, colliderY, out CollisionDetectionInformation information))
+            return;
+
+        if (colliderX.IsTrigger)
+        {
+            colliderX.Trigger(colliderY);
+            return;
+        }
+        else if (colliderY.IsTrigger)
+        {
+            colliderY.Trigger(colliderX);
+            return;
+        }
+
+        if (information.Detector == colliderX)
+        {
+            colliderX.Detect(information);
+            colliderY.Detect(information.Reverse());
+        }
+        else
+        {
+            colliderX.Detect(information.Reverse());
+            colliderY.Detect(information);
+        }
+
+        collisionResolver?.Resolve(information);
     }
 
     private static void StepRigidBody(IRigidBody2D rigidBody, float intervalDeltaTime)
@@ -119,17 +178,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
     }
 
-    private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourAdded(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
     {
-        if (behaviour is not ICollider2D collider2D)
+        if (args.BehaviourAdded is not ICollider2D collider2D)
             return;
 
         colliders.Add(collider2D);
     }
 
-    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour)
+    private void OnBehaviourRemoved(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
     {
-        if (behaviour is not ICollider2D collider2D)
+        if (args.BehaviourRemoved is not ICollider2D collider2D)
             return;
 
         colliders.Remove(collider2D);
@@ -139,11 +198,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
     {
         collisionDetector = new CollisionDetector2D();
         collisionResolver = new CollisionResolver2D();
+
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
     }
 
     public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
     {
         this.collisionDetector = collisionDetector;
         this.collisionResolver = collisionResolver;
+
+        delegateOnBehaviourAdded = OnBehaviourAdded;
+        delegateOnBehaviourRemoved = OnBehaviourRemoved;
     }
 }

Engine.Systems/Input/IButtonInputs.cs

@@ -4,15 +4,15 @@ namespace Syntriax.Engine.Systems.Input;
 
 public interface IButtonInputs<T> : IHasStateEnable
 {
-    event ButtonCallbackEventHandler? OnAnyButtonPressed;
+    Event<IButtonInputs<T>, ButtonCallbackArguments> OnAnyButtonPressed { get; }
-    event ButtonCallbackEventHandler? OnAnyButtonReleased;
+    Event<IButtonInputs<T>, ButtonCallbackArguments> OnAnyButtonReleased { get; }
 
-    void RegisterOnPress(T button, ButtonCallbackEventHandler callback);
+    void RegisterOnPress(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
-    void UnregisterOnPress(T button, ButtonCallbackEventHandler callback);
+    void UnregisterOnPress(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
-    void RegisterOnRelease(T button, ButtonCallbackEventHandler callback);
+    void RegisterOnRelease(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
-    void UnregisterOnRelease(T button, ButtonCallbackEventHandler callback);
+    void UnregisterOnRelease(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
 
     bool IsPressed(T button);
 
-    delegate void ButtonCallbackEventHandler(IButtonInputs<T> buttonInputs, T button);
+    readonly record struct ButtonCallbackArguments(T Button);
 }

Engine.Systems/StateMachine/IState.cs

@@ -4,10 +4,10 @@ namespace Syntriax.Engine.Systems.StateMachine;
 
 public interface IState : IEntity, INameable
 {
-    event StateUpdateEventHandler? OnStateUpdate;
+    Event<IState> OnStateUpdate { get; }
-    event StateTransitionedFromEventHandler? OnStateTransitionedFrom;
+    Event<IState, StateTransitionedFromArguments> OnStateTransitionedFrom { get; }
-    event StateTransitionedToEventHandler? OnStateTransitionedTo;
+    Event<IState, StateTransitionedToArguments> OnStateTransitionedTo { get; }
-    event StateTransitionReadyEventHandler? OnStateTransitionReady;
+    Event<IState, StateTransitionReadyArguments> OnStateTransitionReady { get; }
 
     IState? GetNextState();
 
@@ -15,8 +15,7 @@ public interface IState : IEntity, INameable
     void TransitionTo(IState from);
     void TransitionFrom(IState to);
 
-    delegate void StateUpdateEventHandler(IState sender);
+    readonly record struct StateTransitionedFromArguments(IState ToState);
-    delegate void StateTransitionedFromEventHandler(IState sender, IState toState);
+    readonly record struct StateTransitionedToArguments(IState FromState);
-    delegate void StateTransitionedToEventHandler(IState sender, IState fromState);
+    readonly record struct StateTransitionReadyArguments(IState ToState);
-    delegate void StateTransitionReadyEventHandler(IState sender, IState toState);
 }

Engine.Systems/StateMachine/State.cs

@@ -6,11 +6,11 @@ namespace Syntriax.Engine.Systems.StateMachine;
 
 public class State : BaseEntity, IState
 {
-    public event IState.StateUpdateEventHandler? OnStateUpdate = null;
+    public Event<IState> OnStateUpdate { get; } = new();
-    public event IState.StateTransitionedFromEventHandler? OnStateTransitionedFrom = null;
+    public Event<IState, IState.StateTransitionedFromArguments> OnStateTransitionedFrom { get; } = new();
-    public event IState.StateTransitionedToEventHandler? OnStateTransitionedTo = null;
+    public Event<IState, IState.StateTransitionedToArguments> OnStateTransitionedTo { get; } = new();
-    public event IState.StateTransitionReadyEventHandler? OnStateTransitionReady = null;
+    public Event<IState, IState.StateTransitionReadyArguments> OnStateTransitionReady { get; } = new();
-    public event INameable.NameChangedEventHandler? OnNameChanged = null;
+    public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
 
     private readonly List<StateTransition> transitions = [];
     private readonly Dictionary<string, StateTransition> possibleTransitions = [];
@@ -28,7 +28,7 @@ public class State : BaseEntity, IState
 
             string previousName = _name;
             _name = value;
-            OnNameChanged?.Invoke(this, previousName);
+            OnNameChanged?.Invoke(this, new(previousName));
         }
     }
 
@@ -53,12 +53,12 @@ public class State : BaseEntity, IState
     public void Update()
     {
         if (GetNextState() is IState transitionState)
-            OnStateTransitionReady?.InvokeSafe(this, transitionState);
+            OnStateTransitionReady?.Invoke(this, new(transitionState));
-        OnStateUpdate?.InvokeSafe(this);
+        OnStateUpdate?.Invoke(this);
     }
 
-    public void TransitionTo(IState from) => OnStateTransitionedTo?.InvokeSafe(this, from);
+    public void TransitionTo(IState from) => OnStateTransitionedTo?.Invoke(this, new(from));
-    public void TransitionFrom(IState to) => OnStateTransitionedFrom?.InvokeSafe(this, to);
+    public void TransitionFrom(IState to) => OnStateTransitionedFrom?.Invoke(this, new(to));
 
     public IState? GetNextState()
     {

Engine.Systems/StateMachine/StateBehaviourBase.cs

@@ -4,12 +4,11 @@ namespace Syntriax.Engine.Systems.StateMachine;
 
 public abstract class StateBehaviourBase : Behaviour, IState
 {
-    public event IState.StateUpdateEventHandler? OnStateUpdate = null;
+    public Event<IState> OnStateUpdate { get; } = new();
-    public event IState.StateTransitionedFromEventHandler? OnStateTransitionedFrom = null;
+    public Event<IState, IState.StateTransitionedFromArguments> OnStateTransitionedFrom { get; } = new();
-    public event IState.StateTransitionedToEventHandler? OnStateTransitionedTo = null;
+    public Event<IState, IState.StateTransitionedToArguments> OnStateTransitionedTo { get; } = new();
-    public event INameable.NameChangedEventHandler? OnNameChanged = null;
+    public Event<IState, IState.StateTransitionReadyArguments> OnStateTransitionReady { get; } = new();
-
+    public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
-    public abstract event IState.StateTransitionReadyEventHandler? OnStateTransitionReady;
 
     private string _name = string.Empty;
     public string Name
@@ -22,7 +21,7 @@ public abstract class StateBehaviourBase : Behaviour, IState
 
             string previousName = _name;
             _name = value;
-            OnNameChanged?.Invoke(this, previousName);
+            OnNameChanged?.Invoke(this, new(previousName));
         }
     }
 
@@ -30,21 +29,21 @@ public abstract class StateBehaviourBase : Behaviour, IState
     public void Update()
     {
         OnUpdateState();
-        OnStateUpdate?.InvokeSafe(this);
+        OnStateUpdate?.Invoke(this);
     }
 
     protected virtual void OnTransitionedToState(IState from) { }
     public void TransitionTo(IState from)
     {
         OnTransitionedToState(from);
-        OnStateTransitionedTo?.InvokeSafe(this, from);
+        OnStateTransitionedTo?.Invoke(this, new(from));
     }
 
     protected virtual void OnTransitionedFromState(IState to) { }
     public void TransitionFrom(IState to)
     {
         OnTransitionedFromState(to);
-        OnStateTransitionedFrom?.InvokeSafe(this, to);
+        OnStateTransitionedFrom?.Invoke(this, new(to));
     }
 
     public abstract IState? GetNextState();

Engine.Systems/StateMachine/StateMachine.cs

@@ -3,11 +3,19 @@ using Syntriax.Engine.Core.Serialization;
 
 namespace Syntriax.Engine.Systems.StateMachine;
 
-public class StateMachine : Behaviour
+public class StateMachine : Behaviour, IUpdate
 {
-    public event StateChangedEventHandler? OnStateChanged = null;
+    public Event<StateMachine, StateChangedArguments> OnStateChanged { get; } = new();
+
+    private readonly Event<IState, IState.StateTransitionReadyArguments>.EventHandler delegateOnStateTransitionReady = null!;
 
     private IState _state = new State();
+
+    public StateMachine()
+    {
+        delegateOnStateTransitionReady = OnStateTransitionReady;
+    }
+
     [Serialize]
     public IState State
     {
@@ -18,25 +26,25 @@ public class StateMachine : Behaviour
                 return;
 
             IState previousState = _state;
-            previousState.OnStateTransitionReady -= OnStateTransitionReady;
+            previousState.OnStateTransitionReady.RemoveListener(delegateOnStateTransitionReady);
 
             _state = value;
             previousState.TransitionFrom(value);
             value.TransitionTo(_state);
-            OnStateChanged?.InvokeSafe(this, previousState, value);
+            OnStateChanged?.Invoke(this, new(value, previousState));
 
-            value.OnStateTransitionReady += OnStateTransitionReady;
+            value.OnStateTransitionReady.AddListener(delegateOnStateTransitionReady);
         }
     }
 
-    private void OnStateTransitionReady(IState sender, IState toState)
+    private void OnStateTransitionReady(IState sender, IState.StateTransitionReadyArguments args)
     {
-        State = toState;
+        State = args.ToState;
         while (State.GetNextState() is IState nextState)
             State = nextState;
     }
 
-    protected override void OnUpdate()
+    public void Update()
     {
         if (State is null)
             return;
@@ -47,5 +55,5 @@ public class StateMachine : Behaviour
         State.Update();
     }
 
-    public delegate void StateChangedEventHandler(StateMachine sender, IState previousState, IState newState);
+    public readonly record struct StateChangedArguments(IState CurrentState, IState PreviousState);
 }

Engine.Systems/Time/IReadOnlyStopwatch.cs

@@ -1,18 +1,19 @@
+using Syntriax.Engine.Core;
+
 namespace Syntriax.Engine.Systems.Time;
 
 public interface IReadOnlyStopwatch
 {
-    event StopwatchEventHandler? OnStarted;
+    Event<IReadOnlyStopwatch> OnStarted { get; }
-    event StopwatchDeltaEventHandler? OnDelta;
+    Event<IReadOnlyStopwatch, StopwatchDeltaArguments> OnDelta { get; }
-    event StopwatchEventHandler? OnStopped;
+    Event<IReadOnlyStopwatch> OnStopped { get; }
 
     double Time { get; }
 
     TimerState State { get; }
 
-    event StopwatchEventHandler? OnPaused;
+    Event<IReadOnlyStopwatch> OnPaused { get; }
-    event StopwatchEventHandler? OnResumed;
+    Event<IReadOnlyStopwatch> OnResumed { get; }
 
-    delegate void StopwatchEventHandler(IReadOnlyStopwatch sender);
+    readonly record struct StopwatchDeltaArguments(double Delta);
-    delegate void StopwatchDeltaEventHandler(IReadOnlyStopwatch sender, double delta);
 }

Engine.Systems/Time/IReadOnlyTicker.cs

@@ -1,11 +1,11 @@
+using Syntriax.Engine.Core;
+
 namespace Syntriax.Engine.Systems.Time;
 
 public interface IReadOnlyTicker : IReadOnlyStopwatch
 {
-    event TickerTickEventHandler? OnTick;
+    Event<IReadOnlyTicker> OnTick { get; }
 
     int TickCounter { get; }
     double TickPeriod { get; set; }
-
-    delegate void TickerTickEventHandler(IReadOnlyTicker sender);
 }

Engine.Systems/Time/IReadOnlyTimer.cs

@@ -1,13 +1,15 @@
+using Syntriax.Engine.Core;
+
 namespace Syntriax.Engine.Systems.Time;
 
 public interface IReadOnlyTimer
 {
-    event TimerEventHandler? OnStarted;
+    Event<IReadOnlyTimer> OnStarted { get; }
-    event TimerDeltaEventHandler? OnDelta;
+    Event<IReadOnlyTimer, TimerDeltaArguments> OnDelta { get; }
-    event TimerEventHandler? OnStopped;
+    Event<IReadOnlyTimer> OnStopped { get; }
 
-    event TimerEventHandler? OnPaused;
+    Event<IReadOnlyTimer> OnPaused { get; }
-    event TimerEventHandler? OnResumed;
+    Event<IReadOnlyTimer> OnResumed { get; }
 
     double StartTime { get; }
     double Remaining { get; }
@@ -16,7 +18,6 @@ public interface IReadOnlyTimer
 
     TimerState State { get; }
 
-    delegate void TimerEventHandler(IReadOnlyTimer sender);
+    readonly record struct TimerDeltaArguments(double delta);
-    delegate void TimerDeltaEventHandler(IReadOnlyTimer sender, double delta);
 
 }

Engine.Systems/Time/ITicker.cs

@@ -1,11 +1,11 @@
+using Syntriax.Engine.Core;
+
 namespace Syntriax.Engine.Systems.Time;
 
 public interface ITicker : IStopwatch
 {
-    event TickerTickEventHandler? OnTick;
+    Event<ITicker> OnTick { get; }
 
     int TickCounter { get; }
     double Period { get; set; }
-
-    delegate void TickerTickEventHandler(ITicker sender);
 }

Engine.Systems/Time/StopwatchBehaviour.cs

@@ -2,13 +2,13 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Systems.Time;
 
-public class StopwatchBehaviour : Behaviour, IStopwatch
+public class StopwatchBehaviour : Behaviour, IUpdate, IStopwatch
 {
-    public event IReadOnlyStopwatch.StopwatchEventHandler? OnStarted = null;
+    public Event<IReadOnlyStopwatch> OnStarted { get; } = new();
-    public event IReadOnlyStopwatch.StopwatchDeltaEventHandler? OnDelta = null;
+    public Event<IReadOnlyStopwatch, IReadOnlyStopwatch.StopwatchDeltaArguments> OnDelta { get; } = new();
-    public event IReadOnlyStopwatch.StopwatchEventHandler? OnStopped = null;
+    public Event<IReadOnlyStopwatch> OnStopped { get; } = new();
-    public event IReadOnlyStopwatch.StopwatchEventHandler? OnPaused = null;
+    public Event<IReadOnlyStopwatch> OnPaused { get; } = new();
-    public event IReadOnlyStopwatch.StopwatchEventHandler? OnResumed = null;
+    public Event<IReadOnlyStopwatch> OnResumed { get; } = new();
 
     public double Time { get; protected set; } = 0f;
     public TimerState State { get; protected set; } = TimerState.Idle;
@@ -35,10 +35,10 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         shouldBeTicking = false;
 
         State = TimerState.Stopped;
-        OnStopped?.InvokeSafe(this);
+        OnStopped?.Invoke(this);
     }
 
-    protected override void OnUpdate()
+    public virtual void Update()
     {
         if (State is not TimerState.Ticking)
             return;
@@ -46,7 +46,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         double delta = Universe.Time.DeltaSpan.TotalSeconds;
 
         Time += delta;
-        OnDelta?.InvokeSafe(this, delta);
+        OnDelta?.Invoke(this, new(delta));
     }
 
     protected override void OnEnteredUniverse(IUniverse universe)
@@ -71,13 +71,13 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
     public virtual void Pause()
     {
         State = TimerState.Paused;
-        OnPaused?.InvokeSafe(this);
+        OnPaused?.Invoke(this);
     }
 
     public virtual void Resume()
     {
         State = TimerState.Ticking;
-        OnResumed?.InvokeSafe(this);
+        OnResumed?.Invoke(this);
     }
 
     private void StartStopwatch()
@@ -85,7 +85,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
         hasStartedTickingBefore = true;
 
         State = TimerState.Ticking;
-        OnStarted?.InvokeSafe(this);
+        OnStarted?.Invoke(this);
     }
 
     protected override void OnFinalize()

Engine.Systems/Time/TickerBehaviour.cs

@@ -4,7 +4,7 @@ namespace Syntriax.Engine.Systems.Time;
 
 public class TickerBehaviour : StopwatchBehaviour, ITicker
 {
-    public event ITicker.TickerTickEventHandler? OnTick = null;
+    public Event<ITicker> OnTick { get; } = new();
 
     public double Period { get; set; } = 1f;
     public int TickCounter { get; private set; } = 0;
@@ -18,15 +18,15 @@ public class TickerBehaviour : StopwatchBehaviour, ITicker
         nextTick = Time + Period;
     }
 
-    protected override void OnUpdate()
+    public override void Update()
     {
-        base.OnUpdate();
+        base.Update();
 
         while (Time > nextTick)
         {
             nextTick += Period;
             TickCounter++;
-            OnTick?.InvokeSafe(this);
+            OnTick?.Invoke(this);
         }
     }
 

Engine.Systems/Time/TimerBehaviour.cs

@@ -2,13 +2,13 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Systems.Time;
 
-public class TimerBehaviour : Behaviour, ITimer
+public class TimerBehaviour : Behaviour, IUpdate, ITimer
 {
-    public event IReadOnlyTimer.TimerEventHandler? OnStarted = null;
+    public Event<IReadOnlyTimer> OnStarted { get; } = new();
-    public event IReadOnlyTimer.TimerDeltaEventHandler? OnDelta = null;
+    public Event<IReadOnlyTimer, IReadOnlyTimer.TimerDeltaArguments> OnDelta { get; } = new();
-    public event IReadOnlyTimer.TimerEventHandler? OnStopped = null;
+    public Event<IReadOnlyTimer> OnStopped { get; } = new();
-    public event IReadOnlyTimer.TimerEventHandler? OnPaused = null;
+    public Event<IReadOnlyTimer> OnPaused { get; } = new();
-    public event IReadOnlyTimer.TimerEventHandler? OnResumed = null;
+    public Event<IReadOnlyTimer> OnResumed { get; } = new();
 
     public TimerState State { get; protected set; } = TimerState.Idle;
     public double StartTime { get; protected set; } = 0f;
@@ -50,10 +50,10 @@ public class TimerBehaviour : Behaviour, ITimer
         shouldBeTicking = false;
 
         State = TimerState.Stopped;
-        OnStopped?.InvokeSafe(this);
+        OnStopped?.Invoke(this);
     }
 
-    protected override void OnUpdate()
+    public void Update()
     {
         if (State is not TimerState.Ticking)
             return;
@@ -61,7 +61,7 @@ public class TimerBehaviour : Behaviour, ITimer
         double delta = Universe.Time.DeltaSpan.TotalSeconds;
 
         Remaining -= delta;
-        OnDelta?.InvokeSafe(this, delta);
+        OnDelta?.Invoke(this, new(delta));
 
         if (Remaining <= .0f)
             Stop();
@@ -89,13 +89,13 @@ public class TimerBehaviour : Behaviour, ITimer
     public virtual void Pause()
     {
         State = TimerState.Paused;
-        OnPaused?.InvokeSafe(this);
+        OnPaused?.Invoke(this);
     }
 
     public virtual void Resume()
     {
         State = TimerState.Ticking;
-        OnResumed?.InvokeSafe(this);
+        OnResumed?.Invoke(this);
     }
 
     private void StartTimer()
@@ -103,7 +103,7 @@ public class TimerBehaviour : Behaviour, ITimer
         hasStartedTickingBefore = true;
 
         State = TimerState.Ticking;
-        OnStarted?.InvokeSafe(this);
+        OnStarted?.Invoke(this);
     }
 
     protected override void OnFinalize()

Engine.Systems/Tween/EngineExtensions/TweenAABBExtensions.cs

@@ -6,5 +6,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenAABBExtensions
 {
     public static ITween TweenAABB(this AABB initialAABB, ITweenManager tweenManager, float duration, AABB targetAABB, Action<AABB> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(new AABB(initialAABB.LowerBoundary.Lerp(targetAABB.LowerBoundary, t), initialAABB.UpperBoundary.Lerp(targetAABB.UpperBoundary, t))));
+        => tweenManager.StartTween(duration, t => setMethod?.Invoke(new AABB(initialAABB.LowerBoundary.Lerp(targetAABB.LowerBoundary, t), initialAABB.UpperBoundary.Lerp(targetAABB.UpperBoundary, t))));
 }

Engine.Systems/Tween/EngineExtensions/TweenCircleExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenCircleExtensions
 {
     public static ITween TweenCircle(this Circle initialCircle, ITweenManager tweenManager, float duration, Circle targetCircle, System.Action<Circle> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.InvokeSafe(
+            t => setMethod?.Invoke(
                 new Circle(
                     initialCircle.Center.Lerp(targetCircle.Center, t),
                     initialCircle.Diameter.Lerp(targetCircle.Diameter, t)

Engine.Systems/Tween/EngineExtensions/TweenColorExtensions.cs

@@ -5,11 +5,11 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenColorExtensions
 {
     public static ITween TweenColor(this ColorRGB initialColorRGB, ITweenManager tweenManager, float duration, ColorRGB targetColorRGB, System.Action<ColorRGB> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorRGB.Lerp(targetColorRGB, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorRGB.Lerp(targetColorRGB, t)));
 
     public static ITween TweenColor(this ColorRGBA initialColorRGBA, ITweenManager tweenManager, float duration, ColorRGBA targetColorRGBA, System.Action<ColorRGBA> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorRGBA.Lerp(targetColorRGBA, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorRGBA.Lerp(targetColorRGBA, t)));
 
     public static ITween TweenColor(this ColorHSV initialColorHSV, ITweenManager tweenManager, float duration, ColorHSV targetColorHSV, System.Action<ColorHSV> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialColorHSV.Lerp(targetColorHSV, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialColorHSV.Lerp(targetColorHSV, t)));
 }

Engine.Systems/Tween/EngineExtensions/TweenLine2DEquationExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenLine2DEquationExtensions
 {
     public static ITween TweenLine2DEquation(this Line2DEquation initialLine2DEquation, ITweenManager tweenManager, float duration, Line2DEquation targetLine2DEquation, System.Action<Line2DEquation> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.InvokeSafe(
+            t => setMethod?.Invoke(
                 new Line2DEquation(
                     initialLine2DEquation.Slope.Lerp(targetLine2DEquation.Slope, t),
                     initialLine2DEquation.OffsetY.Lerp(targetLine2DEquation.OffsetY, t)

Engine.Systems/Tween/EngineExtensions/TweenLine2DExtensions.cs

@@ -6,7 +6,7 @@ public static class TweenLine2DExtensions
 {
     public static ITween TweenLine2D(this Line2D initialLine2D, ITweenManager tweenManager, float duration, Line2D targetLine2D, System.Action<Line2D> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.InvokeSafe(
+            t => setMethod?.Invoke(
                 new Line2D(
                     initialLine2D.From.Lerp(targetLine2D.From, t),
                     initialLine2D.To.Lerp(targetLine2D.To, t)

Engine.Systems/Tween/EngineExtensions/TweenProjection1DExtensions.cs

@@ -7,7 +7,7 @@ public static class TweenProjection1DExtensions
 {
     public static ITween TweenProjection1D(this Projection1D initialProjection1D, ITweenManager tweenManager, float duration, Projection1D targetProjection1D, Action<Projection1D> setMethod)
         => tweenManager.StartTween(duration,
-            t => setMethod?.InvokeSafe(
+            t => setMethod?.Invoke(
                 new Projection1D(
                     initialProjection1D.Min.Lerp(targetProjection1D.Min, t),
                     initialProjection1D.Max.Lerp(targetProjection1D.Max, t)

Engine.Systems/Tween/EngineExtensions/TweenQuaternionExtensions.cs

@@ -6,5 +6,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenQuaternionExtensions
 {
     public static ITween TweenQuaternion(this Quaternion initialQuaternion, ITweenManager tweenManager, float duration, Quaternion targetQuaternion, Action<Quaternion> setMethod)
-       => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialQuaternion.SLerp(targetQuaternion, t)));
+       => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialQuaternion.SLerp(targetQuaternion, t)));
 }

Engine.Systems/Tween/EngineExtensions/TweenTransform2DExtensions.cs

@@ -39,4 +39,69 @@ public static class TweenTransform2DExtensions
         float initialLocalRotation = transform2D.LocalRotation;
         return tweenManager.StartTween(duration, t => transform2D.LocalRotation = initialLocalRotation.Lerp(targetLocalRotation, t));
     }
+    public static ITween TweenPositionAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additivePosition)
+    {
+        Vector2D progressedPosition = Vector2D.Zero;
+        return tweenManager.StartTween(duration, t =>
+        {
+            Vector2D displacement = Vector2D.Zero.Lerp(additivePosition, t) - progressedPosition;
+            transform2D.Position += displacement;
+            progressedPosition += displacement;
+        });
+    }
+
+    public static ITween TweenScaleAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveScale)
+    {
+        Vector2D progressedScale = Vector2D.Zero;
+        return tweenManager.StartTween(duration, t =>
+        {
+            Vector2D displacement = Vector2D.Zero.Lerp(additiveScale, t) - progressedScale;
+            transform2D.Scale += displacement;
+            progressedScale += displacement;
+        });
+    }
+
+    public static ITween TweenRotationAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, float additiveRotation)
+    {
+        float progressedRotation = 0f;
+        return tweenManager.StartTween(duration, t =>
+        {
+            float displacement = 0f.Lerp(additiveRotation, t) - progressedRotation;
+            transform2D.Rotation += displacement;
+            progressedRotation += displacement;
+        });
+    }
+
+    public static ITween TweenLocalPositionAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveLocalPosition)
+    {
+        Vector2D progressedLocalPosition = Vector2D.Zero;
+        return tweenManager.StartTween(duration, t =>
+        {
+            Vector2D displacement = Vector2D.Zero.Lerp(additiveLocalPosition, t) - progressedLocalPosition;
+            transform2D.LocalPosition += displacement;
+            progressedLocalPosition += displacement;
+        });
+    }
+
+    public static ITween TweenLocalScaleAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, Vector2D additiveLocalScale)
+    {
+        Vector2D progressedLocalScale = Vector2D.Zero;
+        return tweenManager.StartTween(duration, t =>
+        {
+            Vector2D displacement = Vector2D.Zero.Lerp(additiveLocalScale, t) - progressedLocalScale;
+            transform2D.LocalScale += displacement;
+            progressedLocalScale += displacement;
+        });
+    }
+
+    public static ITween TweenLocalRotationAdditive(this ITransform2D transform2D, ITweenManager tweenManager, float duration, float additiveLocalRotation)
+    {
+        float progressedLocalRotation = 0f;
+        return tweenManager.StartTween(duration, t =>
+        {
+            float displacement = 0f.Lerp(additiveLocalRotation, t) - progressedLocalRotation;
+            transform2D.LocalRotation += displacement;
+            progressedLocalRotation += displacement;
+        });
+    }
 }

Engine.Systems/Tween/EngineExtensions/TweenTriangleExtensions.cs

@@ -7,7 +7,7 @@ public static class TweenTriangleExtensions
 {
     public static ITween TweenTriangle(this Triangle initialTriangle, ITweenManager tweenManager, float duration, Triangle targetTriangle, Action<Triangle> setMethod)
        => tweenManager.StartTween(duration,
-            t => setMethod?.InvokeSafe(
+            t => setMethod?.Invoke(
                 new Triangle(
                     initialTriangle.A.Lerp(targetTriangle.A, t),
                     initialTriangle.B.Lerp(targetTriangle.B, t),

Engine.Systems/Tween/EngineExtensions/TweenVector2DExtensions.cs

@@ -5,5 +5,5 @@ namespace Syntriax.Engine.Systems.Tween;
 public static class TweenVector2DExtensions
 {
     public static ITween TweenVector2D(this Vector2D initialVector2D, ITweenManager tweenManager, float duration, Vector2D targetVector2D, System.Action<Vector2D> setMethod)
-        => tweenManager.StartTween(duration, t => setMethod?.InvokeSafe(initialVector2D.Lerp(targetVector2D, t)));
+        => tweenManager.StartTween(duration, t => setMethod?.Invoke(initialVector2D.Lerp(targetVector2D, t)));
 }