fix: tween reset caused issues

Engine.Core/Abstract/ITransform2D.cs

@@ -20,26 +20,6 @@ public interface ITransform2D : IBehaviour
     /// </summary>
     Event<ITransform2D, RotationChangedArguments> OnRotationChanged { get; }
 
-    /// <summary>
-    /// The <see cref="Vector2D"/> pointing upwards in world space.
-    /// </summary>
-    Vector2D Up { get; }
-
-    /// <summary>
-    /// The <see cref="Vector2D"/> pointing upwards in world space.
-    /// </summary>
-    Vector2D Down { get; }
-
-    /// <summary>
-    /// The <see cref="Vector2D"/> pointing upwards in world space.
-    /// </summary>
-    Vector2D Left { get; }
-
-    /// <summary>
-    /// The <see cref="Vector2D"/> pointing upwards in world space.
-    /// </summary>
-    Vector2D Right { get; }
-
     /// <summary>
     /// The world position of the <see cref="ITransform2D"/> in 2D space.
     /// </summary>

Engine.Core/ActiveBehaviourCollector.cs

@@ -10,11 +10,11 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
     public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
     public Event<IAssignable>? OnUnassigned { get; } = new();
 
-    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = 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 Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler cachedOnBehaviourAdded = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler cachedOnBehaviourRemoved = null!;
+    private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler cachedOnBehaviourStateChanged = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler cachedOnUniverseObjectRegistered = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler cachedOnUniverseObjectUnregistered = null!;
 
     private readonly List<T> monitoringBehaviours = new(32);
     protected readonly List<T> activeBehaviours = new(32);
@@ -22,47 +22,46 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
 
     public IUniverse Universe { get; private set; } = null!;
 
-    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
+    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments arguments)
     {
-        IUniverseObject universeObject = args.UniverseObjectRegistered;
+        IUniverseObject universeObject = arguments.UniverseObjectRegistered;
 
-        universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
+        universeObject.BehaviourController.OnBehaviourAdded.AddListener(cachedOnBehaviourAdded);
+        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(cachedOnBehaviourRemoved);
 
         for (int i = 0; i < universeObject.BehaviourController.Count; i++)
             OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
-    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
+    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments arguments)
     {
-        IUniverseObject universeObject = args.UniverseObjectUnregistered;
+        IUniverseObject universeObject = arguments.UniverseObjectUnregistered;
 
-        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
-        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
+        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(cachedOnBehaviourAdded);
+        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(cachedOnBehaviourRemoved);
 
         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, IBehaviourController.BehaviourAddedArguments args)
+    private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments arguments)
     {
-        if (args.BehaviourAdded is not T tBehaviour)
+        if (arguments.BehaviourAdded is not T tBehaviour)
             return;
 
         monitoringBehaviours.Add(tBehaviour);
         monitoringActiveToBehaviour.Add(tBehaviour, tBehaviour);
-        tBehaviour.OnActiveChanged.AddListener(delegateOnBehaviourStateChanged);
+        tBehaviour.OnActiveChanged.AddListener(cachedOnBehaviourStateChanged);
         OnBehaviourStateChanged(tBehaviour, new(!tBehaviour.IsActive));
     }
 
-    protected virtual void AddBehaviour(T behaviour) => activeBehaviours.Add(behaviour);
-    private void OnBehaviourStateChanged(IActive sender, IActive.ActiveChangedArguments args)
+    private void OnBehaviourStateChanged(IActive sender, IActive.ActiveChangedArguments arguments)
     {
         T behaviour = monitoringActiveToBehaviour[sender];
         if (sender.IsActive)
         {
-            AddBehaviour(behaviour);
+            activeBehaviours.Add(behaviour);
             OnBehaviourAdd(behaviour);
             OnCollected?.Invoke(this, new(behaviour));
         }
@@ -74,15 +73,15 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
     }
 
     protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
-    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
+    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments arguments)
     {
-        if (args.BehaviourRemoved is not T tBehaviour)
+        if (arguments.BehaviourRemoved is not T tBehaviour)
             return;
 
         if (!monitoringBehaviours.Remove(tBehaviour) || !monitoringActiveToBehaviour.Remove(tBehaviour))
             return;
 
-        tBehaviour.OnActiveChanged.RemoveListener(delegateOnBehaviourStateChanged);
+        tBehaviour.OnActiveChanged.RemoveListener(cachedOnBehaviourStateChanged);
         if (activeBehaviours.Remove(tBehaviour))
         {
             OnBehaviourRemove(tBehaviour);
@@ -98,8 +97,8 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
             OnUniverseObjectRegistered(universe, new(universeObject));
 
-        universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
+        universe.OnUniverseObjectRegistered.AddListener(cachedOnUniverseObjectRegistered);
+        universe.OnUniverseObjectUnRegistered.AddListener(cachedOnUniverseObjectUnregistered);
 
         Universe = universe;
         OnUniverseAssigned?.Invoke(this);
@@ -115,8 +114,8 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
         foreach (IUniverseObject universeObject in Universe.UniverseObjects)
             OnUniverseObjectUnregistered(Universe, new(universeObject));
 
-        Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
-        Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
+        Universe.OnUniverseObjectRegistered.RemoveListener(cachedOnUniverseObjectRegistered);
+        Universe.OnUniverseObjectUnRegistered.RemoveListener(cachedOnUniverseObjectUnregistered);
 
         Universe = null!;
         OnUnassigned?.Invoke(this);
@@ -128,21 +127,10 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
 
     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);
+        cachedOnBehaviourAdded = OnBehaviourAdded;
+        cachedOnBehaviourRemoved = OnBehaviourRemoved;
+        cachedOnBehaviourStateChanged = OnBehaviourStateChanged;
+        cachedOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        cachedOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
     }
 }

Engine.Core/ActiveBehaviourCollectorSorted.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class ActiveBehaviourCollectorSorted<T> : ActiveBehaviourCollector<T> where T : class, IBehaviour
 {
-    private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
-
-    private IComparer<T>? _sortBy = null;
-    public IComparer<T>? SortBy
+    private Comparison<T>? _sortBy = null;
+    public Comparison<T>? SortBy
     {
         get => _sortBy;
         set
@@ -20,48 +17,9 @@ public class ActiveBehaviourCollectorSorted<T> : ActiveBehaviourCollector<T> whe
         }
     }
 
-    protected override void AddBehaviour(T behaviour)
-    {
-        if (SortBy is null)
-        {
-            activeBehaviours.Add(behaviour);
-            return;
-        }
-
-        int insertionIndex = activeBehaviours.BinarySearch(behaviour, SortBy);
-
-        if (insertionIndex < 0)
-            insertionIndex = ~insertionIndex;
-
-        activeBehaviours.Insert(insertionIndex, behaviour);
-    }
-
     protected override void OnBehaviourAdd(IBehaviour behaviour)
     {
-        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);
+        if (SortBy is not null)
+            activeBehaviours.Sort(SortBy);
     }
 }

Engine.Core/Behaviour.cs

@@ -1,9 +1,14 @@
 namespace Syntriax.Engine.Core;
 
-public abstract class Behaviour : BehaviourBase
+public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
+    IPreUpdate, IUpdate, IPostUpdate,
+    IPreDraw, IDraw, IPostDraw
 {
-    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;
+
+    private readonly Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments>.EventHandler cachedEnteredUniverse = null!;
+    private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler cachedExitedUniverse = null!;
 
     public Behaviour()
     {
@@ -11,18 +16,18 @@ public abstract class Behaviour : BehaviourBase
         OnFinalized.AddListener(OnFinalize);
         OnUnassigned.AddListener(OnUnassign);
 
-        delegateEnteredUniverse = EnteredUniverse;
-        delegateExitedUniverse = ExitedUniverse;
+        cachedEnteredUniverse = EnteredUniverse;
+        cachedExitedUniverse = ExitedUniverse;
     }
 
     protected virtual void OnUnassign() { }
-    protected void OnUnassign(IAssignable assignable) => OnUnassign();
+    protected virtual void OnUnassign(IAssignable assignable) => OnUnassign();
 
     protected virtual void OnInitialize() { }
-    protected void OnInitialize(IInitializable _)
+    protected virtual void OnInitialize(IInitializable _)
     {
-        BehaviourController.UniverseObject.OnEnteredUniverse.AddListener(delegateEnteredUniverse);
-        BehaviourController.UniverseObject.OnExitedUniverse.AddListener(delegateExitedUniverse);
+        BehaviourController.UniverseObject.OnEnteredUniverse.AddListener(cachedEnteredUniverse);
+        BehaviourController.UniverseObject.OnExitedUniverse.AddListener(cachedExitedUniverse);
 
         OnInitialize();
 
@@ -31,10 +36,10 @@ public abstract class Behaviour : BehaviourBase
     }
 
     protected virtual void OnFinalize() { }
-    protected void OnFinalize(IInitializable _)
+    protected virtual void OnFinalize(IInitializable _)
     {
-        BehaviourController.UniverseObject.OnEnteredUniverse.RemoveListener(delegateEnteredUniverse);
-        BehaviourController.UniverseObject.OnExitedUniverse.RemoveListener(delegateExitedUniverse);
+        BehaviourController.UniverseObject.OnEnteredUniverse.RemoveListener(cachedEnteredUniverse);
+        BehaviourController.UniverseObject.OnExitedUniverse.RemoveListener(cachedExitedUniverse);
 
         OnFinalize();
 
@@ -42,9 +47,100 @@ public abstract class Behaviour : BehaviourBase
             ExitedUniverse(UniverseObject, new(Universe));
     }
 
+    protected virtual void OnFirstActiveFrame() { }
+    void IFirstFrameUpdate.FirstActiveFrame()
+    {
+        Debug.Assert.AssertInitialized(this);
+        OnFirstActiveFrame();
+    }
+
+    protected virtual void OnPreUpdatePreActiveCheck() { }
+    protected virtual void OnPreUpdate() { }
+    void IPreUpdate.PreUpdate()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnPreUpdatePreActiveCheck();
+
+        if (!IsActive)
+            return;
+
+        OnPreUpdate();
+    }
+
+    protected virtual void OnUpdatePreActiveCheck() { }
+    protected virtual void OnUpdate() { }
+    void IUpdate.Update()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnUpdatePreActiveCheck();
+
+        if (!IsActive)
+            return;
+
+        OnUpdate();
+    }
+
+    protected virtual void OnPostUpdatePreActiveCheck() { }
+    protected virtual void OnPostUpdate() { }
+    void IPostUpdate.PostUpdate()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnPostUpdatePreActiveCheck();
+
+        if (!StateEnable.Enabled)
+            return;
+
+        OnPostUpdate();
+    }
+
+    protected virtual void OnPreDrawPreActiveCheck() { }
+    protected virtual void OnPreDraw() { }
+    void IPreDraw.PreDraw()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnPreDrawPreActiveCheck();
+
+        if (!StateEnable.Enabled)
+            return;
+
+        OnPreDraw();
+    }
+
+    protected virtual void OnDrawPreActiveCheck() { }
+    protected virtual void OnDraw() { }
+    void IDraw.Draw()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnDrawPreActiveCheck();
+
+        if (!StateEnable.Enabled)
+            return;
+
+        OnDraw();
+    }
+
+    protected virtual void OnPostDrawPreActiveCheck() { }
+    protected virtual void OnPostDraw() { }
+    void IPostDraw.PostDraw()
+    {
+        Debug.Assert.AssertInitialized(this);
+
+        OnPostDrawPreActiveCheck();
+
+        if (!StateEnable.Enabled)
+            return;
+
+        OnPostDraw();
+    }
+
     protected virtual void OnEnteredUniverse(IUniverse universe) { }
-    protected void EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments args) => OnEnteredUniverse(args.Universe);
+    protected virtual void EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments arguments) => OnEnteredUniverse(arguments.Universe);
 
     protected virtual void OnExitedUniverse(IUniverse universe) { }
-    protected void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args) => OnExitedUniverse(args.Universe);
+    protected virtual void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments arguments) => OnExitedUniverse(arguments.Universe);
 }

Engine.Core/Behaviour2D.cs

@@ -4,6 +4,19 @@ public abstract class Behaviour2D : Behaviour, IBehaviour2D
 {
     public ITransform2D Transform { get; private set; } = null!;
 
-    protected override void OnInitialize() => Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
-    protected override void OnFinalize() => Transform = null!;
+    protected sealed override void OnInitialize(IInitializable _)
+    {
+        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 EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments arguments) => base.EnteredUniverse(sender, arguments);
+    protected sealed override void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments arguments) => base.ExitedUniverse(sender, arguments);
 }

Engine.Core/BehaviourBase.cs

@@ -7,12 +7,9 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
     public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; } = new();
     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 readonly Event<IHasUniverseObject>.EventHandler cachedOnUniverseObjectAssigned = null!;
+    private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler cachedOnUniverseObjectActiveChanged = null!;
+    private readonly Event<IStateEnable, IStateEnable.EnabledChangedArguments>.EventHandler cachedOnStateEnabledChanged = null!;
 
     private IBehaviourController _behaviourController = null!;
     public IBehaviourController BehaviourController => _behaviourController;
@@ -43,7 +40,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
         _behaviourController = behaviourController;
         OnAssign(behaviourController);
-        behaviourController.OnUniverseObjectAssigned.AddListener(delegateOnUniverseObjectAssigned);
+        behaviourController.OnUniverseObjectAssigned.AddListener(cachedOnUniverseObjectAssigned);
         if (behaviourController.UniverseObject is not null)
             OnUniverseObjectAssigned(behaviourController);
         OnBehaviourControllerAssigned?.Invoke(this);
@@ -52,7 +49,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
     private void OnUniverseObjectAssigned(IHasUniverseObject sender)
     {
-        sender.UniverseObject.OnActiveChanged.AddListener(delegateOnUniverseObjectActiveChanged);
+        sender.UniverseObject.OnActiveChanged.AddListener(cachedOnUniverseObjectActiveChanged);
         UpdateActive();
     }
 
@@ -60,14 +57,14 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
     {
         base.OnAssign(stateEnable);
 
-        stateEnable.OnEnabledChanged.AddListener(delegateOnStateEnabledChanged);
+        stateEnable.OnEnabledChanged.AddListener(cachedOnStateEnabledChanged);
     }
 
     protected override void UnassignInternal()
     {
-        BehaviourController.UniverseObject.OnActiveChanged.RemoveListener(delegateOnUniverseObjectActiveChanged);
-        StateEnable.OnEnabledChanged.RemoveListener(delegateOnStateEnabledChanged);
-        BehaviourController.OnUniverseObjectAssigned.RemoveListener(delegateOnUniverseObjectAssigned);
+        BehaviourController.UniverseObject.OnActiveChanged.RemoveListener(cachedOnUniverseObjectActiveChanged);
+        StateEnable.OnEnabledChanged.RemoveListener(cachedOnStateEnabledChanged);
+        BehaviourController.OnUniverseObjectAssigned.RemoveListener(cachedOnUniverseObjectAssigned);
         base.UnassignInternal();
         _behaviourController = null!;
     }
@@ -78,8 +75,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
         Debug.Assert.AssertStateEnableAssigned(this);
     }
 
-    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
-    private void OnUniverseObjectActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
+    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments arguments) => UpdateActive();
+    private void OnUniverseObjectActiveChanged(IActive sender, IActive.ActiveChangedArguments arguments) => UpdateActive();
 
     private void UpdateActive()
     {
@@ -92,8 +89,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
 
     protected BehaviourBase()
     {
-        delegateOnUniverseObjectAssigned = OnUniverseObjectAssigned;
-        delegateOnUniverseObjectActiveChanged = OnUniverseObjectActiveChanged;
-        delegateOnStateEnabledChanged = OnStateEnabledChanged;
+        cachedOnUniverseObjectAssigned = OnUniverseObjectAssigned;
+        cachedOnUniverseObjectActiveChanged = OnUniverseObjectActiveChanged;
+        cachedOnStateEnabledChanged = OnStateEnabledChanged;
     }
 }

Engine.Core/BehaviourCollector.cs

@@ -10,59 +10,58 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
     public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
     public Event<IAssignable>? OnUnassigned { get; } = new();
 
-    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = 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!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler cachedOnBehaviourAdded = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler cachedOnBehaviourRemoved = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler cachedOnUniverseObjectRegistered = null!;
+    private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler cachedOnUniverseObjectUnregistered = null!;
 
     protected readonly List<T> behaviours = new(32);
 
     public IUniverse Universe { get; private set; } = null!;
 
-    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
+    private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments arguments)
     {
-        IUniverseObject universeObject = args.UniverseObjectRegistered;
+        IUniverseObject universeObject = arguments.UniverseObjectRegistered;
 
-        universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
+        universeObject.BehaviourController.OnBehaviourAdded.AddListener(cachedOnBehaviourAdded);
+        universeObject.BehaviourController.OnBehaviourRemoved.AddListener(cachedOnBehaviourRemoved);
 
         for (int i = 0; i < universeObject.BehaviourController.Count; i++)
             OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
     }
 
-    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
+    private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments arguments)
     {
-        IUniverseObject universeObject = args.UniverseObjectUnregistered;
+        IUniverseObject universeObject = arguments.UniverseObjectUnregistered;
 
-        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
-        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
+        universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(cachedOnBehaviourAdded);
+        universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(cachedOnBehaviourRemoved);
 
         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, IBehaviourController.BehaviourAddedArguments args)
+    private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments arguments)
     {
-        if (args.BehaviourAdded is not T tBehaviour)
+        if (arguments.BehaviourAdded is not T tBehaviour)
             return;
 
-        AddBehaviour(tBehaviour);
-        OnBehaviourAdd(args.BehaviourAdded);
+        behaviours.Add(tBehaviour);
+        OnBehaviourAdd(arguments.BehaviourAdded);
         OnCollected?.Invoke(this, new(tBehaviour));
     }
 
     protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
-    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
+    private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments arguments)
     {
-        if (args.BehaviourRemoved is not T tBehaviour)
+        if (arguments.BehaviourRemoved is not T tBehaviour)
             return;
 
         if (!behaviours.Remove(tBehaviour))
             return;
 
-        OnBehaviourRemove(args.BehaviourRemoved);
+        OnBehaviourRemove(arguments.BehaviourRemoved);
         OnRemoved?.Invoke(this, new(tBehaviour));
     }
 
@@ -75,8 +74,8 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
             OnUniverseObjectRegistered(universe, new(universeObject));
 
-        universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
+        universe.OnUniverseObjectRegistered.AddListener(cachedOnUniverseObjectRegistered);
+        universe.OnUniverseObjectUnRegistered.AddListener(cachedOnUniverseObjectUnregistered);
 
         Universe = universe;
         OnAssign(universe);
@@ -93,8 +92,8 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
         foreach (IUniverseObject universeObject in Universe.UniverseObjects)
             OnUniverseObjectUnregistered(Universe, new(universeObject));
 
-        Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
-        Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
+        Universe.OnUniverseObjectRegistered.RemoveListener(cachedOnUniverseObjectRegistered);
+        Universe.OnUniverseObjectUnRegistered.RemoveListener(cachedOnUniverseObjectUnregistered);
 
         Universe = null!;
         OnUnassigned?.Invoke(this);
@@ -106,19 +105,9 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 
     public BehaviourCollector()
     {
-        delegateOnBehaviourAdded = OnBehaviourAdded;
-        delegateOnBehaviourRemoved = OnBehaviourRemoved;
-        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
-        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
-    }
-
-    public BehaviourCollector(IUniverse universe)
-    {
-        delegateOnBehaviourAdded = OnBehaviourAdded;
-        delegateOnBehaviourRemoved = OnBehaviourRemoved;
-        delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
-        delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
-
-        Assign(universe);
+        cachedOnBehaviourAdded = OnBehaviourAdded;
+        cachedOnBehaviourRemoved = OnBehaviourRemoved;
+        cachedOnUniverseObjectRegistered = OnUniverseObjectRegistered;
+        cachedOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
     }
 }

Engine.Core/BehaviourCollectorSorted.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
 public class BehaviourCollectorSorted<T> : BehaviourCollector<T> where T : class
 {
-    private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
-
-    private IComparer<T>? _sortBy = null;
-    public IComparer<T>? SortBy
+    private Comparison<T>? _sortBy = null;
+    public Comparison<T>? SortBy
     {
         get => _sortBy;
         set
@@ -20,48 +17,9 @@ public class BehaviourCollectorSorted<T> : BehaviourCollector<T> where T : class
         }
     }
 
-    protected override void AddBehaviour(T behaviour)
-    {
-        if (SortBy is null)
-        {
-            behaviours.Add(behaviour);
-            return;
-        }
-
-        int insertionIndex = behaviours.BinarySearch(behaviour, SortBy);
-
-        if (insertionIndex < 0)
-            insertionIndex = ~insertionIndex;
-
-        behaviours.Insert(insertionIndex, behaviour);
-    }
-
     protected override void OnBehaviourAdd(IBehaviour behaviour)
     {
-        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);
+        if (SortBy is not null)
+            behaviours.Sort(SortBy);
     }
 }

Engine.Core/BehaviourController.cs

@@ -27,7 +27,6 @@ public class BehaviourController : BaseEntity, IBehaviourController
 
         if (IsInitialized)
             behaviour.Initialize();
-
         behaviour.OnPriorityChanged.AddListener(OnPriorityChange);
         OnBehaviourAdded?.Invoke(this, new(behaviour));
         return behaviour;
@@ -146,7 +145,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
             behaviours.Add(behaviour);
     }
 
-    private void OnPriorityChange(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
+    private void OnPriorityChange(IBehaviour sender, IBehaviour.PriorityChangedArguments arguments)
     {
         behaviours.Remove(sender);
         InsertBehaviourByPriority(sender);

Engine.Core/CoroutineManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
-public class CoroutineManager : Behaviour, IUpdate
+public class CoroutineManager : UniverseObject
 {
     private readonly List<IEnumerator> enumerators = [];
 
@@ -18,7 +18,17 @@ public class CoroutineManager : Behaviour, IUpdate
         enumerators.Remove(enumerator);
     }
 
-    void IUpdate.Update()
+    protected override void OnEnteringUniverse(IUniverse universe)
+    {
+        universe.OnUpdate.AddListener(OnUpdate);
+    }
+
+    protected override void OnExitingUniverse(IUniverse universe)
+    {
+        universe.OnUpdate.RemoveListener(OnUpdate);
+    }
+
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
     {
         for (int i = enumerators.Count - 1; i >= 0; i--)
         {
@@ -29,6 +39,4 @@ public class CoroutineManager : Behaviour, IUpdate
                 enumerators.RemoveAt(i);
         }
     }
-
-    public CoroutineManager() => Priority = int.MinValue;
 }

Engine.Core/Helpers/DelegateExtensions.cs

@@ -0,0 +1,18 @@
+using System;
+
+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.EnumerateInvocationList(@delegate))
+            try { invocation.DynamicInvoke(args); }
+            catch (Exception exception)
+            {
+                string methodCallRepresentation = $"{invocation.Method.DeclaringType?.FullName}.{invocation.Method.Name}({string.Join(", ", args)})";
+                Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
+            }
+    }
+}

Engine.Core/Helpers/Event.cs

@@ -3,95 +3,22 @@ using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
-public class Event
-{
-    private readonly List<EventHandler> listeners = null!;
-    private readonly List<EventHandler> onceListeners = null!;
-
-    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 Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
-    {
-        listeners = new(initialListenerCount);
-        onceListeners = new(initialOnceListenerCount);
-    }
-
-    public Event()
-    {
-        listeners = new(4);
-        onceListeners = new(2);
-    }
-
-    public delegate void EventHandler();
-}
-
 public class Event<TSender>
 {
-    private readonly List<EventHandler> listeners = null!;
-    private readonly List<EventHandler> onceListeners = null!;
+    private readonly List<EventHandler> listeners = new(8);
 
     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)
+    public void Clear() => listeners.Clear();
+    public void Invoke(TSender argument)
     {
         for (int i = 0; i < listeners.Count; i++)
-            try { listeners[i].Invoke(sender); }
+            try { listeners[i].Invoke(argument); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({sender})";
+                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({argument})";
                 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 Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
-    {
-        listeners = new(initialListenerCount);
-        onceListeners = new(initialOnceListenerCount);
-    }
-
-    public Event()
-    {
-        listeners = new(4);
-        onceListeners = new(2);
     }
 
     public delegate void EventHandler(TSender sender);
@@ -99,47 +26,21 @@ public class Event<TSender>
 
 public class Event<TSender, TArguments>
 {
-    private readonly List<EventHandler> listeners = null!;
-    private readonly List<EventHandler> onceListeners = null!;
+    private readonly List<EventHandler> listeners = new(8);
 
     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)
+    public void Clear() => listeners.Clear();
+    public void Invoke(TSender sender, TArguments arguments)
     {
         for (int i = 0; i < listeners.Count; i++)
-            try { listeners[i].Invoke(sender, args); }
+            try { listeners[i].Invoke(sender, arguments); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({string.Join(", ", sender, args)})";
+                string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({string.Join(", ", sender, arguments)})";
                 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 Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
-    {
-        listeners = new(initialListenerCount);
-        onceListeners = new(initialOnceListenerCount);
-    }
-
-    public Event()
-    {
-        listeners = new(4);
-        onceListeners = new(2);
-    }
-
-    public delegate void EventHandler(TSender sender, TArguments args);
+    public delegate void EventHandler(TSender sender, TArguments arguments);
 }

Engine.Core/Helpers/IPool.cs

@@ -1,10 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-public interface IPool<T>
-{
-    Event<IPool<T>, T> OnRemoved { get; }
-    Event<IPool<T>, T> OnReturned { get; }
-
-    T Get();
-    void Return(T item);
-}

Engine.Core/Helpers/ListPool.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Syntriax.Engine.Core;
-
-public class ListPool<T> : IPool<List<T>>
-{
-    public Event<IPool<List<T>>, List<T>> OnReturned { get; } = new();
-    public Event<IPool<List<T>>, List<T>> OnRemoved { get; } = new();
-
-    private readonly Func<List<T>> generator = null!;
-    private readonly Queue<List<T>> queue = new();
-
-    public List<T> Get()
-    {
-        if (!queue.TryDequeue(out List<T>? result))
-            result = generator();
-
-        result.Clear();
-        OnRemoved?.Invoke(this, result);
-        return result;
-    }
-
-    public void Return(List<T> list)
-    {
-        if (queue.Contains(list))
-            return;
-
-        list.Clear();
-        queue.Enqueue(list);
-        OnReturned?.Invoke(this, list);
-    }
-
-    public ListPool(Func<List<T>> generator, int initialCapacity = 1)
-    {
-        this.generator = generator;
-        for (int i = 0; i < initialCapacity; i++)
-            queue.Enqueue(generator());
-    }
-}

Engine.Core/Helpers/Pool.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Syntriax.Engine.Core;
-
-public class Pool<T> : IPool<T>
-{
-    public Event<IPool<T>, T> OnRemoved { get; } = new();
-    public Event<IPool<T>, T> OnReturned { get; } = new();
-
-    private readonly Func<T> generator = null!;
-    private readonly Queue<T> queue = new();
-
-    public T Get()
-    {
-        if (!queue.TryDequeue(out T? result))
-            result = generator();
-
-        OnRemoved?.Invoke(this, result);
-        return result;
-    }
-
-    public void Return(T item)
-    {
-        if (queue.Contains(item))
-            return;
-
-        queue.Enqueue(item);
-        OnReturned?.Invoke(this, item);
-    }
-
-    public Pool(Func<T> generator, int initialCapacity = 1)
-    {
-        this.generator = generator;
-        for (int i = 0; i < initialCapacity; i++)
-            queue.Enqueue(generator());
-    }
-}

Engine.Core/Primitives/Line2D.cs

@@ -167,14 +167,17 @@ public readonly struct Line2D(Vector2D from, Vector2D to)
     /// </summary>
     public static Vector2D ClosestPointTo(Line2D line, Vector2D point)
     {
-        Vector2D lineRelativeVector = line.From.FromTo(line.To);
+        Vector2D edgeVector = line.From.FromTo(line.To);
+        Vector2D pointVector = point - line.From;
 
-        Vector2D lineDirection = lineRelativeVector.Normalized;
-        Vector2D pointVector = line.From.FromTo(point);
+        float t = (pointVector.X * edgeVector.X + pointVector.Y * edgeVector.Y) / (edgeVector.X * edgeVector.X + edgeVector.Y * edgeVector.Y);
 
-        float dot = lineDirection.Dot(pointVector).Clamp(0f, lineRelativeVector.Magnitude);
+        t = Math.Max(0, Math.Min(1, t));
 
-        return lineDirection * dot;
+        float closestX = line.From.X + t * edgeVector.X;
+        float closestY = line.From.Y + t * edgeVector.Y;
+
+        return new Vector2D((float)closestX, (float)closestY);
     }
 
     /// <summary>
@@ -202,9 +205,6 @@ public static class Line2DExtensions
     /// <inheritdoc cref="Line2D.Intersects(Line2D, Vector2D)" />
     public static bool Intersects(this Line2D line, Vector2D point) => Line2D.Intersects(line, point);
 
-    /// <inheritdoc cref="Line2D.IntersectionPoint(Line2D, Line2D)" />
-    public static Vector2D IntersectionPoint(this Line2D left, Line2D right) => Line2D.IntersectionPoint(left, right);
-
     /// <inheritdoc cref="Line2D.GetT(Line2D, Vector2D)" />
     public static float GetT(this Line2D line, Vector2D point) => Line2D.GetT(line, point);
 
@@ -214,9 +214,6 @@ public static class Line2DExtensions
     /// <inheritdoc cref="Line2D.Intersects(Line2D, Line2D, out Vector2D?)" />
     public static bool Intersects(this Line2D left, Line2D right, [NotNullWhen(returnValue: true)] out Vector2D? point) => Line2D.Intersects(left, right, out point);
 
-    /// <inheritdoc cref="Line2D.ClosestPointTo(Line2D, Vector2D)" />
-    public static Vector2D ClosestPointTo(this Line2D line, Vector2D point) => Line2D.ClosestPointTo(line, point);
-
     /// <inheritdoc cref="Line2D.ApproximatelyEquals(Line2D, Line2D, float)" />
     public static bool ApproximatelyEquals(this Line2D left, Line2D right, float epsilon = float.Epsilon) => Line2D.ApproximatelyEquals(left, right, epsilon);
 }

Engine.Core/Primitives/Ray2D.cs

@@ -1,66 +0,0 @@
-namespace Syntriax.Engine.Core;
-
-public readonly struct Ray2D(Vector2D Origin, Vector2D Direction)
-{
-    /// <summary>
-    /// The starting point of the <see cref="Ray2D"/>.
-    /// </summary>
-    public readonly Vector2D Origin = Origin;
-
-    /// <summary>
-    /// The direction in which the <see cref="Ray2D"/> points. Should be a normalized vector.
-    /// </summary>
-    public readonly Vector2D Direction = Direction;
-
-    /// <summary>
-    /// Gets a <see cref="Ray2D"/> with the same origin but with the direction reversed.
-    /// </summary>
-    public readonly Ray2D Reversed => new(Origin, -Direction);
-
-    public static implicit operator Ray2D(Line2D line) => new(line.From, line.From.FromTo(line.To).Normalized);
-
-    /// <summary>
-    /// Constructs a <see cref="Line2D"/> from a <see cref="Ray2D"/>, extending from its origin in the <see cref="Ray2D"/>'s direction for a given distance.
-    /// </summary>
-    /// <param name="ray">The source <see cref="Ray2D"/>.</param>
-    /// <param name="distance">The length of the line segment to create from the <see cref="Ray2D"/>.</param>
-    /// <returns>A <see cref="Line2D"/> representing the segment of the <see cref="Ray2D"/>.</returns>
-    public static Line2D GetLine(Ray2D ray, float distance)
-        => new(ray.Origin, ray.Origin + ray.Direction * distance);
-
-    /// <summary>
-    /// Evaluates the point on the <see cref="Ray2D"/> at a specified distance from its origin.
-    /// </summary>
-    /// <param name="ray">The <see cref="Ray2D"/> to evaluate.</param>
-    /// <param name="distanceFromOrigin">The distance from the origin along the <see cref="Ray2D"/>'s direction.</param>
-    /// <returns>A <see cref="Vector2D"/> representing the point at the given distance on the <see cref="Ray2D"/>.</returns>
-    public static Vector2D Evaluate(Ray2D ray, float distanceFromOrigin)
-        => ray.Origin + ray.Direction * distanceFromOrigin;
-
-    /// <summary>
-    /// Calculates the closest point on the <see cref="Ray2D"/> to the specified point.
-    /// </summary>
-    public static Vector2D ClosestPointTo(Ray2D ray, Vector2D point)
-    {
-        Vector2D originToPoint = ray.Origin.FromTo(point);
-
-        float dot = ray.Direction.Dot(originToPoint);
-
-        return ray.Origin + ray.Direction * dot;
-    }
-}
-
-/// <summary>
-/// Provides extension methods for the <see cref="Ray2D"/> struct.
-/// </summary>
-public static class Ray2DExtensions
-{
-    /// <inheritdoc cref="Ray2D.GetLine(Ray2D, float) />
-    public static Line2D ToLine(this Ray2D ray, float distance) => Ray2D.GetLine(ray, distance);
-
-    /// <inheritdoc cref="Ray2D.Evaluate(Ray2D, float) />
-    public static Vector2D Evaluate(this Ray2D ray, float distanceFromOrigin) => Ray2D.Evaluate(ray, distanceFromOrigin);
-
-    /// <inheritdoc cref="Ray2D.ClosestPointTo(Ray2D, Vector2D) />
-    public static Vector2D ClosestPointTo(this Ray2D ray, Vector2D point) => Ray2D.ClosestPointTo(ray, point);
-}

Engine.Core/Primitives/Shape2D.cs

@@ -256,6 +256,8 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => Vertices.GetEnumerator();
+
+    public readonly record struct ShapeUpdatedArguments(Shape2D shape2D);
 }
 
 /// <summary>

Engine.Core/Primitives/Vector2D.cs

@@ -31,11 +31,6 @@ public readonly struct Vector2D(float x, float y)
     /// </summary>
     public float MagnitudeSquared => LengthSquared(this);
 
-    /// <summary>
-    /// Gets a <see cref="Vector2D"/> with the direction reversed.
-    /// </summary>
-    public readonly Vector2D Reversed => -this;
-
     /// <summary>
     /// The normalized form of the <see cref="Vector2D"/> (a <see cref="Vector2D"/> with the same direction and a magnitude of 1).
     /// </summary>

Engine.Core/Systems/DrawManager.cs

@@ -1,15 +1,13 @@
-using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
-public class DrawManager : Behaviour
+public class DrawManager : UniverseObject
 {
-    // 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 static System.Comparison<IBehaviour> SortByPriority() => (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 readonly ActiveBehaviourCollectorSorted<IPreDraw> preDrawEntities = new() { SortBy = SortByPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IDraw> drawEntities = new() { SortBy = SortByPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPostDraw> postDrawEntities = new() { SortBy = SortByPriority() };
 
     private void OnPreDraw(IUniverse sender)
     {
@@ -29,7 +27,7 @@ public class DrawManager : Behaviour
             postDrawEntities[i].PostDraw();
     }
 
-    protected override void OnEnteredUniverse(IUniverse universe)
+    protected override void OnEnteringUniverse(IUniverse universe)
     {
         preDrawEntities.Assign(universe);
         drawEntities.Assign(universe);
@@ -40,7 +38,7 @@ public class DrawManager : Behaviour
         universe.OnPostDraw.AddListener(OnPostDraw);
     }
 
-    protected override void OnExitedUniverse(IUniverse universe)
+    protected override void OnExitingUniverse(IUniverse universe)
     {
         preDrawEntities.Unassign();
         drawEntities.Unassign();

Engine.Core/Systems/UpdateManager.cs

@@ -1,20 +1,20 @@
+
 using System.Collections.Generic;
 
 namespace Syntriax.Engine.Core;
 
-public class UpdateManager : Behaviour
+public class UpdateManager : UniverseObject
 {
-    // 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 static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.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 ActiveBehaviourCollectorSorted<IFirstFrameUpdate> firstFrameUpdates = new() { SortBy = SortByPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPreUpdate> preUpdateEntities = new() { SortBy = SortByPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IUpdate> updateEntities = new() { SortBy = SortByPriority() };
+    private readonly ActiveBehaviourCollectorSorted<IPostUpdate> postUpdateEntities = new() { SortBy = SortByPriority() };
 
     private readonly List<IFirstFrameUpdate> toCallFirstFrameUpdates = new(32);
 
-    protected override void OnEnteredUniverse(IUniverse universe)
+    protected override void OnEnteringUniverse(IUniverse universe)
     {
         firstFrameUpdates.Assign(universe);
         preUpdateEntities.Assign(universe);
@@ -26,7 +26,7 @@ public class UpdateManager : Behaviour
         universe.OnPostUpdate.AddListener(OnPostUpdate);
     }
 
-    protected override void OnExitedUniverse(IUniverse universe)
+    protected override void OnExitingUniverse(IUniverse universe)
     {
         firstFrameUpdates.Unassign();
         preUpdateEntities.Unassign();
@@ -38,7 +38,7 @@ public class UpdateManager : Behaviour
         universe.OnPostUpdate.RemoveListener(OnPostUpdate);
     }
 
-    private void OnPreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    private void OnPreUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
     {
         for (int i = toCallFirstFrameUpdates.Count - 1; i >= 0; i--)
         {
@@ -50,21 +50,21 @@ public class UpdateManager : Behaviour
             preUpdateEntities[i].PreUpdate();
     }
 
-    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
     {
         for (int i = updateEntities.Count - 1; i >= 0; i--)
             updateEntities[i].Update();
     }
 
-    private void OnPostUpdate(IUniverse sender, IUniverse.UpdateArguments args)
+    private void OnPostUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
     {
         for (int i = postUpdateEntities.Count - 1; i >= 0; i--)
             postUpdateEntities[i].PostUpdate();
     }
 
-    private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IBehaviourCollector<IFirstFrameUpdate>.BehaviourCollectedArguments args)
+    private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IBehaviourCollector<IFirstFrameUpdate>.BehaviourCollectedArguments arguments)
     {
-        toCallFirstFrameUpdates.Add(args.BehaviourCollected);
+        toCallFirstFrameUpdates.Add(arguments.BehaviourCollected);
     }
 
     public UpdateManager()

Engine.Core/Transform2D.cs

@@ -19,11 +19,6 @@ public class Transform2D : Behaviour, ITransform2D
 
     private ITransform2D? parentTransform = null;
 
-    public Vector2D Up => Vector2D.Up.Rotate(Rotation * Math.DegreeToRadian);
-    public Vector2D Down => Vector2D.Down.Rotate(Rotation * Math.DegreeToRadian);
-    public Vector2D Left => Vector2D.Left.Rotate(Rotation * Math.DegreeToRadian);
-    public Vector2D Right => Vector2D.Right.Rotate(Rotation * Math.DegreeToRadian);
-
     public Vector2D Position
     {
         get => _position;
@@ -123,17 +118,17 @@ public class Transform2D : Behaviour, ITransform2D
         }
     }
 
-    private void RecalculatePosition(ITransform2D _, ITransform2D.PositionChangedArguments args)
+    private void RecalculatePosition(ITransform2D _, ITransform2D.PositionChangedArguments arguments)
     {
         if (parentTransform is null)
             return;
 
         UpdatePosition();
 
-        OnPositionChanged?.Invoke(this, args);
+        OnPositionChanged?.Invoke(this, arguments);
     }
 
-    private void RecalculateScale(ITransform2D _, ITransform2D.ScaleChangedArguments args)
+    private void RecalculateScale(ITransform2D _, ITransform2D.ScaleChangedArguments arguments)
     {
         if (parentTransform is null)
             return;
@@ -143,11 +138,11 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateScale();
         UpdatePosition();
 
-        OnScaleChanged?.Invoke(this, args);
+        OnScaleChanged?.Invoke(this, arguments);
         OnPositionChanged?.Invoke(this, new(previousPosition));
     }
 
-    private void RecalculateRotation(ITransform2D _, ITransform2D.RotationChangedArguments args)
+    private void RecalculateRotation(ITransform2D _, ITransform2D.RotationChangedArguments arguments)
     {
         if (parentTransform is null)
             return;
@@ -157,7 +152,7 @@ public class Transform2D : Behaviour, ITransform2D
         UpdateRotation();
         UpdatePosition();
 
-        OnRotationChanged?.Invoke(this, args);
+        OnRotationChanged?.Invoke(this, arguments);
         OnPositionChanged?.Invoke(this, new(previousPosition));
     }
 
@@ -257,16 +252,16 @@ public class Transform2D : Behaviour, ITransform2D
         OnRotationChanged?.Invoke(this, new(Rotation));
     }
 
-    private void LookForTransform2D(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
+    private void LookForTransform2D(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments arguments)
     {
-        if (args.BehaviourAdded is not ITransform2D)
+        if (arguments.BehaviourAdded is not ITransform2D)
             return;
 
         UpdateReferences(UniverseObject.Parent);
     }
 
-    private void OnParentChanged(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
+    private void OnParentChanged(IUniverseObject sender, IUniverseObject.ParentChangedArguments arguments)
     {
-        UpdateReferences(args.CurrentParent);
+        UpdateReferences(arguments.CurrentParent);
     }
 }

Engine.Core/Universe.cs

@@ -17,16 +17,16 @@ public class Universe : BaseEntity, IUniverse
     public Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments> OnUniverseObjectUnRegistered { get; } = new();
     public Event<IUniverse, IUniverse.TimeScaleChangedArguments> OnTimeScaleChanged { get; } = new();
 
-    private readonly Event<IInitializable>.EventHandler delegateOnUniverseObjectFinalize = null!;
-    private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateOnUniverseObjectExitedUniverse = null!;
+    private readonly Event<IInitializable>.EventHandler cachedOnUniverseObjectFinalize = null!;
+    private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler cachedOnUniverseObjectExitedUniverse = null!;
 
     private readonly List<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL);
     private float _timeScale = 1f;
 
     public Universe()
     {
-        delegateOnUniverseObjectFinalize = OnUniverseObjectFinalize;
-        delegateOnUniverseObjectExitedUniverse = OnUniverseObjectExitedUniverse;
+        cachedOnUniverseObjectFinalize = OnUniverseObjectFinalize;
+        cachedOnUniverseObjectExitedUniverse = OnUniverseObjectExitedUniverse;
     }
 
     public IReadOnlyList<IUniverseObject> UniverseObjects => _universeObjects;
@@ -53,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.AddListener(delegateOnUniverseObjectFinalize);
-        universeObject.OnExitedUniverse.AddListener(delegateOnUniverseObjectExitedUniverse);
+        universeObject.OnFinalized.AddListener(cachedOnUniverseObjectFinalize);
+        universeObject.OnExitedUniverse.AddListener(cachedOnUniverseObjectExitedUniverse);
 
         if (!universeObject.Initialize())
             throw new Exception($"{universeObject.Name} can't be initialized");
@@ -88,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.RemoveListener(delegateOnUniverseObjectFinalize);
-        universeObject.OnExitedUniverse.RemoveListener(delegateOnUniverseObjectExitedUniverse);
+        universeObject.OnFinalized.RemoveListener(cachedOnUniverseObjectFinalize);
+        universeObject.OnExitedUniverse.RemoveListener(cachedOnUniverseObjectExitedUniverse);
 
         for (int i = universeObject.Children.Count - 1; i >= 0; i--)
             Remove(universeObject.Children[i]);
@@ -145,7 +145,7 @@ public class Universe : BaseEntity, IUniverse
             Remove(universeObject);
     }
 
-    private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args)
+    private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments arguments)
     {
         if (sender is IUniverseObject universeObject)
             Remove(universeObject);

Engine.Core/UniverseObject.cs

@@ -135,8 +135,8 @@ public class UniverseObject : BaseEntity, IUniverseObject
         stateEnable.OnEnabledChanged.AddListener(OnStateEnabledChanged);
     }
 
-    private void OnParentActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
-    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
+    private void OnParentActiveChanged(IActive sender, IActive.ActiveChangedArguments arguments) => UpdateActive();
+    private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments arguments) => UpdateActive();
 
     private void UpdateActive()
     {

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

@@ -1,8 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -1,110 +0,0 @@
-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

@@ -1,109 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,16 +0,0 @@
-<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

@@ -1,52 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,74 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -44,7 +44,7 @@ public interface ICollider2D : IBehaviour
     void Resolve(CollisionDetectionInformation collisionDetectionInformation);
     void Trigger(ICollider2D initiator);
 
-    readonly record struct CollisionDetectedArguments(ICollider2D Sender, CollisionDetectionInformation CollisionDetectionInformation);
-    readonly record struct CollisionResolvedArguments(ICollider2D Sender, CollisionDetectionInformation CollisionDetectionInformation);
-    readonly record struct TriggeredArguments(ICollider2D Sender, ICollider2D InitiatorCollider);
+    readonly record struct CollisionDetectedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    readonly record struct CollisionResolvedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    readonly record struct TriggeredArguments(ICollider2D sender, ICollider2D initiatorCollider);
 }

Engine.Physics2D/Abstract/IPhysicsEngine2D.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Physics2D;
@@ -37,26 +35,6 @@ public interface IPhysicsEngine2D
     /// <param name="deltaTime">The time step.</param>
     void StepIndividual(IRigidBody2D rigidBody, float deltaTime);
 
-    /// <summary>
-    /// Casts a <see cref="Ray2D"/> into the scene and returns the closest <see cref="RaycastResult"/> it hits, if any.
-    /// </summary>
-    /// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
-    /// <param name="length">The maximum distance to check for intersections. Defaults to <see cref="float.MaxValue"/>.</param>
-    /// <returns>
-    /// A <see cref="RaycastResult"/> containing information about the hit, or <see cref="null"/> if no hit was detected.
-    /// </returns>
-    RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue);
-
-    /// <summary>
-    /// Casts a <see cref="Ray2D"/> into the scene and stores all hit results in the provided list.
-    /// </summary>
-    /// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
-    /// <param name="results">
-    /// A list to which all <see cref="RaycastResult"/>s will be added. The list will be populated with zero or more <see cref="RaycastResult"/> objects.
-    /// </param>
-    /// <param name="length">The maximum distance to check for intersections. Defaults to <see cref="float.MaxValue"/>.</param>
-    void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue);
-
-    readonly record struct PhysicsIterationArguments(IPhysicsEngine2D Sender, float IterationDeltaTime);
-    readonly record struct PhysicsStepArguments(IPhysicsEngine2D Sender, float StepDeltaTime);
+    readonly record struct PhysicsIterationArguments(IPhysicsEngine2D sender, float iterationDeltaTime);
+    readonly record struct PhysicsStepArguments(IPhysicsEngine2D sender, float stepDeltaTime);
 }

Engine.Physics2D/Abstract/IRaycastResolver2D.cs

@@ -1,23 +0,0 @@
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-/// <summary>
-/// Represents a 2D raycast resolver.
-/// </summary>
-public interface IRaycastResolver2D
-{
-    /// <summary>
-    /// Casts a <see cref="Ray2D"/> against a specific <see cref="ICollider2D"/> shape and returns the first hit, if any.
-    /// </summary>
-    /// <typeparam name="T">The type of the <see cref="ICollider2D"/>, which must implement <see cref="ICollider2D"/>.</typeparam>
-    /// <param name="shape">The <see cref="ICollider2D"/> shape to test against.</param>
-    /// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
-    /// <param name="length">
-    /// The maximum distance to check along the <see cref="Ray2D"/>. Defaults to <see cref="float.MaxValue"/>.
-    /// </param>
-    /// <returns>
-    /// A <see cref="RaycastResult"/> containing information about the intersection, or <see cref="null"/> if there was no hit.
-    /// </returns>
-    RaycastResult? RaycastAgainst<T>(T shape, Ray2D ray, float length = float.MaxValue) where T : ICollider2D;
-}

Engine.Physics2D/Abstract/RaycastResult.cs

@@ -1,14 +0,0 @@
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-public readonly struct RaycastResult(Ray2D ray, ICollider2D collider2D, Vector2D position, Vector2D normal)
-{
-    public readonly Ray2D Ray = ray;
-
-    public readonly Vector2D Position = position;
-    public readonly Vector2D Normal = normal;
-
-    public readonly ICollider2D Collider2D = collider2D;
-    public readonly RigidBody2D? RigidBody2D = collider2D.BehaviourController.GetBehaviourInParent<RigidBody2D>();
-}

Engine.Physics2D/Abstract/Updates/IPhysicsIteration.cs

@@ -1,15 +0,0 @@
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-/// <summary>
-/// Represents a <see cref="IBehaviour"/> that listens to physics simulation update phase.
-/// </summary>
-public interface IPhysicsIteration : IBehaviour
-{
-    /// <summary>
-    /// Iterates the physics state of the object based on the elapsed time since the last iteration.
-    /// </summary>
-    /// <param name="delta">The time elapsed since the last physics iteration.</param>
-    void PhysicsIterate(float delta);
-}

Engine.Physics2D/Abstract/Updates/IPhysicsUpdate.cs

@@ -10,6 +10,6 @@ public interface IPhysicsUpdate : IBehaviour
     /// <summary>
     /// Updates the physics state of the object based on the elapsed time since the last update.
     /// </summary>
-    /// <param name="delta">The time elapsed since the last physics update.</param>
+    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
     void PhysicsUpdate(float delta);
 }

Engine.Physics2D/Abstract/Updates/IPostPhysicsUpdate.cs

@@ -10,6 +10,6 @@ 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.</param>
+    /// <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

@@ -10,6 +10,6 @@ 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.</param>
+    /// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
     void PrePhysicsUpdate(float delta);
 }

Engine.Physics2D/Collider2DBehaviourBase.cs

@@ -8,24 +8,24 @@ public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
     public Event<ICollider2D, CollisionDetectionInformation> OnCollisionResolved { get; } = new();
     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!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler cachedOnBehaviourAddedToController = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler cachedOnBehaviourRemovedFromController = null!;
+    private readonly Event<ITransform2D, ITransform2D.PositionChangedArguments>.EventHandler cachedSetNeedsRecalculationFromPosition = null!;
+    private readonly Event<ITransform2D, ITransform2D.RotationChangedArguments>.EventHandler cachedSetNeedsRecalculationFromRotation = null!;
+    private readonly Event<ITransform2D, ITransform2D.ScaleChangedArguments>.EventHandler cachedSetNeedsRecalculationFromScale = null!;
+    private readonly Event<IUniverseObject, IUniverseObject.ParentChangedArguments>.EventHandler cachedUpdateRigidBody2D = 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;
+        cachedOnBehaviourAddedToController = OnBehaviourAddedToController;
+        cachedOnBehaviourRemovedFromController = OnBehaviourRemovedFromController;
+        cachedSetNeedsRecalculationFromPosition = SetNeedsRecalculationFromPosition;
+        cachedSetNeedsRecalculationFromRotation = SetNeedsRecalculationFromRotation;
+        cachedSetNeedsRecalculationFromScale = SetNeedsRecalculationFromScale;
+        cachedUpdateRigidBody2D = UpdateRigidBody2D;
     }
 
     public IRigidBody2D? RigidBody2D => _rigidBody2D;
@@ -44,50 +44,46 @@ public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
 
     protected override void OnInitialize()
     {
-        base.OnInitialize();
-
         BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
 
-        BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAddedToController);
-        BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemovedFromController);
+        BehaviourController.OnBehaviourAdded.AddListener(cachedOnBehaviourAddedToController);
+        BehaviourController.OnBehaviourRemoved.AddListener(cachedOnBehaviourRemovedFromController);
 
-        Transform.OnPositionChanged.AddListener(delegateSetNeedsRecalculationFromPosition);
-        Transform.OnRotationChanged.AddListener(delegateSetNeedsRecalculationFromRotation);
-        Transform.OnScaleChanged.AddListener(delegateSetNeedsRecalculationFromScale);
-        UniverseObject.OnParentChanged.AddListener(delegateUpdateRigidBody2D);
+        Transform.OnPositionChanged.AddListener(cachedSetNeedsRecalculationFromPosition);
+        Transform.OnRotationChanged.AddListener(cachedSetNeedsRecalculationFromRotation);
+        Transform.OnScaleChanged.AddListener(cachedSetNeedsRecalculationFromScale);
+        UniverseObject.OnParentChanged.AddListener(cachedUpdateRigidBody2D);
     }
 
-    private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
+    private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject.ParentChangedArguments arguments)
     {
         BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
     }
 
-    private void OnBehaviourAddedToController(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
+    private void OnBehaviourAddedToController(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments arguments)
     {
-        if (args.BehaviourAdded is IRigidBody2D rigidBody)
+        if (arguments.BehaviourAdded is IRigidBody2D rigidBody)
             _rigidBody2D = rigidBody;
     }
 
-    private void OnBehaviourRemovedFromController(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
+    private void OnBehaviourRemovedFromController(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments arguments)
     {
-        if (args.BehaviourRemoved is IRigidBody2D)
+        if (arguments.BehaviourRemoved is IRigidBody2D)
             _rigidBody2D = null;
     }
 
-    private void SetNeedsRecalculationFromPosition(ITransform2D sender, ITransform2D.PositionChangedArguments args) => NeedsRecalculation = true;
-    private void SetNeedsRecalculationFromScale(ITransform2D sender, ITransform2D.ScaleChangedArguments args) => NeedsRecalculation = true;
-    private void SetNeedsRecalculationFromRotation(ITransform2D sender, ITransform2D.RotationChangedArguments args) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromPosition(ITransform2D sender, ITransform2D.PositionChangedArguments arguments) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromScale(ITransform2D sender, ITransform2D.ScaleChangedArguments arguments) => NeedsRecalculation = true;
+    private void SetNeedsRecalculationFromRotation(ITransform2D sender, ITransform2D.RotationChangedArguments arguments) => NeedsRecalculation = true;
 
     protected override void OnFinalize()
     {
-        base.OnFinalize();
+        BehaviourController.OnBehaviourAdded.RemoveListener(cachedOnBehaviourAddedToController);
+        BehaviourController.OnBehaviourRemoved.RemoveListener(cachedOnBehaviourRemovedFromController);
+        Transform.OnScaleChanged.RemoveListener(cachedSetNeedsRecalculationFromScale);
 
-        BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAddedToController);
-        BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemovedFromController);
-        Transform.OnScaleChanged.RemoveListener(delegateSetNeedsRecalculationFromScale);
-
-        Transform.OnPositionChanged.RemoveListener(delegateSetNeedsRecalculationFromPosition);
-        Transform.OnRotationChanged.RemoveListener(delegateSetNeedsRecalculationFromRotation);
+        Transform.OnPositionChanged.RemoveListener(cachedSetNeedsRecalculationFromPosition);
+        Transform.OnRotationChanged.RemoveListener(cachedSetNeedsRecalculationFromRotation);
     }
 
     public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation);

Engine.Physics2D/PhysicsCoroutineManager.cs

@@ -5,9 +5,12 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Physics2D;
 
-public class PhysicsCoroutineManager : Behaviour, IPhysicsUpdate
+public class PhysicsCoroutineManager : UniverseObject
 {
+    private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler cachedOnUpdate = null!;
+
     private readonly List<IEnumerator> enumerators = [];
+    private IPhysicsEngine2D? physicsEngine = null;
 
     public IEnumerator CreateCoroutine(IEnumerator enumerator)
     {
@@ -20,7 +23,16 @@ public class PhysicsCoroutineManager : Behaviour, IPhysicsUpdate
         enumerators.Remove(enumerator);
     }
 
-    public void PhysicsUpdate(float delta)
+    protected override void OnEnteringUniverse(IUniverse universe)
+    {
+        physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
+        if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
+            foundPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
+        else
+            universe.OnUpdate.AddListener(OnUpdate);
+    }
+
+    private void OnPhysicsStep(IPhysicsEngine2D sender, float stepDeltaTime)
     {
         for (int i = enumerators.Count - 1; i >= 0; i--)
         {
@@ -32,5 +44,28 @@ public class PhysicsCoroutineManager : Behaviour, IPhysicsUpdate
         }
     }
 
-    public PhysicsCoroutineManager() => Priority = int.MinValue;
+    protected override void OnExitingUniverse(IUniverse universe)
+    {
+        if (physicsEngine is IPhysicsEngine2D existingPhysicsEngine)
+            existingPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
+        universe.OnUpdate.RemoveListener(OnUpdate);
+    }
+
+    private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
+    {
+        if (Universe is not IUniverse universe)
+            return;
+
+        physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
+        if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
+        {
+            foundPhysicsEngine.OnPhysicsStep.AddListener(OnPhysicsStep);
+            universe.OnUpdate.RemoveListener(OnUpdate);
+        }
+    }
+
+    public PhysicsCoroutineManager()
+    {
+        cachedOnUpdate = OnUpdate;
+    }
 }

Engine.Physics2D/PhysicsEngine2D.cs

@@ -1,68 +1,31 @@
-using System.Collections.Generic;
-
 using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Physics2D;
 
-public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
+public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
 {
     public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
     public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
 
+    private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler cachedOnPreUpdate = null!;
+
     private float physicsTicker = 0f;
     private int _iterationPerStep = 1;
     private float _iterationPeriod = 1f / 60f;
 
     protected readonly ICollisionDetector2D collisionDetector = null!;
     protected readonly ICollisionResolver2D collisionResolver = null!;
-    protected readonly IRaycastResolver2D raycastResolver = null!;
 
-    private static Comparer<IBehaviour> SortByPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
+    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
     protected ActiveBehaviourCollectorSorted<IPrePhysicsUpdate> physicsPreUpdateCollector = new() { SortBy = SortByPriority() };
     protected ActiveBehaviourCollectorSorted<IPhysicsUpdate> physicsUpdateCollector = new() { SortBy = SortByPriority() };
-    protected ActiveBehaviourCollectorSorted<IPhysicsIteration> physicsIterationCollector = new() { SortBy = SortByPriority() };
     protected ActiveBehaviourCollectorSorted<IPostPhysicsUpdate> physicsPostUpdateCollector = new() { SortBy = SortByPriority() };
     protected BehaviourCollector<IRigidBody2D> rigidBodyCollector = new();
     protected BehaviourCollector<ICollider2D> colliderCollector = new();
 
-    private readonly ListPool<ICollider2D> colliderPool = new(() => new(32));
-    private readonly ListPool<IPrePhysicsUpdate> prePhysicsUpdatePool = new(() => new(32));
-    private readonly ListPool<IPhysicsUpdate> physicsUpdatePool = new(() => new(32));
-    private readonly ListPool<IPhysicsIteration> physicsIterationPool = new(() => new(32));
-    private readonly ListPool<IPostPhysicsUpdate> postPhysicsUpdatePool = new(() => new(32));
-
     public int IterationPerStep { get => _iterationPerStep; set => _iterationPerStep = value < 1 ? 1 : value; }
     public float IterationPeriod { get => _iterationPeriod; set => _iterationPeriod = value.Max(0.0001f); }
 
-    public RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue)
-    {
-        RaycastResult? closestResult = null;
-        float closestDistance = float.MaxValue;
-
-        for (int i = 0; i < colliderCollector.Count; i++)
-            if (raycastResolver.RaycastAgainst(colliderCollector[i], ray, length) is RaycastResult raycastResult)
-            {
-                float magnitudeSquared = raycastResult.Position.FromTo(ray.Origin).MagnitudeSquared;
-
-                if (magnitudeSquared > closestDistance)
-                    continue;
-
-                closestDistance = magnitudeSquared;
-                closestResult = raycastResult;
-            }
-
-        return closestResult;
-    }
-
-    public void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue)
-    {
-        results.Clear();
-
-        for (int i = 0; i < colliderCollector.Count; i++)
-            if (raycastResolver.RaycastAgainst(colliderCollector[i], ray, length) is RaycastResult raycastResult)
-                results.Add(raycastResult);
-    }
-
     public void Step(float deltaTime)
     {
         float intervalDeltaTime = deltaTime / IterationPerStep;
@@ -75,9 +38,6 @@ public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
 
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
-            for (int i = physicsIterationCollector.Count - 1; i >= 0; i--)
-                physicsIterationCollector[i].PhysicsIterate(intervalDeltaTime);
-
             // Can Parallel
             for (int i = rigidBodyCollector.Count - 1; i >= 0; i--)
                 StepRigidBody(rigidBodyCollector[i], intervalDeltaTime);
@@ -117,29 +77,24 @@ public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
     {
         float intervalDeltaTime = deltaTime / IterationPerStep;
 
-        List<ICollider2D> childColliders = colliderPool.Get();
-        List<IPrePhysicsUpdate> physicsPreUpdates = prePhysicsUpdatePool.Get();
-        List<IPhysicsUpdate> physicsUpdates = physicsUpdatePool.Get();
-        List<IPhysicsIteration> physicsIterations = physicsIterationPool.Get();
-        List<IPostPhysicsUpdate> physicsPostUpdates = postPhysicsUpdatePool.Get();
+        System.Collections.Generic.List<ICollider2D> childColliders = [];
+        System.Collections.Generic.List<IPrePhysicsUpdate> physicsPreUpdates = [];
+        System.Collections.Generic.List<IPhysicsUpdate> physicsUpdates = [];
+        System.Collections.Generic.List<IPostPhysicsUpdate> physicsPostUpdates = [];
 
         rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsIterations);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
 
-        for (int i = physicsPreUpdates.Count - 1; i >= 0; i--)
-            physicsPreUpdates[i].PrePhysicsUpdate(deltaTime);
+        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
+            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
 
-        for (int i = physicsUpdates.Count - 1; i >= 0; i--)
-            physicsUpdates[i].PhysicsUpdate(deltaTime);
+        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
+            physicsUpdate.PhysicsUpdate(deltaTime);
 
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
-            for (int i = physicsIterations.Count - 1; i >= 0; i--)
-                physicsIterations[i].PhysicsIterate(intervalDeltaTime);
-
             StepRigidBody(rigidBody, intervalDeltaTime);
 
             for (int i = childColliders.Count - 1; i >= 0; i--)
@@ -163,14 +118,8 @@ public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
             }
         }
 
-        for (int i = physicsPostUpdates.Count - 1; i >= 0; i--)
-            physicsPostUpdates[i].PostPhysicsUpdate(deltaTime);
-
-        colliderPool.Return(childColliders);
-        prePhysicsUpdatePool.Return(physicsPreUpdates);
-        physicsUpdatePool.Return(physicsUpdates);
-        physicsIterationPool.Return(physicsIterations);
-        postPhysicsUpdatePool.Return(physicsPostUpdates);
+        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
+            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
     }
 
     private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
@@ -223,29 +172,31 @@ public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
         rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
     }
 
-    protected override void OnEnteredUniverse(IUniverse universe)
+    protected override void OnEnteringUniverse(IUniverse universe)
     {
         physicsPreUpdateCollector.Assign(universe);
         physicsUpdateCollector.Assign(universe);
-        physicsIterationCollector.Assign(universe);
         physicsPostUpdateCollector.Assign(universe);
         colliderCollector.Assign(universe);
         rigidBodyCollector.Assign(universe);
+
+        universe.OnPreUpdate.AddListener(OnEnginePreUpdate);
     }
 
-    protected override void OnExitedUniverse(IUniverse universe)
+    protected override void OnExitingUniverse(IUniverse universe)
     {
         physicsPreUpdateCollector.Unassign();
         physicsUpdateCollector.Unassign();
-        physicsIterationCollector.Unassign();
         physicsPostUpdateCollector.Unassign();
         colliderCollector.Unassign();
         rigidBodyCollector.Unassign();
+
+        universe.OnPreUpdate.RemoveListener(OnEnginePreUpdate);
     }
 
-    void IPreUpdate.PreUpdate()
+    private void OnEnginePreUpdate(IUniverse sender, IUniverse.UpdateArguments arguments)
     {
-        physicsTicker += Universe.Time.DeltaTime;
+        physicsTicker += arguments.EngineTime.DeltaTime;
 
         while (physicsTicker >= IterationPeriod)
         {
@@ -258,15 +209,15 @@ public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
     {
         collisionDetector = new CollisionDetector2D();
         collisionResolver = new CollisionResolver2D();
-        raycastResolver = new RaycastResolver2D();
-        Priority = int.MaxValue;
+
+        cachedOnPreUpdate = OnEnginePreUpdate;
     }
 
-    public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver, IRaycastResolver2D raycastResolver)
+    public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
     {
         this.collisionDetector = collisionDetector;
         this.collisionResolver = collisionResolver;
-        this.raycastResolver = raycastResolver;
-        Priority = int.MaxValue;
+
+        cachedOnPreUpdate = OnEnginePreUpdate;
     }
 }

Engine.Physics2D/PhysicsEngine2DStandalone.cs

@@ -9,8 +9,8 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
     public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
     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 Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler cachedOnBehaviourAdded = null!;
+    private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler cachedOnBehaviourRemoved = null!;
 
     private readonly List<IRigidBody2D> rigidBodies = new(32);
     private readonly List<ICollider2D> colliders = new(64);
@@ -19,7 +19,6 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
 
     private readonly ICollisionDetector2D collisionDetector = null!;
     private readonly ICollisionResolver2D collisionResolver = null!;
-    private readonly IRaycastResolver2D raycastResolver = null!;
 
     public int IterationPerStep { get => _iterationCount; set => _iterationCount = value < 1 ? 1 : value; }
 
@@ -33,44 +32,16 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         foreach (ICollider2D collider2D in rigidBody.BehaviourController.GetBehaviours<ICollider2D>())
             colliders.Add(collider2D);
 
-        rigidBody.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
-        rigidBody.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
+        rigidBody.BehaviourController.OnBehaviourAdded.AddListener(cachedOnBehaviourAdded);
+        rigidBody.BehaviourController.OnBehaviourRemoved.AddListener(cachedOnBehaviourRemoved);
     }
 
     public void RemoveRigidBody(IRigidBody2D rigidBody)
     {
         rigidBodies.Remove(rigidBody);
 
-        rigidBody.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
-        rigidBody.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
-    }
-    public RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue)
-    {
-        RaycastResult? closestResult = null;
-        float closestDistance = float.MaxValue;
-
-        for (int i = 0; i < colliders.Count; i++)
-            if (raycastResolver.RaycastAgainst(colliders[i], ray, length) is RaycastResult raycastResult)
-            {
-                float magnitudeSquared = raycastResult.Position.FromTo(ray.Origin).MagnitudeSquared;
-
-                if (magnitudeSquared > closestDistance)
-                    continue;
-
-                closestDistance = magnitudeSquared;
-                closestResult = raycastResult;
-            }
-
-        return closestResult;
-    }
-
-    public void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue)
-    {
-        results.Clear();
-
-        for (int i = 0; i < colliders.Count; i++)
-            if (raycastResolver.RaycastAgainst(colliders[i], ray, length) is RaycastResult raycastResult)
-                results.Add(raycastResult);
+        rigidBody.BehaviourController.OnBehaviourAdded.RemoveListener(cachedOnBehaviourAdded);
+        rigidBody.BehaviourController.OnBehaviourRemoved.RemoveListener(cachedOnBehaviourRemoved);
     }
 
     public void Step(float deltaTime)
@@ -115,30 +86,25 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         List<ICollider2D> childColliders = [];
         List<IPrePhysicsUpdate> physicsPreUpdates = [];
         List<IPhysicsUpdate> physicsUpdates = [];
-        List<IPhysicsIteration> physicsIterations = [];
         List<IPostPhysicsUpdate> physicsPostUpdates = [];
 
         rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
-        rigidBody.BehaviourController.GetBehavioursInChildren(physicsIterations);
         rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
 
-        for (int i = physicsPreUpdates.Count - 1; i >= 0; i--)
-            physicsPreUpdates[i].PrePhysicsUpdate(deltaTime);
+        foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
+            physicsPreUpdate.PrePhysicsUpdate(deltaTime);
 
-        for (int i = physicsUpdates.Count - 1; i >= 0; i--)
-            physicsUpdates[i].PhysicsUpdate(deltaTime);
+        foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
+            physicsUpdate.PhysicsUpdate(deltaTime);
 
         for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
         {
-            for (int i = physicsIterations.Count - 1; i >= 0; i--)
-                physicsIterations[i].PhysicsIterate(intervalDeltaTime);
-
             StepRigidBody(rigidBody, intervalDeltaTime);
 
-            for (int i = childColliders.Count - 1; i >= 0; i--)
-                childColliders[i].Recalculate();
+            foreach (ICollider2D collider in childColliders)
+                collider.Recalculate();
 
             for (int x = 0; x < childColliders.Count; x++)
             {
@@ -158,8 +124,8 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
             }
         }
 
-        for (int i = physicsPostUpdates.Count - 1; i >= 0; i--)
-            physicsPostUpdates[i].PostPhysicsUpdate(deltaTime);
+        foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
+            physicsPostUpdate.PostPhysicsUpdate(deltaTime);
     }
 
     private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
@@ -212,17 +178,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
         rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
     }
 
-    private void OnBehaviourAdded(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
+    private void OnBehaviourAdded(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments arguments)
     {
-        if (args.BehaviourAdded is not ICollider2D collider2D)
+        if (arguments.BehaviourAdded is not ICollider2D collider2D)
             return;
 
         colliders.Add(collider2D);
     }
 
-    private void OnBehaviourRemoved(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
+    private void OnBehaviourRemoved(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments arguments)
     {
-        if (args.BehaviourRemoved is not ICollider2D collider2D)
+        if (arguments.BehaviourRemoved is not ICollider2D collider2D)
             return;
 
         colliders.Remove(collider2D);
@@ -232,19 +198,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
     {
         collisionDetector = new CollisionDetector2D();
         collisionResolver = new CollisionResolver2D();
-        raycastResolver = new RaycastResolver2D();
 
-        delegateOnBehaviourAdded = OnBehaviourAdded;
-        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        cachedOnBehaviourAdded = OnBehaviourAdded;
+        cachedOnBehaviourRemoved = OnBehaviourRemoved;
     }
 
-    public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver, IRaycastResolver2D raycastResolver)
+    public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
     {
         this.collisionDetector = collisionDetector;
         this.collisionResolver = collisionResolver;
-        this.raycastResolver = raycastResolver;
 
-        delegateOnBehaviourAdded = OnBehaviourAdded;
-        delegateOnBehaviourRemoved = OnBehaviourRemoved;
+        cachedOnBehaviourAdded = OnBehaviourAdded;
+        cachedOnBehaviourRemoved = OnBehaviourRemoved;
     }
 }

Engine.Physics2D/RaycastResolver2D.cs

@@ -1,100 +0,0 @@
-using System.Collections.Generic;
-
-using Syntriax.Engine.Core;
-
-namespace Syntriax.Engine.Physics2D;
-
-public class RaycastResolver2D : IRaycastResolver2D
-{
-    private readonly ListPool<Line2D> lineCacheQueue = new(() => new(4));
-
-    RaycastResult? IRaycastResolver2D.RaycastAgainst<T>(T shape, Ray2D ray, float length)
-    {
-        if (shape is IShapeCollider2D shapeCollider)
-            return RaycastAgainstShape(shapeCollider, ray, length);
-        else if (shape is ICircleCollider2D circleCollider)
-            return RaycastAgainstCircle(circleCollider, ray, length);
-
-        throw new System.NotSupportedException($"{shape.GetType().FullName} is not supported by {GetType().FullName}. Please implement a {nameof(IRaycastResolver2D)} and use it as the raycast resolver.");
-    }
-
-    public RaycastResult? RaycastAgainstShape(IShapeCollider2D shapeCollider, Ray2D ray, float length)
-    {
-        List<Line2D> line2Ds = lineCacheQueue.Get();
-
-        RaycastResult? raycastResult = null;
-        float closestRaycastResultSquared = float.MaxValue;
-
-        shapeCollider.ShapeWorld.ToLines(line2Ds);
-
-        Line2D rayLine = ray.ToLine(length);
-
-        foreach (Line2D line in line2Ds)
-        {
-            if (line.Intersects(rayLine))
-            {
-                Vector2D hitPosition = line.IntersectionPoint(rayLine);
-
-                float hitDistanceSquared = ray.Origin.FromTo(hitPosition).MagnitudeSquared;
-
-                if (closestRaycastResultSquared < hitDistanceSquared)
-                    continue;
-
-                closestRaycastResultSquared = hitDistanceSquared;
-
-                Vector2D lineDirection = line.Direction;
-
-                Vector2D normal1 = lineDirection.Perpendicular();
-                Vector2D normal2 = -lineDirection.Perpendicular();
-
-                float normalDot1 = rayLine.Direction.Dot(normal1);
-                float normalDot2 = rayLine.Direction.Dot(normal2);
-
-                Vector2D hitNormal = normalDot1 < normalDot2 ? normal1 : normal2;
-
-                if (shapeCollider.ShapeWorld.Overlaps(ray.Origin))
-                    hitNormal = hitNormal.Reversed;
-
-                raycastResult = new(ray, shapeCollider, hitPosition, hitNormal);
-            }
-        }
-
-        lineCacheQueue.Return(line2Ds);
-
-        return raycastResult;
-    }
-
-    public RaycastResult? RaycastAgainstCircle(ICircleCollider2D circleCollider, Ray2D ray, float length)
-    {
-        Circle circle = circleCollider.CircleWorld;
-
-        if (circle.Overlaps(ray.Origin, out _, out float depth))
-        {
-            Vector2D insideNormal = circle.Center.FromTo(ray.Origin).Normalized;
-            Vector2D insidePosition = circle.Center + insideNormal * circle.Radius;
-
-            return new(ray, circleCollider, insidePosition, insideNormal);
-        }
-
-        Vector2D originToCircle = ray.Origin.FromTo(circle.Center);
-        float distanceToClosest = ray.Direction.Dot(originToCircle);
-
-        Vector2D closestPoint = ray.Origin + ray.Direction * distanceToClosest;
-        Vector2D closestPointToCircle = closestPoint.FromTo(circle.Center);
-
-        float closestToCircleDistanceSquared = closestPointToCircle.MagnitudeSquared;
-
-        if (closestToCircleDistanceSquared > circle.RadiusSquared)
-            return null;
-
-        float distanceToHit = distanceToClosest - (circle.Radius - closestToCircleDistanceSquared.Sqrt());
-
-        if (distanceToHit > length || distanceToHit < 0f)
-            return null;
-
-        Vector2D hitPosition = ray.Evaluate(distanceToHit);
-        Vector2D hitNormal = circle.Center.FromTo(hitPosition).Normalized;
-
-        return new(ray, circleCollider, hitPosition, hitNormal);
-    }
-}

Engine.Systems/StateMachine/StateMachine.cs

@@ -3,17 +3,17 @@ using Syntriax.Engine.Core.Serialization;
 
 namespace Syntriax.Engine.Systems.StateMachine;
 
-public class StateMachine : Behaviour, IUpdate
+public class StateMachine : Behaviour
 {
     public Event<StateMachine, StateChangedArguments> OnStateChanged { get; } = new();
 
-    private readonly Event<IState, IState.StateTransitionReadyArguments>.EventHandler delegateOnStateTransitionReady = null!;
+    private readonly Event<IState, IState.StateTransitionReadyArguments>.EventHandler cachedOnStateTransitionReady = null!;
 
     private IState _state = new State();
 
     public StateMachine()
     {
-        delegateOnStateTransitionReady = OnStateTransitionReady;
+        cachedOnStateTransitionReady = OnStateTransitionReady;
     }
 
     [Serialize]
@@ -26,25 +26,25 @@ public class StateMachine : Behaviour, IUpdate
                 return;
 
             IState previousState = _state;
-            previousState.OnStateTransitionReady.RemoveListener(delegateOnStateTransitionReady);
+            previousState.OnStateTransitionReady.RemoveListener(cachedOnStateTransitionReady);
 
             _state = value;
             previousState.TransitionFrom(value);
             value.TransitionTo(_state);
             OnStateChanged?.Invoke(this, new(value, previousState));
 
-            value.OnStateTransitionReady.AddListener(delegateOnStateTransitionReady);
+            value.OnStateTransitionReady.AddListener(cachedOnStateTransitionReady);
         }
     }
 
-    private void OnStateTransitionReady(IState sender, IState.StateTransitionReadyArguments args)
+    private void OnStateTransitionReady(IState sender, IState.StateTransitionReadyArguments arguments)
     {
-        State = args.ToState;
+        State = arguments.ToState;
         while (State.GetNextState() is IState nextState)
             State = nextState;
     }
 
-    public void Update()
+    protected override void OnUpdate()
     {
         if (State is null)
             return;

Engine.Systems/Time/IReadOnlyTimer.cs

@@ -18,6 +18,6 @@ public interface IReadOnlyTimer
 
     TimerState State { get; }
 
-    readonly record struct TimerDeltaArguments(double Delta);
+    readonly record struct TimerDeltaArguments(double delta);
 
 }

Engine.Systems/Time/StopwatchBehaviour.cs

@@ -2,7 +2,7 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Systems.Time;
 
-public class StopwatchBehaviour : Behaviour, IUpdate, IStopwatch
+public class StopwatchBehaviour : Behaviour, IStopwatch
 {
     public Event<IReadOnlyStopwatch> OnStarted { get; } = new();
     public Event<IReadOnlyStopwatch, IReadOnlyStopwatch.StopwatchDeltaArguments> OnDelta { get; } = new();
@@ -38,7 +38,7 @@ public class StopwatchBehaviour : Behaviour, IUpdate, IStopwatch
         OnStopped?.Invoke(this);
     }
 
-    public virtual void Update()
+    protected override void OnUpdate()
     {
         if (State is not TimerState.Ticking)
             return;

Engine.Systems/Time/TickerBehaviour.cs

@@ -18,9 +18,9 @@ public class TickerBehaviour : StopwatchBehaviour, ITicker
         nextTick = Time + Period;
     }
 
-    public override void Update()
+    protected override void OnUpdate()
     {
-        base.Update();
+        base.OnUpdate();
 
         while (Time > nextTick)
         {

Engine.Systems/Time/TimerBehaviour.cs

@@ -2,7 +2,7 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Systems.Time;
 
-public class TimerBehaviour : Behaviour, IUpdate, ITimer
+public class TimerBehaviour : Behaviour, ITimer
 {
     public Event<IReadOnlyTimer> OnStarted { get; } = new();
     public Event<IReadOnlyTimer, IReadOnlyTimer.TimerDeltaArguments> OnDelta { get; } = new();
@@ -53,7 +53,7 @@ public class TimerBehaviour : Behaviour, IUpdate, ITimer
         OnStopped?.Invoke(this);
     }
 
-    public void Update()
+    protected override void OnUpdate()
     {
         if (State is not TimerState.Ticking)
             return;

Engine.Systems/Tween/TweenManager.cs

@@ -5,12 +5,12 @@ using Syntriax.Engine.Core;
 
 namespace Syntriax.Engine.Systems.Tween;
 
-public class TweenManager : Behaviour, ITweenManager
+public class TweenManager : UniverseObject, ITweenManager
 {
     private CoroutineManager coroutineManager = null!;
+    private readonly Queue<Tween> queue = new();
 
     private readonly Dictionary<ITween, IEnumerator> runningCoroutines = [];
-    private readonly Queue<Tween> pool = new();
 
     public ITween StartTween(float duration, ITweenManager.TweenSetCallback? setCallback = null)
     {
@@ -22,7 +22,7 @@ public class TweenManager : Behaviour, ITweenManager
 
     private Tween Get(float duration)
     {
-        if (!pool.TryDequeue(out Tween? result))
+        if (!queue.TryDequeue(out Tween? result))
             result = new(duration);
 
         result.Duration = duration;
@@ -31,11 +31,11 @@ public class TweenManager : Behaviour, ITweenManager
 
     private void Return(Tween tween)
     {
-        if (pool.Contains(tween))
+        if (queue.Contains(tween))
             return;
 
         tween.Wipe();
-        pool.Enqueue(tween);
+        queue.Enqueue(tween);
     }
 
     private IEnumerator RunTween(Tween tween)
@@ -70,15 +70,14 @@ public class TweenManager : Behaviour, ITweenManager
         tween.State = TweenState.Cancelled;
         coroutineManager.StopCoroutine(runningCoroutine);
         runningCoroutines.Remove(tween);
-        Return((Tween)tween);
     }
 
-    protected override void OnEnteredUniverse(IUniverse universe)
+    protected override void OnEnteringUniverse(IUniverse universe)
     {
-        coroutineManager = universe.FindRequiredBehaviour<CoroutineManager>();
+        coroutineManager = universe.GetRequiredUniverseObject<CoroutineManager>();
     }
 
-    protected override void OnExitedUniverse(IUniverse universe)
+    protected override void OnExitingUniverse(IUniverse universe)
     {
         coroutineManager = null!;
     }

Engine.sln

@@ -17,104 +17,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Serializers.Yaml", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet", "Engine.Serializers\YamlDotNet\YamlDotNet\YamlDotNet.csproj", "{3D852C92-BC14-4893-AEF2-50612DAFCD8F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{823D4020-332D-2C13-F261-6F510F11A57E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame", "Engine.Integration\Engine.Integration.MonoGame\Engine.Integration.MonoGame.csproj", "{C3438D33-0879-44E4-9DF0-D29F5621C44C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|x64.Build.0 = Debug|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|x86.Build.0 = Debug|Any CPU
 		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|x64.ActiveCfg = Release|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|x64.Build.0 = Release|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|x86.ActiveCfg = Release|Any CPU
-		{71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Release|x86.Build.0 = Release|Any CPU
 		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|x64.Build.0 = Debug|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Debug|x86.Build.0 = Debug|Any CPU
 		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|x64.ActiveCfg = Release|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|x64.Build.0 = Release|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B3C3332-07E3-4A00-9898-0A5410BCB08C}.Release|x86.Build.0 = Release|Any CPU
 		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|x64.Build.0 = Debug|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Debug|x86.Build.0 = Debug|Any CPU
 		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|x64.ActiveCfg = Release|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|x64.Build.0 = Release|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|x86.ActiveCfg = Release|Any CPU
-		{8452323D-99EF-43B1-8E7B-123E02279674}.Release|x86.Build.0 = Release|Any CPU
 		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|x64.Build.0 = Debug|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|x86.Build.0 = Debug|Any CPU
 		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|x64.ActiveCfg = Release|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|x64.Build.0 = Release|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|x86.ActiveCfg = Release|Any CPU
-		{58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|x86.Build.0 = Release|Any CPU
 		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Debug|x86.Build.0 = Debug|Any CPU
 		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|x64.Build.0 = Release|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}.Release|x86.Build.0 = Release|Any CPU
 		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|x64.Build.0 = Debug|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|x64.ActiveCfg = Release|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|x64.Build.0 = Release|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|x86.ActiveCfg = Release|Any CPU
-		{3D852C92-BC14-4893-AEF2-50612DAFCD8F}.Release|x86.Build.0 = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|x64.Build.0 = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Debug|x86.Build.0 = Debug|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|x64.Build.0 = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -122,6 +54,5 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176} = {F88E129A-9A47-4D27-96EE-6EC02F79594B}
 		{3D852C92-BC14-4893-AEF2-50612DAFCD8F} = {F88E129A-9A47-4D27-96EE-6EC02F79594B}
-		{C3438D33-0879-44E4-9DF0-D29F5621C44C} = {823D4020-332D-2C13-F261-6F510F11A57E}
 	EndGlobalSection
 EndGlobal