fix: added dynamic index updates during event invocation so there are no missing/duplicate invocations

This also makes the events very not ideal for multithreaded applications at the moment.

Engine.Core/Abstract/ICamera.cs

@@ -0,0 +1,17 @@
+namespace Engine.Core;
+
+/// <summary>
+/// Represents a camera with view and projections matrices in the engine.
+/// </summary>
+public interface ICamera
+{
+    /// <summary>
+    /// View <see cref="Matrix4x4"/> of the <see cref="ICamera"/>.
+    /// </summary>
+    Matrix4x4 ViewMatrix { get; }
+
+    /// <summary>
+    /// Projection <see cref="Matrix4x4"/> of the <see cref="ICamera"/>.
+    /// </summary>
+    Matrix4x4 ProjectionMatrix { get; }
+}

Engine.Core/Abstract/ICamera2D.cs

@@ -3,7 +3,7 @@ namespace Engine.Core;
 /// <summary>
 /// Represents a 2D camera in the engine.
 /// </summary>
-public interface ICamera2D : IBehaviour2D
+public interface ICamera2D : ICamera, IBehaviour2D
 {
     /// <summary>
     /// The zoom level of the camera.

Engine.Core/Abstract/ICamera3D.cs

@@ -3,7 +3,7 @@ namespace Engine.Core;
 /// <summary>
 /// Represents a 3D camera in the engine.
 /// </summary>
-public interface ICamera3D : IBehaviour3D
+public interface ICamera3D : ICamera, IBehaviour3D
 {
     /// <summary>
     /// Event triggered when the near plane of the <see cref="ICamera3D"/> changes.

Engine.Core/Debug/RotatingFileLogger.cs

@@ -55,7 +55,7 @@ public class RotatingFileLogger : ILogger
     private static void RotateLastLogs(string directory, string prefix, int rotateLength)
     {
         IOrderedEnumerable<string> logs = System.IO.Directory.GetFiles(directory, $"{prefix}*.log")
-            .OrderBy(File.GetCreationTime);
+            .OrderByDescending(File.GetCreationTime);
 
         foreach (string file in logs.Skip(rotateLength))
             try

Engine.Core/Helpers/Event.cs

@@ -58,6 +58,9 @@ public class Event
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -74,6 +77,9 @@ public class Event
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -90,6 +96,9 @@ public class Event
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -103,6 +112,8 @@ public class Event
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -117,6 +128,8 @@ public class Event
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -131,23 +144,23 @@ public class Event
     /// </summary>
     public void Invoke()
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
-            try { listeners[i].Callback.Invoke(); }
+            try { listeners[currentCallIndex].Callback.Invoke(); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}()";
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}()";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}()";
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}()";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 
@@ -216,6 +229,9 @@ public class Event<TSender> where TSender : class
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -232,6 +248,9 @@ public class Event<TSender> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -248,6 +267,9 @@ public class Event<TSender> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -261,6 +283,8 @@ public class Event<TSender> where TSender : class
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -275,6 +299,8 @@ public class Event<TSender> where TSender : class
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -290,23 +316,23 @@ public class Event<TSender> where TSender : class
     /// <param name="sender">The caller that's triggering this event.</param>
     public void Invoke(TSender sender)
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
-            try { listeners[i].Callback.Invoke(sender); }
+            try { listeners[currentCallIndex].Callback.Invoke(sender); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender})";
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender})";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(sender); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender})";
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender})";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 
@@ -382,6 +408,9 @@ public class Event<TSender, TArguments> where TSender : class
 
     public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
 
+    private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+    private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
+
     private readonly List<ListenerData> listeners = null!;
     private readonly List<ListenerData> onceListeners = null!;
 
@@ -398,6 +427,9 @@ public class Event<TSender, TArguments> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentCallIndex)
+            currentCallIndex++;
+
         listeners.Insert(insertIndex, listenerData);
     }
 
@@ -414,6 +446,9 @@ public class Event<TSender, TArguments> where TSender : class
         if (insertIndex < 0)
             insertIndex = ~insertIndex;
 
+        if (insertIndex < currentOnceCallIndex)
+            currentOnceCallIndex++;
+
         onceListeners.Insert(insertIndex, listenerData);
     }
 
@@ -427,6 +462,8 @@ public class Event<TSender, TArguments> where TSender : class
             if (listeners[i].Callback == listener)
             {
                 listeners.RemoveAt(i);
+                if (i < currentCallIndex)
+                    currentCallIndex--;
                 return;
             }
     }
@@ -441,6 +478,8 @@ public class Event<TSender, TArguments> where TSender : class
             if (onceListeners[i].Callback == listener)
             {
                 onceListeners.RemoveAt(i);
+                if (i < currentOnceCallIndex)
+                    currentOnceCallIndex--;
                 return;
             }
     }
@@ -457,23 +496,23 @@ public class Event<TSender, TArguments> where TSender : class
     /// <param name="args">The arguments provided for this event.</param>
     public void Invoke(TSender sender, TArguments args)
     {
-        for (int i = listeners.Count - 1; i >= 0; i--)
+        for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
-            try { listeners[i].Callback.Invoke(sender, args); }
+            try { listeners[currentCallIndex].Callback.Invoke(sender, args); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender}, {args})";
+                string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender}, {args})";
-                EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
 
-        for (int i = onceListeners.Count - 1; i >= 0; i--)
+        for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
         {
-            try { onceListeners[i].Callback.Invoke(sender, args); }
+            try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender, args); }
             catch (Exception exception)
             {
-                string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender}, {args})";
+                string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender}, {args})";
-                EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
+                EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
             }
-            onceListeners.RemoveAt(i);
+            onceListeners.RemoveAt(currentOnceCallIndex);
         }
     }
 

Engine.Core/Helpers/FastListOrdered.cs

@@ -16,8 +16,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
     private readonly Func<TItem, TIndex> getIndexFunc = null!;
     private readonly IComparer<TIndex> sortBy = null!;
 
-    private int count = 0;
+    public int Count { get; private set; } = 0;
-    public int Count => count;
 
     public bool IsReadOnly { get; set; } = false;
 
@@ -35,10 +34,10 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
     private (TIndex TIndex, int i) GetAt(Index index)
     {
         int actualIndex = index.IsFromEnd
-                ? count - index.Value
+                ? Count - index.Value
                 : index.Value;
 
-        if (actualIndex < 0 || actualIndex >= count)
+        if (actualIndex < 0 || actualIndex >= Count)
             throw new IndexOutOfRangeException();
 
         int leftIndex = actualIndex;
@@ -75,7 +74,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
             items[key] = list = [];
 
         list.Add(item);
-        count++;
+        Count++;
     }
 
     public void Insert(int index, TItem item)
@@ -88,7 +87,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
             items[tIndex] = list = [];
 
         list.Insert(index, item);
-        count++;
+        Count++;
     }
 
     public bool Remove(TItem item)
@@ -103,7 +102,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
         if (!list.Remove(item))
             return false;
 
-        count--;
+        Count--;
         return true;
     }
 
@@ -114,7 +113,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
 
         (TIndex tIndex, int i) = GetAt(index);
         items[tIndex].RemoveAt(i);
-        count--;
+        Count--;
     }
 
     public void Clear()
@@ -125,7 +124,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
         foreach ((TIndex index, FastList<TItem> list) in items)
             list.Clear();
 
-        count = 0;
+        Count = 0;
     }
 
     public bool Contains(TItem item)

Engine.Core/Primitives/Matrix4x4.cs

@@ -1,12 +1,11 @@
 using System;
-using System.Numerics;
 
 namespace Engine.Core;
 
 // TODO Comments
 
 /// <summary>
-/// Represents a 4D left handed space matrix.
+/// Represents a 4D left handed space matrix in a Column Major convention.
 /// </summary>
 /// <remarks>
 /// Initializes a new instance of the <see cref="Matrix4x4"/> struct with the specified values.
@@ -62,6 +61,16 @@ public readonly struct Matrix4x4(
         0f, 0f, 0f, 1f
     );
 
+    /// <summary>
+    /// Represents the inverted version of this <see cref="Matrix4x4"/>.
+    /// </summary>
+    public Matrix4x4 Inverse => Invert(this);
+
+    /// <summary>
+    /// Represents the transposed version of this <see cref="Matrix4x4"/>.
+    /// </summary>
+    public Matrix4x4 Transposed => Transpose(this);
+
     public static Matrix4x4 operator *(Matrix4x4 a, Matrix4x4 b) => new(
         a.M11 * b.M11 + a.M12 * b.M21 + a.M13 * b.M31 + a.M14 * b.M41,
         a.M11 * b.M12 + a.M12 * b.M22 + a.M13 * b.M32 + a.M14 * b.M42,
@@ -84,6 +93,13 @@ public readonly struct Matrix4x4(
         a.M41 * b.M14 + a.M42 * b.M24 + a.M43 * b.M34 + a.M44 * b.M44
     );
 
+    public static Vector4D operator *(Matrix4x4 m, Vector4D v) => new(
+        m.M11 * v.X + m.M12 * v.Y + m.M13 * v.Z + m.M14 * v.W,
+        m.M21 * v.X + m.M22 * v.Y + m.M23 * v.Z + m.M24 * v.W,
+        m.M31 * v.X + m.M32 * v.Y + m.M33 * v.Z + m.M34 * v.W,
+        m.M41 * v.X + m.M42 * v.Y + m.M43 * v.Z + m.M44 * v.W
+    );
+
     public static bool operator ==(Matrix4x4 left, Matrix4x4 right) =>
         left.M11 == right.M11 && left.M12 == right.M12 && left.M13 == right.M13 && left.M14 == right.M14 &&
         left.M21 == right.M21 && left.M22 == right.M22 && left.M23 == right.M23 && left.M24 == right.M24 &&
@@ -129,11 +145,98 @@ public readonly struct Matrix4x4(
          m.M13 * m.M21 * m.M32 * m.M44 - m.M11 * m.M23 * m.M32 * m.M44 -
          m.M12 * m.M21 * m.M33 * m.M44 + m.M11 * m.M22 * m.M33 * m.M44;
 
+    /// <summary>
+    /// Inverts the given <see cref="Matrix4x4"/>.
+    /// </summary>
+    /// <param name="m">The <see cref="Matrix4x4"/>.</param>
+    /// <returns>The inverted <see cref="Matrix4x4"/> of the given <see cref="Matrix4x4"/>.</returns>
+    public static Matrix4x4 Invert(Matrix4x4 m)
+    {
+        float m1 = m.M11, m2 = m.M12, m3 = m.M13, m4 = m.M14;
+        float m5 = m.M21, m6 = m.M22, m7 = m.M23, m8 = m.M24;
+        float m9 = m.M31, m10 = m.M32, m11 = m.M33, m12 = m.M34;
+        float m13 = m.M41, m14 = m.M42, m15 = m.M43, m16 = m.M44;
+
+        float num = m11 * m16 - m12 * m15;
+        float num2 = m10 * m16 - m12 * m14;
+        float num3 = m10 * m15 - m11 * m14;
+        float num4 = m9 * m16 - m12 * m13;
+        float num5 = m9 * m15 - m11 * m13;
+        float num6 = m9 * m14 - m10 * m13;
+
+        float num7 = m6 * num - m7 * num2 + m8 * num3;
+        float num8 = -(m5 * num - m7 * num4 + m8 * num5);
+        float num9 = m5 * num2 - m6 * num4 + m8 * num6;
+        float num10 = -(m5 * num3 - m6 * num5 + m7 * num6);
+
+        float invDet = 1f / (m1 * num7 + m2 * num8 + m3 * num9 + m4 * num10);
+
+        float r11 = num7 * invDet;
+        float r21 = num8 * invDet;
+        float r31 = num9 * invDet;
+        float r41 = num10 * invDet;
+
+        float r12 = (-(m2 * num - m3 * num2 + m4 * num3)) * invDet;
+        float r22 = (m1 * num - m3 * num4 + m4 * num5) * invDet;
+        float r32 = (-(m1 * num2 - m2 * num4 + m4 * num6)) * invDet;
+        float r42 = (m1 * num3 - m2 * num5 + m3 * num6) * invDet;
+
+        float num12 = m7 * m16 - m8 * m15;
+        float num13 = m6 * m16 - m8 * m14;
+        float num14 = m6 * m15 - m7 * m14;
+        float num15 = m5 * m16 - m8 * m13;
+        float num16 = m5 * m15 - m7 * m13;
+        float num17 = m5 * m14 - m6 * m13;
+
+        float r13 = (m2 * num12 - m3 * num13 + m4 * num14) * invDet;
+        float r23 = (-(m1 * num12 - m3 * num15 + m4 * num16)) * invDet;
+        float r33 = (m1 * num13 - m2 * num15 + m4 * num17) * invDet;
+        float r43 = (-(m1 * num14 - m2 * num16 + m3 * num17)) * invDet;
+
+        float num18 = m7 * m12 - m8 * m11;
+        float num19 = m6 * m12 - m8 * m10;
+        float num20 = m6 * m11 - m7 * m10;
+        float num21 = m5 * m12 - m8 * m9;
+        float num22 = m5 * m11 - m7 * m9;
+        float num23 = m5 * m10 - m6 * m9;
+
+        float r14 = (-(m2 * num18 - m3 * num19 + m4 * num20)) * invDet;
+        float r24 = (m1 * num18 - m3 * num21 + m4 * num22) * invDet;
+        float r34 = (-(m1 * num19 - m2 * num21 + m4 * num23)) * invDet;
+        float r44 = (m1 * num20 - m2 * num22 + m3 * num23) * invDet;
+
+        return new(
+            r11, r12, r13, r14,
+            r21, r22, r23, r24,
+            r31, r32, r33, r34,
+            r41, r42, r43, r44
+        );
+    }
+
+    /// <summary>
+    /// Transposes the given <see cref="Matrix4x4"/>.
+    /// </summary>
+    /// <param name="m">The <see cref="Matrix4x4"/>.</param>
+    /// <returns>The transposed <see cref="Matrix4x4"/> of the given <see cref="Matrix4x4"/>.</returns>
+    public static Matrix4x4 Transpose(Matrix4x4 m) => new(
+        m.M11, m.M21, m.M31, m.M41,
+        m.M12, m.M22, m.M32, m.M42,
+        m.M13, m.M23, m.M33, m.M43,
+        m.M14, m.M24, m.M34, m.M44
+    );
+
     public static Matrix4x4 CreateTranslation(Vector3D position) => new(
-        1f, 0f, 0f, 0f,
+        1f, 0f, 0f, position.X,
-        0f, 1f, 0f, 0f,
+        0f, 1f, 0f, position.Y,
-        0f, 0f, 1f, 0f,
+        0f, 0f, 1f, position.Z,
-        position.X, position.Y, position.Z, 1
+        0f, 0f, 0f, 1f
+    );
+
+    public static Matrix4x4 CreateScale(float scale) => new(
+        scale, 0f, 0f, 0f,
+        0f, scale, 0f, 0f,
+        0f, 0f, scale, 0f,
+        0f, 0f, 0f, 1f
     );
 
     public static Matrix4x4 CreateScale(Vector3D scale) => new(
@@ -148,10 +251,10 @@ public readonly struct Matrix4x4(
         float c = Math.Cos(radians);
         float s = Math.Sin(radians);
 
-        return new Matrix4x4(
+        return new(
         1f, 0f, 0f, 0f,
-            0f, c, s, 0f,
+        0f, c, -s, 0f,
-            0f, -s, c, 0f,
+        0f, s, c, 0f,
         0f, 0f, 0f, 1f
         );
     }
@@ -161,10 +264,10 @@ public readonly struct Matrix4x4(
         float c = Math.Cos(radians);
         float s = Math.Sin(radians);
 
-        return new Matrix4x4(
+        return new(
-            c, 0f, -s, 0f,
+            c, 0f, s, 0f,
             0f, 1f, 0f, 0f,
-            s, 0f, c, 0f,
+            -s, 0f, c, 0f,
             0f, 0f, 0f, 1f
         );
     }
@@ -174,9 +277,9 @@ public readonly struct Matrix4x4(
         float c = Math.Cos(radians);
         float s = Math.Sin(radians);
 
-        return new Matrix4x4(
+        return new(
-            c, s, 0f, 0f,
+            c, -s, 0f, 0f,
-            -s, c, 0f, 0f,
+            s, c, 0f, 0f,
             0f, 0f, 1f, 0f,
             0f, 0f, 0f, 1f
         );
@@ -195,7 +298,7 @@ public readonly struct Matrix4x4(
         Vector3D x = up.Cross(z).Normalized;
         Vector3D y = z.Cross(x);
 
-        return new Matrix4x4(
+        return new(
             x.X, y.X, z.X, 0f,
             x.Y, y.Y, z.Y, 0f,
             x.Z, y.Z, z.Z, 0f,
@@ -205,28 +308,53 @@ public readonly struct Matrix4x4(
 
     public static Matrix4x4 CreateLookMatrix(Vector3D position, Vector3D target, Vector3D up)
     {
-        Vector3D z = position.FromTo(target).Normalized;
+        Vector3D f = (target - position).Normalized;
-        Vector3D x = up.Cross(z).Normalized;
+        Vector3D s = f.Cross(up).Normalized;
-        Vector3D y = z.Cross(x);
+        Vector3D u = s.Cross(f);
 
-        return new Matrix4x4(
+        return new(
-            x.X, y.X, z.X, 0f,
+            s.X, u.X, -f.X, 0f,
-            x.Y, y.Y, z.Y, 0f,
+            s.Y, u.Y, -f.Y, 0f,
-            x.Z, y.Z, z.Z, 0f,
+            s.Z, u.Z, -f.Z, 0f,
-            -x.Dot(position), -y.Dot(position), -z.Dot(position), 1f
+            -s.Dot(position), -u.Dot(position), f.Dot(position), 1f
         );
     }
 
-    public static Matrix4x4 CreatePerspectiveFieldOfView(float fieldOfViewInRadians, float aspectRatio, float nearPlane, float farPlane)
+    public static Matrix4x4 CreateOrthographicView(float width, float height, float nearPlane = -1f, float farPlane = 1f)
     {
-        float yScale = 1f / Math.Tan(fieldOfViewInRadians / 2f);
+        float invDepth = 1f / (farPlane - nearPlane);
-        float xScale = yScale / aspectRatio;
 
-        return new Matrix4x4(
+        return new(
+            2f / width, 0f, 0f, 0f,
+            0f, -2f / height, 0f, 0f,
+            0f, 0f, 1f * invDepth, 0f,
+            -1f, 1f, -nearPlane * invDepth, 1f
+        );
+    }
+
+    public static Matrix4x4 CreateOrthographicViewCentered(float width, float height, float nearPlane = -1f, float farPlane = 1f)
+    {
+        float invDepth = 1f / (farPlane - nearPlane);
+
+        return new(
+            2f / width, 0f, 0f, 0f,
+            0f, 2f / height, 0f, 0f,
+            0f, 0f, 1f * invDepth, 0f,
+            0f, 0f, -nearPlane * invDepth, 1f
+        );
+    }
+
+    public static Matrix4x4 CreatePerspectiveFieldOfView(float fovRadians, float aspectRatio, float nearPlane, float farPlane)
+    {
+        float yScale = 1f / Math.Tan(fovRadians / 2f);
+        float xScale = yScale / aspectRatio;
+        float zRange = farPlane - nearPlane;
+
+        return new(
             xScale, 0f, 0f, 0f,
             0f, yScale, 0f, 0f,
-            0f, 0f, farPlane / (farPlane - nearPlane), 1f,
+            0f, 0f, -(farPlane + nearPlane) / zRange, -1f,
-            0f, 0f, -nearPlane * farPlane / (farPlane - nearPlane), 0f
+            0f, 0f, -(2f * nearPlane * farPlane) / zRange, 0f
         );
     }
 
@@ -261,11 +389,20 @@ public static class Matrix4x4Extensions
     /// <inheritdoc cref="Matrix4x4.Determinant(Matrix4x4)" />
     public static float Determinant(this Matrix4x4 matrix) => Matrix4x4.Determinant(matrix);
 
+    /// <inheritdoc cref="Matrix4x4.Invert(Matrix4x4)" />
+    public static Matrix4x4 Invert(this Matrix4x4 matrix) => Matrix4x4.Invert(matrix);
+
+    /// <inheritdoc cref="Matrix4x4.Transpose(Matrix4x4)" />
+    public static Matrix4x4 Transpose(this Matrix4x4 matrix) => Matrix4x4.Transpose(matrix);
+
     /// <inheritdoc cref="Matrix4x4.CreateTranslation(Vector3D)" />
     public static Matrix4x4 ApplyTranslation(this Matrix4x4 matrix, Vector3D translation) => matrix * Matrix4x4.CreateTranslation(translation);
 
     /// <inheritdoc cref="Matrix4x4.CreateScale(Vector3D)" />
-    public static Matrix4x4 ApplyScale(this Matrix4x4 matrix, Vector3 scale) => matrix * Matrix4x4.CreateScale(scale);
+    public static Matrix4x4 ApplyScale(this Matrix4x4 matrix, Vector3D scale) => matrix * Matrix4x4.CreateScale(scale);
+
+    /// <inheritdoc cref="Matrix4x4.CreateScale(float)" />
+    public static Matrix4x4 ApplyScale(this Matrix4x4 matrix, float scale) => matrix * Matrix4x4.CreateScale(scale);
 
     /// <inheritdoc cref="Matrix4x4.CreateRotationZ(float)" />
     public static Matrix4x4 ApplyRotationX(this Matrix4x4 matrix, float radians) => matrix * Matrix4x4.CreateRotationX(radians);
@@ -280,15 +417,23 @@ public static class Matrix4x4Extensions
     public static Matrix4x4 ApplyRotation(this Matrix4x4 matrix, Quaternion quaternion) => matrix * Matrix4x4.CreateRotation(quaternion);
 
     /// <inheritdoc cref="Matrix4x4.CreateLookMatrix( Vector3D, Vector3D)" />
-    public static Matrix4x4 ApplyLookRotationTo(this Matrix4x4 matrix, Vector3D forward, Vector3 up) => matrix * Matrix4x4.CreateLookMatrix(forward, up);
+    public static Matrix4x4 ApplyLookRotationTo(this Matrix4x4 matrix, Vector3D forward, Vector3D up) => matrix * Matrix4x4.CreateLookMatrix(forward, up);
 
     /// <inheritdoc cref="Matrix4x4.CreateLookMatrix(Vector3D, Vector3D, Vector3D)" />
-    public static Matrix4x4 CreateLookMatrixTo(this Vector3D from, Vector3D to, Vector3 up) => Matrix4x4.CreateLookMatrix(from, to, up);
+    public static Matrix4x4 CreateLookMatrixTo(this Vector3D from, Vector3D to, Vector3D up) => Matrix4x4.CreateLookMatrix(from, to, up);
 
     /// <inheritdoc cref="Matrix4x4.CreatePerspectiveFieldOfView(float, float, float, float)" />
     public static Matrix4x4 ApplyPerspectiveFieldOfView(this Matrix4x4 matrix, float fieldOfViewInRadians, float aspectRatio, float nearPlane, float farPlane)
         => matrix * Matrix4x4.CreatePerspectiveFieldOfView(fieldOfViewInRadians, aspectRatio, nearPlane, farPlane);
 
+    /// <inheritdoc cref="Matrix4x4.CreateOrthographicView(float, float, float, float)" />
+    public static Matrix4x4 ApplyOrthographicView(this Matrix4x4 matrix, float width, float height, float nearPlane = -1f, float farPlane = 1f)
+        => matrix * Matrix4x4.CreateOrthographicView(width, height, nearPlane, farPlane);
+
+    /// <inheritdoc cref="Matrix4x4.CreateOrthographicViewCentered(float, float, float, float)" />
+    public static Matrix4x4 ApplyOrthographicViewCentered(this Matrix4x4 matrix, float width, float height, float nearPlane = -1f, float farPlane = 1f)
+        => matrix * Matrix4x4.CreateOrthographicViewCentered(width, height, nearPlane, farPlane);
+
     /// <inheritdoc cref="Matrix4x4.ToRightHanded(Matrix4x4) />
     public static Matrix4x4 ToRightHanded(this Matrix4x4 matrix) => Matrix4x4.ToRightHanded(matrix);
 }

Engine.Core/Primitives/Vector2D.cs

@@ -82,11 +82,19 @@ public readonly struct Vector2D(float x, float y) : IEquatable<Vector2D>
     public static bool operator ==(Vector2D left, Vector2D right) => left.X == right.X && left.Y == right.Y;
     public static bool operator !=(Vector2D left, Vector2D right) => left.X != right.X || left.Y != right.Y;
 
-    public static implicit operator System.Numerics.Vector2(Vector2D vector) => new(vector.X, vector.Y);
-    public static implicit operator Vector2D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y);
     public static implicit operator Vector2D(Vector2DInt vector) => new(vector.X, vector.Y);
-    public static implicit operator Vector2D(Vector3D vector) => new(vector.X, vector.Y);
+    public static implicit operator Vector2D(Vector3DInt vector) => new(vector.X, vector.Y);
+
+    public static implicit operator System.Numerics.Vector2(Vector2D vector) => new(vector.X, vector.Y);
+    public static implicit operator System.Numerics.Vector3(Vector2D vector) => new(vector.X, vector.Y, 0f);
+    public static implicit operator System.Numerics.Vector4(Vector2D vector) => new(vector.X, vector.Y, 0f, 0f);
+
+    public static implicit operator Vector2D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y);
     public static implicit operator Vector2D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y);
+    public static implicit operator Vector2D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y);
+
+    public static implicit operator Vector2D(Vector3D vector) => new(vector.X, vector.Y);
+    public static implicit operator Vector2D(Vector4D vector) => new(vector.X, vector.Y);
 
     /// <summary>
     /// Calculates the length of the <see cref="Vector2D"/>.

Engine.Core/Primitives/Vector2DInt.cs

@@ -74,9 +74,12 @@ public readonly struct Vector2DInt(int x, int y) : IEquatable<Vector2DInt>
     public static bool operator ==(Vector2DInt left, Vector2DInt right) => left.X == right.X && left.Y == right.Y;
     public static bool operator !=(Vector2DInt left, Vector2DInt right) => left.X != right.X || left.Y != right.Y;
 
-    public static implicit operator Vector2DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
     public static implicit operator Vector2DInt(Vector3DInt vector) => new(vector.X, vector.Y);
 
+    public static implicit operator Vector2DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
+    public static implicit operator Vector2DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
+    public static implicit operator Vector2DInt(Vector4D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
+
     /// <summary>
     /// Calculates the length of the <see cref="Vector2DInt"/>.
     /// </summary>

Engine.Core/Primitives/Vector3D.cs

@@ -92,11 +92,19 @@ public readonly struct Vector3D(float x, float y, float z) : IEquatable<Vector3D
     public static bool operator ==(Vector3D left, Vector3D right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z;
     public static bool operator !=(Vector3D left, Vector3D right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z;
 
-    public static implicit operator System.Numerics.Vector3(Vector3D vector) => new(vector.X, vector.Y, vector.Z);
+    public static implicit operator Vector3D(Vector2DInt vector) => new(vector.X, vector.Y, 0f);
-    public static implicit operator Vector3D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z);
     public static implicit operator Vector3D(Vector3DInt vector) => new(vector.X, vector.Y, vector.Z);
-    public static implicit operator Vector3D(Vector2D vector) => new(vector.X, vector.Y, 0f);
+
+    public static implicit operator System.Numerics.Vector2(Vector3D vector) => new(vector.X, vector.Y);
+    public static implicit operator System.Numerics.Vector3(Vector3D vector) => new(vector.X, vector.Y, vector.Z);
+    public static implicit operator System.Numerics.Vector4(Vector3D vector) => new(vector.X, vector.Y, vector.Z, 0f);
+
     public static implicit operator Vector3D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y, 0f);
+    public static implicit operator Vector3D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z);
+    public static implicit operator Vector3D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y, vector.Z);
+
+    public static implicit operator Vector3D(Vector2D vector) => new(vector.X, vector.Y, 0f);
+    public static implicit operator Vector3D(Vector4D vector) => new(vector.X, vector.Y, vector.Z);
 
     /// <summary>
     /// Calculates the length of the <see cref="Vector3D"/>.

Engine.Core/Primitives/Vector3DInt.cs

@@ -84,9 +84,12 @@ public readonly struct Vector3DInt(int x, int y, int z) : IEquatable<Vector3DInt
     public static bool operator ==(Vector3DInt left, Vector3DInt right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z;
     public static bool operator !=(Vector3DInt left, Vector3DInt right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z;
 
-    public static implicit operator Vector3DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
     public static implicit operator Vector3DInt(Vector2DInt vector) => new(vector.X, vector.Y, 0);
 
+    public static implicit operator Vector3DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), 0);
+    public static implicit operator Vector3DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
+    public static implicit operator Vector3DInt(Vector4D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
+
     /// <summary>
     /// Calculates the length of the <see cref="Vector3DInt"/>.
     /// </summary>

Engine.Core/Primitives/Vector4D.cs

@@ -90,9 +90,20 @@ public readonly struct Vector4D(float x, float y, float z, float w) : IEquatable
     public static bool operator ==(Vector4D left, Vector4D right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z && left.W == right.W;
     public static bool operator !=(Vector4D left, Vector4D right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z || left.W != right.W;
 
+    public static implicit operator Vector4D(Vector2DInt vector) => new(vector.X, vector.Y, 0f, 0f);
+    public static implicit operator Vector4D(Vector3DInt vector) => new(vector.X, vector.Y, vector.Z, 0f);
+
+    public static implicit operator System.Numerics.Vector2(Vector4D vector) => new(vector.X, vector.Y);
+    public static implicit operator System.Numerics.Vector3(Vector4D vector) => new(vector.X, vector.Y, vector.Z);
     public static implicit operator System.Numerics.Vector4(Vector4D vector) => new(vector.X, vector.Y, vector.Z, vector.W);
+
+    public static implicit operator Vector4D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y, 0f, 0f);
+    public static implicit operator Vector4D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z, 0f);
     public static implicit operator Vector4D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y, vector.Z, vector.W);
 
+    public static implicit operator Vector4D(Vector2D vector) => new(vector.X, vector.Y, 0f, 0f);
+    public static implicit operator Vector4D(Vector3D vector) => new(vector.X, vector.Y, vector.Z, 0f);
+
     /// <summary>
     /// Calculates the length of the <see cref="Vector4D"/>.
     /// </summary>

Engine.Core/Systems/UniverseEntranceManager.cs

@@ -9,65 +9,56 @@ public class UniverseEntranceManager : Internal.BehaviourIndependent
     private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
 
     private readonly ActiveBehaviourCollectorOrdered<int, IEnterUniverse> enterUniverses = new(GetPriority(), SortByAscendingPriority());
+    private readonly ActiveBehaviourCollectorOrdered<int, IExitUniverse> exitUniverses = new(GetPriority(), SortByAscendingPriority());
 
-    private readonly List<IEnterUniverse> toCallEnterUniverses = new(32);
+    private bool isInitialCollectionDone = false;
-    private readonly List<IExitUniverse> toCallExitUniverses = new(32);
+    private readonly FastListOrdered<int, IEnterUniverse> toCallEnterUniverses = new(GetPriority(), SortByAscendingPriority());
 
     protected override void OnEnteredUniverse(IUniverse universe)
     {
-        // FIXME: This causes an issue when the UniverseEntranceManager is already attached to a UniverseObject then registered into a Universe,
+        exitUniverses.Assign(universe);
-        // the enter/exit universe collectors call OnUniverseObjectRegistered internally on Assign, but since the Universe calls the OnUniverseObjectRegistered
+
-        // event it tries to call OnUniverseObjectRegistered again on the same object, causing a duplicate entry error.
+        // FIXME: the isInitialCollectionDone is for the sole reason of some behaviours 
-        Debug.Assert.AssertTrue(BehaviourController.Count == 1, $"{nameof(UniverseEntranceManager)} must be in it's own {nameof(IUniverseObject)} with no other {nameof(IBehaviour)}s attached at the moment. Failing to do so might cause instantiation or serialization issues.");
+        // adding more behaviours during entrance calls and the internal workings of 
+        // behaviour collector not being able to tell which behaviour was already called 
+        // (because it just runs a for loop with the behaviour count, and priority ordering doesn't help as well) 
+        // so it sometimes double processes or misses behaviours. A more elegant way of 
+        // handling this would be nice but for now it works good enough.
+        //
+        // SIDE NOTE: This same issue has the potential to occur on exitUniverses as well, but I've yet to run 
+        // into an instance of it actually happening so... I'm not gonna touch it until the edge case happens.  
+        isInitialCollectionDone = false;
         enterUniverses.Assign(universe);
+        isInitialCollectionDone = true;
 
-        foreach (IUniverseObject universeObject in universe)
+        for (int i = toCallEnterUniverses.Count - 1; i >= 0; i--)
-            OnUniverseObjectRegistered(universe, new(universeObject));
+            toCallEnterUniverses[i].EnterUniverse(universe);
-
+        toCallEnterUniverses.Clear();
-        universe.OnUniverseObjectRegistered.AddListener(OnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered.AddListener(OnUniverseObjectUnRegistered);
     }
 
     protected override void OnExitedUniverse(IUniverse universe)
     {
         enterUniverses.Unassign();
-
+        exitUniverses.Unassign();
-        foreach (IUniverseObject universeObject in universe)
-            OnUniverseObjectUnRegistered(universe, new(universeObject));
-
-        universe.OnUniverseObjectRegistered.RemoveListener(OnUniverseObjectRegistered);
-        universe.OnUniverseObjectUnRegistered.RemoveListener(OnUniverseObjectUnRegistered);
-    }
-
-    private void OnUniverseObjectUnRegistered(IUniverse sender, IUniverse.UniverseObjectUnRegisteredArguments args)
-    {
-        args.UniverseObjectUnregistered.BehaviourController.GetBehavioursInChildren(toCallExitUniverses);
-
-        for (int i = toCallExitUniverses.Count - 1; i >= 0; i--)
-        {
-            IExitUniverse exitUniverse = toCallExitUniverses[i];
-            toCallExitUniverses.RemoveAt(i);
-            exitUniverse.ExitUniverse(Universe);
-        }
-    }
-
-    private void OnUniverseObjectRegistered(IUniverse sender, IUniverse.UniverseObjectRegisteredArguments args)
-    {
-        for (int i = toCallEnterUniverses.Count - 1; i >= 0; i--)
-        {
-            IEnterUniverse enterUniverse = toCallEnterUniverses[i];
-            toCallEnterUniverses.RemoveAt(i);
-            enterUniverse.EnterUniverse(Universe);
-        }
     }
 
     private void OnEnterUniverseCollected(IBehaviourCollector<IEnterUniverse> sender, IBehaviourCollector<IEnterUniverse>.BehaviourCollectedArguments args)
+    {
+        if (!isInitialCollectionDone)
         {
             toCallEnterUniverses.Add(args.BehaviourCollected);
+            return;
         }
 
+        args.BehaviourCollected.EnterUniverse(Universe);
+    }
+
+    private void OnExitUniverseRemoved(IBehaviourCollector<IExitUniverse> sender, IBehaviourCollector<IExitUniverse>.BehaviourRemovedArguments args)
+        => args.BehaviourRemoved.ExitUniverse(Universe);
+
     public UniverseEntranceManager()
     {
         enterUniverses.OnCollected.AddListener(OnEnterUniverseCollected);
+        exitUniverses.OnRemoved.AddListener(OnExitUniverseRemoved);
     }
 }

Engine.Integration/Engine.Integration.LiteNetLib/LiteNetLibCommunicatorBase.cs

@@ -178,6 +178,7 @@ public abstract class LiteNetLibCommunicatorBase : Behaviour, IEnterUniverse, IE
         netPacketProcessor.RegisterNestedType(Vector3DNetPacker.Write, Vector3DNetPacker.Read);
         netPacketProcessor.RegisterNestedType(Vector3DIntNetPacker.Write, Vector3DIntNetPacker.Read);
         netPacketProcessor.RegisterNestedType(Vector4DNetPacker.Write, Vector4DNetPacker.Read);
+        netPacketProcessor.RegisterNestedType(Matrix4x4NetPacker.Write, Matrix4x4NetPacker.Read);
     }
 
     public INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback)

Engine.Integration/Engine.Integration.LiteNetLib/LiteNetLibServer.cs

@@ -6,7 +6,7 @@ using Engine.Core.Debug;
 
 namespace Engine.Systems.Network;
 
-public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer
+public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer, IPostUpdate
 {
     public string Password { get; private set; } = string.Empty;
     public int MaxConnectionCount { get; private set; } = 2;
@@ -104,17 +104,8 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
         }
     }
 
-    private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
+    public void PostUpdate()
-
-    public override void EnterUniverse(IUniverse universe)
     {
-        base.EnterUniverse(universe);
+        Manager.PollEvents();
-        universe.OnPostUpdate.AddListener(PollEvents);
-    }
-
-    public override void ExitUniverse(IUniverse universe)
-    {
-        base.ExitUniverse(universe);
-        universe.OnPostUpdate.RemoveListener(PollEvents);
     }
 }

Engine.Integration/Engine.Integration.LiteNetLib/Packers/Matrix4x4NetPacker.cs

@@ -0,0 +1,61 @@
+using LiteNetLib.Utils;
+
+using Engine.Core;
+
+namespace Engine.Systems.Network.Packers;
+
+internal static class Matrix4x4NetPacker
+{
+    internal static void Write(NetDataWriter writer, Matrix4x4 data)
+    {
+        writer.Put(data.M11);
+        writer.Put(data.M12);
+        writer.Put(data.M13);
+        writer.Put(data.M14);
+
+        writer.Put(data.M21);
+        writer.Put(data.M22);
+        writer.Put(data.M23);
+        writer.Put(data.M24);
+
+        writer.Put(data.M31);
+        writer.Put(data.M32);
+        writer.Put(data.M33);
+        writer.Put(data.M34);
+
+        writer.Put(data.M41);
+        writer.Put(data.M42);
+        writer.Put(data.M43);
+        writer.Put(data.M44);
+    }
+
+    internal static Matrix4x4 Read(NetDataReader reader)
+    {
+        float m11 = reader.GetFloat();
+        float m12 = reader.GetFloat();
+        float m13 = reader.GetFloat();
+        float m14 = reader.GetFloat();
+
+        float m21 = reader.GetFloat();
+        float m22 = reader.GetFloat();
+        float m23 = reader.GetFloat();
+        float m24 = reader.GetFloat();
+
+        float m31 = reader.GetFloat();
+        float m32 = reader.GetFloat();
+        float m33 = reader.GetFloat();
+        float m34 = reader.GetFloat();
+
+        float m41 = reader.GetFloat();
+        float m42 = reader.GetFloat();
+        float m43 = reader.GetFloat();
+        float m44 = reader.GetFloat();
+
+        return new Matrix4x4(
+            m11, m12, m13, m14,
+            m21, m22, m23, m24,
+            m31, m32, m33, m34,
+            m41, m42, m43, m44
+        );
+    }
+}

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

@@ -1,12 +0,0 @@
-using Microsoft.Xna.Framework;
-
-using Engine.Core;
-
-namespace 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/MonoGameCamera2D.cs

@@ -7,31 +7,39 @@ namespace Engine.Integration.MonoGame;
 
 public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, ILastFrameUpdate, IPreDraw
 {
-    public Event<MonoGameCamera2D> OnMatrixTransformChanged { get; } = new();
+    public Event<MonoGameCamera2D> OnViewMatrixChanged { get; } = new();
+    public Event<MonoGameCamera2D> OnProjectionMatrixChanged { get; } = new();
     public Event<MonoGameCamera2D> OnViewportChanged { get; } = new();
     public Event<MonoGameCamera2D> OnZoomChanged { get; } = new();
 
     public GraphicsDeviceManager Graphics { get; private set; } = null!;
     public ITransform2D Transform { get; private set; } = null!;
 
-    public Matrix MatrixTransform
+    public Matrix4x4 ProjectionMatrix
     {
         get;
-        set
+        private set
         {
             if (field == value)
                 return;
 
             field = value;
-            OnMatrixTransformChanged.Invoke(this);
+            OnProjectionMatrixChanged.Invoke(this);
         }
-    } = Matrix.Identity;
+    } = Matrix4x4.Identity;
 
-    public Vector2D Position
+    public Matrix4x4 ViewMatrix
     {
-        get => Transform.Position;
+        get;
-        set => Transform.Position = value;
+        private set
+        {
+            if (field == value)
+                return;
+
+            field = value;
+            OnViewMatrixChanged.Invoke(this);
         }
+    } = Matrix4x4.Identity;
 
     public Viewport Viewport
     {
@@ -61,22 +69,37 @@ public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, ILastFr
         }
     } = 1f;
 
-    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();
+        float x = 2f * screenPosition.X / Viewport.Width - 1f;
-        return worldPosition.Scale(EngineConverterExtensions.screenScale);
+        float y = 1f - 2f * screenPosition.Y / Viewport.Height;
+        Vector4D normalizedCoordinates = new(x, y, 0f, 1f);
+
+        Matrix4x4 invertedViewProjectionMatrix = (ProjectionMatrix * ViewMatrix).Inverse;
+
+        Vector4D worldPosition = invertedViewProjectionMatrix * normalizedCoordinates;
+
+        if (worldPosition.W != 0f)
+            worldPosition /= worldPosition.W;
+
+        return new(worldPosition.X, worldPosition.Y);
     }
+
     public Vector2D WorldToScreenPosition(Vector2D worldPosition)
     {
-        Vector2D screenPosition = Vector2.Transform(worldPosition.ToVector2(), MatrixTransform).ToVector2D();
+        Vector4D worldPosition4D = new(worldPosition.X, worldPosition.Y, 0f, 1f);
-        return screenPosition.Scale(EngineConverterExtensions.screenScale);
+
+        Matrix4x4 viewProjection = ProjectionMatrix * ViewMatrix;
+        Vector4D clip = viewProjection * worldPosition4D;
+
+        if (clip.W != 0f)
+            clip /= clip.W;
+
+        float screenX = (clip.X + 1f) * .5f * Viewport.Width;
+        float screenY = (1f - clip.Y) * .5f * Viewport.Height;
+
+        return new(screenX, screenY);
     }
 
     public void LastActiveFrame() => Transform = null!;
@@ -89,11 +112,11 @@ public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, ILastFr
 
     public void PreDraw()
     {
-        MatrixTransform =
+        ProjectionMatrix = Matrix4x4.CreateOrthographicViewCentered(Viewport.Width, Viewport.Height);
-            Matrix.CreateTranslation(new Vector3(-Position.X, Position.Y, 0f)) *
+        ViewMatrix = Matrix4x4.Identity
-            Matrix.CreateRotationZ(Rotation * Math.DegreeToRadian) *
+            .ApplyScale(Transform.Scale.X.Max(Transform.Scale.Y))
-            Matrix.CreateScale(Transform.Scale.X.Max(Transform.Scale.Y)) *
+            .ApplyScale(Zoom)
-            Matrix.CreateScale(Zoom) *
+            .ApplyRotationZ(-Transform.Rotation * Math.DegreeToRadian)
-            Matrix.CreateTranslation(new Vector3(Viewport.Width * .5f, Viewport.Height * .5f, 0f));
+            .ApplyTranslation(new Vector3D(-Transform.Position.X, -Transform.Position.Y, 0f));
     }
 }

Engine.Integration/Engine.Integration.MonoGame/Behaviours/MonoGameCamera3D.cs

@@ -21,7 +21,7 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
     public GraphicsDeviceManager Graphics { get; private set; } = null!;
     public ITransform3D Transform { get; private set; } = null!;
 
-    public Matrix View
+    public Matrix4x4 ViewMatrix
     {
         get;
         set
@@ -29,13 +29,13 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
             if (field == value)
                 return;
 
-            Matrix previousView = field;
+            Matrix4x4 previousView = field;
             field = value;
             OnViewChanged.Invoke(this, new(previousView));
         }
-    } = Matrix.Identity;
+    } = Matrix4x4.Identity;
 
-    public Matrix Projection
+    public Matrix4x4 ProjectionMatrix
     {
         get;
         set
@@ -43,11 +43,11 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
             if (field == value)
                 return;
 
-            Matrix previousProjection = field;
+            Matrix4x4 previousProjection = field;
             field = value;
             OnProjectionChanged.Invoke(this, new(previousProjection));
         }
-    } = Matrix.Identity;
+    } = Matrix4x4.Identity;
 
     public Viewport Viewport
     {
@@ -111,14 +111,17 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
         Vector3 nearPoint = new(screenPosition.X, screenPosition.Y, 0f);
         Vector3 farPoint = new(screenPosition.X, screenPosition.Y, 1f);
 
-        Vector3 worldNear = Viewport.Unproject(nearPoint, Projection, View, Matrix.Identity);
+        Matrix projection = ProjectionMatrix.ToXnaMatrix();
-        Vector3 worldFar = Viewport.Unproject(farPoint, Projection, View, Matrix.Identity);
+        Matrix view = ViewMatrix.ToXnaMatrix();
+
+        Vector3 worldNear = Viewport.Unproject(nearPoint, projection, view, Matrix.Identity);
+        Vector3 worldFar = Viewport.Unproject(farPoint, projection, view, Matrix.Identity);
 
         Vector3 direction = Vector3.Normalize(worldFar - worldNear);
         return new(worldNear.ToVector3D(), direction.ToVector3D());
     }
 
-    public Vector2D WorldToScreenPosition(Vector3D worldPosition) => Viewport.Project(worldPosition.ToVector3(), Projection, View, Matrix.Identity).ToVector3D();
+    public Vector2D WorldToScreenPosition(Vector3D worldPosition) => Viewport.Project(worldPosition.ToVector3(), ProjectionMatrix.ToXnaMatrix(), ViewMatrix.ToXnaMatrix(), Matrix.Identity).ToVector3D();
 
     public void LastActiveFrame() => Transform.OnTransformUpdated.RemoveListener(SetDirtyOnTransformUpdate);
     public void FirstActiveFrame()
@@ -150,7 +153,7 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
         Vector3 right = Vector3.Normalize(Transform.Right.ToVector3());
         Vector3 position = Transform.Position.ToVector3();
 
-        View = new Matrix(
+        ViewMatrix = new Matrix4x4(
             right.X, up.X, forward.X, 0,
             right.Y, up.Y, forward.Y, 0,
             right.Z, up.Z, forward.Z, 0,
@@ -166,7 +169,7 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
         float yScale = 1f / (float)Math.Tan(fieldOfView / 2f);
         float xScale = yScale / Viewport.AspectRatio;
 
-        Projection = new Matrix(
+        ProjectionMatrix = new Matrix4x4(
             xScale, 0, 0, 0,
             0, yScale, 0, 0,
             0, 0, FarPlane / (FarPlane - NearPlane), 1,
@@ -174,7 +177,7 @@ public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFr
         );
     }
 
-    public readonly record struct ViewChangedArguments(Matrix PreviousView);
+    public readonly record struct ViewChangedArguments(Matrix4x4 PreviousView);
-    public readonly record struct ProjectionChangedArguments(Matrix PreviousProjection);
+    public readonly record struct ProjectionChangedArguments(Matrix4x4 PreviousProjection);
     public readonly record struct ViewportChangedArguments(Viewport PreviousViewport);
 }

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

@@ -15,49 +15,49 @@ public class SpriteBatchWrapper(GraphicsDevice graphicsDevice) : ISpriteBatch
         => spriteBatch.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, transformMatrix);
 
     public void Draw(Texture2D texture, Vector2D position, AABB2D? 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);
+        => spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth);
 
     public void Draw(Texture2D texture, Vector2D position, AABB2D? 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);
+        => spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), scale, effects, layerDepth);
 
     public void Draw(Texture2D texture, AABB2D destinationAABB, AABB2D? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth)
-        => spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), effects, layerDepth);
+        => spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), effects, layerDepth);
 
     public void Draw(Texture2D texture, Vector2D position, AABB2D? sourceAABB, Color color)
-        => spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color);
+        => spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color);
 
     public void Draw(Texture2D texture, AABB2D destinationAABB, AABB2D? 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);
+        => spriteBatch.Draw(texture, position.ToVector2(), color);
 
     public void Draw(Texture2D texture, AABB2D 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth, rtl);
 
     public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color)
-        => spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), 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);
+        => spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth, rtl);
 
     public void End()
         => spriteBatch.End();

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

@@ -26,7 +26,7 @@ public class SpriteBatcher : Behaviour, IFirstFrameUpdate, IDraw
 
     public void Draw()
     {
-        spriteBatch.Begin(transformMatrix: camera2D.MatrixTransform);
+        spriteBatch.Begin(transformMatrix: camera2D.ViewMatrix.ToXnaMatrix());
         for (int i = 0; i < drawableSprites.Count; i++)
             drawableSprites[i].Draw(spriteBatch);
         spriteBatch.End();

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

@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-
-using Microsoft.Xna.Framework;
-
-using Engine.Core;
-
-namespace Engine.Integration.MonoGame;
-
-public class TriangleBatcher : Behaviour, ITriangleBatch, IFirstFrameUpdate, IDraw
-{
-    private static Comparer<int> SortByAscendingPriority() => Comparer<int>.Create((x, y) => x.CompareTo(y));
-    private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
-
-    private TriangleBatch triangleBatch = null!;
-    private MonoGameCamera2D camera2D = null!;
-
-    private readonly ActiveBehaviourCollectorOrdered<int, IDrawableTriangle> drawableShapes = new(GetPriority(), SortByAscendingPriority());
-
-    public void FirstActiveFrame()
-    {
-        MonoGameWindowContainer windowContainer = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>();
-        camera2D = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameCamera2D>();
-
-        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/EngineConverter.cs

@@ -9,8 +9,6 @@ namespace 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);
 
@@ -49,15 +47,17 @@ public static class EngineConverterExtensions
         m.M41, m.M42, m.M43, m.M44
     );
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Matrix4x4 FromXnaMatrix(this Matrix m) => new(
+        m.M11, m.M12, m.M13, m.M14,
+        m.M21, m.M22, m.M23, m.M24,
+        m.M31, m.M32, m.M33, m.M34,
+        m.M41, m.M42, m.M43, m.M44
+    );
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static Microsoft.Xna.Framework.Quaternion ToXnaQuaternion(this Core.Quaternion quaternion) => new(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
 
-    [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()
     {
@@ -70,8 +70,8 @@ public static class EngineConverterExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static Rectangle ToRectangle(this AABB2D aabb) => new()
     {
-        X = (int)(aabb.LowerBoundary.X * screenScale.X),
+        X = (int)aabb.LowerBoundary.X,
-        Y = (int)(aabb.LowerBoundary.Y * screenScale.Y),
+        Y = (int)aabb.LowerBoundary.Y,
         Width = (int)(aabb.UpperBoundary.X - aabb.LowerBoundary.X),
         Height = (int)(aabb.UpperBoundary.Y - aabb.LowerBoundary.Y)
     };

Engine.Integration/Engine.Integration.MonoGame/MonoGameTriangleBatch.cs

@@ -2,24 +2,29 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
 using Engine.Core;
+using Engine.Systems.Graphics;
 
 namespace Engine.Integration.MonoGame;
 
-public class TriangleBatch : ITriangleBatch
+public class MonoGameTriangleBatch : Behaviour, ITriangleBatch, IFirstFrameUpdate
 {
-    private readonly GraphicsDevice graphicsDevice;
+    private GraphicsDevice graphicsDevice = null!;
-    private readonly VertexBuffer vertexBuffer = default!;
+    private VertexBuffer vertexBuffer = default!;
     private readonly VertexPositionColor[] vertices = new VertexPositionColor[1024];
 
     private int verticesIndex = 0;
     private Matrix view = Matrix.Identity;
     private Matrix projection = Matrix.Identity;
 
-    private readonly BasicEffect basicEffect = null!;
+    private BasicEffect basicEffect = null!;
     private readonly RasterizerState rasterizerState = new() { CullMode = CullMode.None };
 
-    public TriangleBatch(GraphicsDevice graphicsDevice)
+    private ICamera camera = null!;
+
+    public void FirstActiveFrame()
     {
+        camera = Universe.FindRequiredBehaviour<ICamera>();
+        GraphicsDevice graphicsDevice = Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.GraphicsDevice;
         this.graphicsDevice = graphicsDevice;
         basicEffect = new(graphicsDevice);
         basicEffect.VertexColorEnabled = true;
@@ -31,9 +36,9 @@ public class TriangleBatch : ITriangleBatch
         if (verticesIndex + 3 >= vertices.Length)
             Flush();
 
-        Vector2 A = triangle.A.ToDisplayVector2();
+        Vector2 A = triangle.A.ToVector2();
-        Vector2 B = triangle.B.ToDisplayVector2();
+        Vector2 B = triangle.B.ToVector2();
-        Vector2 C = triangle.C.ToDisplayVector2();
+        Vector2 C = triangle.C.ToVector2();
         Color color = colorRGBA.ToColor();
 
         vertices[verticesIndex++] = new(new(A.X, A.Y, 0f), color);
@@ -41,20 +46,12 @@ public class TriangleBatch : ITriangleBatch
         vertices[verticesIndex++] = new(new(C.X, C.Y, 0f), color);
     }
 
-    public void Begin(Matrix? view = null, Matrix? projection = null)
+    public void Begin(Matrix4x4? view = null, Matrix4x4? projection = null)
-    {
-        if (view != null)
-            this.view = view.Value;
-        else
-            this.view = Matrix.Identity;
-
-        if (projection != null)
-            this.projection = projection.Value;
-        else
     {
         Viewport viewport = graphicsDevice.Viewport;
-            this.projection = Matrix.CreateOrthographicOffCenter(viewport.X, viewport.Width, viewport.Height, viewport.Y, 0, 1);
+
-        }
+        this.view = (view ?? camera.ViewMatrix).Transposed.ToXnaMatrix();
+        this.projection = (projection ?? camera.ProjectionMatrix).Transposed.ToXnaMatrix();
     }
 
     public void End() => Flush();

Engine.Systems/Graphics/DrawableShape2D.cs

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 
 using Engine.Core;
 
-namespace Engine.Integration.MonoGame;
+namespace Engine.Systems.Graphics;
 
-public class DrawableShape : Behaviour2D, IDrawableTriangle, IPreDraw
+public class DrawableShape2D : Behaviour2D, IDrawableTriangle, IPreDraw
 {
     private readonly Shape2D shape = new([]);
     private readonly List<Triangle> worldTriangles = [];
@@ -23,7 +23,7 @@ public class DrawableShape : Behaviour2D, IDrawableTriangle, IPreDraw
 
     protected void UpdateWorldShape() => shape.Transform(Transform, worldShape);
 
-    public DrawableShape() => shape = Shape2D.Triangle;
+    public DrawableShape2D() => shape = Shape2D.Triangle;
-    public DrawableShape(Shape2D shape) => this.shape = shape;
+    public DrawableShape2D(Shape2D shape) => this.shape = shape;
-    public DrawableShape(Shape2D shape, ColorRGB color) { this.shape = shape; this.color = color; }
+    public DrawableShape2D(Shape2D shape, ColorRGB color) { this.shape = shape; this.color = color; }
 }

Engine.Systems/Graphics/IDrawableTriangle.cs

@@ -1,6 +1,6 @@
 using Engine.Core;
 
-namespace Engine.Integration.MonoGame;
+namespace Engine.Systems.Graphics;
 
 public interface IDrawableTriangle : IBehaviour
 {

Engine.Systems/Graphics/ITriangleBatch.cs

@@ -0,0 +1,10 @@
+using Engine.Core;
+
+namespace Engine.Systems.Graphics;
+
+public interface ITriangleBatch
+{
+    void Begin(Matrix4x4? view = null, Matrix4x4? projection = null);
+    void Draw(Triangle triangle, ColorRGBA colorRGBA);
+    void End();
+}

Engine.Systems/Graphics/TriangleBatcher.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+
+using Engine.Core;
+
+namespace Engine.Systems.Graphics;
+
+public class TriangleBatcher : Behaviour, IFirstFrameUpdate, ILastFrameUpdate, IDraw
+{
+    private static Comparer<int> SortByAscendingPriority() => Comparer<int>.Create((x, y) => x.CompareTo(y));
+    private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
+
+    private readonly BehaviourCollector<ITriangleBatch> triangleBatches = new();
+    private readonly ActiveBehaviourCollectorOrdered<int, IDrawableTriangle> drawableShapes = new(GetPriority(), SortByAscendingPriority());
+
+    public void FirstActiveFrame()
+    {
+        drawableShapes.Assign(Universe);
+        triangleBatches.Assign(Universe);
+    }
+
+    public void Draw()
+    {
+        for (int i = 0; i < triangleBatches.Count; i++)
+        {
+            ITriangleBatch triangleBatch = triangleBatches[i];
+            triangleBatch.Begin();
+            for (int j = 0; j < drawableShapes.Count; j++)
+                drawableShapes[j].Draw(triangleBatch);
+            triangleBatch.End();
+        }
+    }
+
+    public void LastActiveFrame()
+    {
+        triangleBatches.Unassign();
+        drawableShapes.Unassign();
+    }
+}

Engine.Systems/Network/Abstract/IPacketListenerClientEntity.cs

@@ -0,0 +1,6 @@
+namespace Engine.Systems.Network;
+
+public interface IPacketListenerClientEntity<T> : INetworkEntity where T : IEntityNetworkPacket
+{
+    void OnEntityClientPacketArrived(IConnection sender, T packet);
+}

Engine.Systems/Network/Abstract/IPacketListenerServerEntity.cs

@@ -0,0 +1,6 @@
+namespace Engine.Systems.Network;
+
+public interface IPacketListenerServerEntity<T> : INetworkEntity where T : IEntityNetworkPacket
+{
+    void OnEntityServerPacketArrived(IConnection sender, T packet);
+}

Engine.Systems/Network/NetworkManager.cs

@@ -10,18 +10,28 @@ namespace Engine.Systems.Network;
 /// <summary>
 /// Intermediary manager that looks up in it's hierarchy for a <see cref="INetworkCommunicator"/> to route/broadcast it's received packets to their destinations.
 /// </summary>
+/// TODO: I urgently need to add proper comments on this manager, I don't exactly remember the state I was in when I was writing it.
+/// It's a fairly complex manager that relies heavily on Reflection and lots of generic method delegation which is making it very hard to read back. 
 public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetworkManager
 {
-    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientPacketArrivalMethods = [];
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientBroadcastPacketArrivalMethods = [];
-    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverPacketArrivalMethods = [];
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverBroadcastPacketArrivalMethods = [];
 
-    private readonly Dictionary<Type, Dictionary<string, object>> clientPacketRouters = [];
+    private readonly Dictionary<Type, Dictionary<string, object>> clientBroadcastPacketRouters = [];
-    private readonly Dictionary<Type, Dictionary<string, object>> serverPacketRouters = [];
+    private readonly Dictionary<Type, Dictionary<string, object>> serverBroadcastPacketRouters = [];
 
-    private readonly List<(Type packetType, Delegate @delegate)> packetRetrievalDelegates = [];
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientEntityPacketArrivalMethods = [];
+    private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverEntityPacketArrivalMethods = [];
+
+    private readonly Dictionary<Type, Dictionary<string, object>> clientEntityPacketRouters = [];
+    private readonly Dictionary<Type, Dictionary<string, object>> serverEntityPacketRouters = [];
+
+    private readonly List<(Type packetType, Delegate @delegate)> broadcastPacketRetrievalDelegates = [];
+    private readonly List<(Type packetType, Delegate @delegate)> entityPacketRetrievalDelegates = [];
 
     private readonly Dictionary<Type, MethodInfo> clearRoutesMethods = [];
-    private readonly Dictionary<Type, MethodInfo> registerPacketListenersMethods = [];
+    private readonly Dictionary<Type, MethodInfo> registerBroadcastPacketListenersMethods = [];
+    private readonly Dictionary<Type, MethodInfo> registerEntityPacketListenersMethods = [];
 
     private readonly Dictionary<string, INetworkEntity> _networkEntities = [];
     public IReadOnlyDictionary<string, INetworkEntity> NetworkEntities => _networkEntities;
@@ -40,63 +50,55 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
             INetworkCommunicator? previousCommunicator = field;
             field = value;
 
-            if (previousCommunicator is not null) UnsubscribeCommunicatorMethods(previousCommunicator);
+            if (previousCommunicator is not null) InvokeCommunicatorMethods(previousCommunicator, nameof(INetworkCommunicator.UnsubscribeFromPackets));
-            if (field is not null) SubscribeCommunicatorMethods(field);
+            if (field is not null) InvokeCommunicatorMethods(field, nameof(INetworkCommunicator.SubscribeToPackets));
         }
     } = null!;
 
-    #region Communicator Subscriptions
+    /// Used to delegate subscription and unsubscription methods on the <see cref="INetworkCommunicator"/> to <see cref="OnPacketReceived{T}(IConnection, T)"/>.
-    private void SubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
+    private void InvokeCommunicatorMethods(INetworkCommunicator networkCommunicator, string name)
-    {
-        MethodInfo subscribeToPacketsMethod = typeof(INetworkCommunicator)
-            .GetMethod(nameof(INetworkCommunicator.SubscribeToPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
-
-        foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
-        {
-            MethodInfo genericSubscribeMethod = subscribeToPacketsMethod.MakeGenericMethod(packetType);
-            genericSubscribeMethod.Invoke(networkCommunicator, [@delegate]);
-        }
-    }
-
-    private void UnsubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
     {
         MethodInfo unsubscribeFromPacketsMethod = typeof(INetworkCommunicator)
-            .GetMethod(nameof(INetworkCommunicator.UnsubscribeFromPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
+            .GetMethod(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
 
-        foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
+        /// Get unique entries by the packetType so we don't get duplicate calls to <see cref="OnPacketReceived{T}(IConnection, T)"/>
+        /// Because a class might have both <see cref="IPacketListenerClient{T}"/> and <see cref="IPacketListenerClientEntity{T}"/>
+        /// or <see cref="IPacketListenerServer{T}"/> and <see cref="IPacketListenerServerEntity{T}"/> together.
+        IEnumerable<(Type packetType, Delegate @delegate)> distinctRetrievalSubscriptionDelegates =
+            broadcastPacketRetrievalDelegates.Concat(entityPacketRetrievalDelegates).DistinctBy(pair => pair.packetType);
+
+        foreach ((Type packetType, Delegate @delegate) in distinctRetrievalSubscriptionDelegates)
         {
-            MethodInfo genericUnsubscribeMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
+            MethodInfo genericMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
-            genericUnsubscribeMethod.Invoke(networkCommunicator, [@delegate]);
+            genericMethod.Invoke(networkCommunicator, [@delegate]);
         }
     }
-    #endregion
 
-    #region Packet Routing
+    #region Packet Routing/Broadcasting
     private void OnPacketReceived<T>(IConnection sender, T entityDataPacket)
     {
+        BroadcastPacket(sender, entityDataPacket);
         if (entityDataPacket is IEntityNetworkPacket entityPacket)
             RoutePacket(sender, entityDataPacket, entityPacket);
-        else
-            BroadcastPacket(sender, entityDataPacket);
     }
 
     private void RoutePacket<T>(IConnection sender, T entityDataPacket, IEntityNetworkPacket entityPacket)
     {
         if (NetworkCommunicator is INetworkCommunicatorClient)
-            RoutePacket(clientPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
+            RoutePacket(clientEntityPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
         if (NetworkCommunicator is INetworkCommunicatorServer)
-            RoutePacket(serverPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
+            RoutePacket(serverEntityPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
     }
 
     private void BroadcastPacket<T>(IConnection sender, T entityDataPacket)
     {
         if (NetworkCommunicator is INetworkCommunicatorClient)
-            BroadcastPacket(clientPacketRouters, sender, entityDataPacket);
+            BroadcastPacket(clientBroadcastPacketRouters, sender, entityDataPacket);
         if (NetworkCommunicator is INetworkCommunicatorServer)
-            BroadcastPacket(serverPacketRouters, sender, entityDataPacket);
+            BroadcastPacket(serverBroadcastPacketRouters, sender, entityDataPacket);
     }
 
-    private static void BroadcastPacket<T>(
+    private void BroadcastPacket<T>(
         Dictionary<Type, Dictionary<string, object>> packetRouters,
         IConnection sender,
         T entityDataPacket)
@@ -111,7 +113,7 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         }
     }
 
-    private static void RoutePacket<T>(
+    private void RoutePacket<T>(
         Dictionary<Type, Dictionary<string, object>> packetRouters,
         string entityId,
         IConnection sender,
@@ -133,13 +135,12 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         INetworkEntity behaviour,
         Dictionary<Type, Dictionary<string, object>> packetRouters,
         Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods,
-        NetworkType networkType)
+        NetworkType networkType, Dictionary<Type, MethodInfo> registerPacketListenersMethods)
     {
         if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
             return;
 
-        foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
+        foreach (Type packetType in arrivalMethods.Keys)
-            foreach (MethodInfo receiveMethod in methods)
         {
             if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
             {
@@ -147,18 +148,20 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
                 packetRouters.Add(packetType, routers);
             }
 
-                object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType);
+            object packetListenerEvent =
+                CreateEventAndRegister(packetType, behaviour, networkType, registerPacketListenersMethods);
+
             routers.Add(behaviour.Id, packetListenerEvent);
         }
     }
 
-    private object CreateEventAndRegister(Type packetType, INetworkEntity behaviour, NetworkType networkType)
+    private object CreateEventAndRegister(Type packetType, INetworkEntity behaviour, NetworkType networkType, Dictionary<Type, MethodInfo> registerPacketListenersMethods)
     {
         Type genericEventType = typeof(Event<,>).MakeGenericType(typeof(IConnection), packetType);
         object packetListenerEvent = Activator.CreateInstance(genericEventType)!;
 
         if (!registerPacketListenersMethods.TryGetValue(packetType, out MethodInfo? registerPacketListenerMethod))
-            throw new($"{nameof(RegisterPacketListenerEvent)} for {packetType.Name} has not been cached.");
+            throw new($"Packet Listener Events for {packetType.Name} has not been cached.");
 
         registerPacketListenerMethod.Invoke(this, [behaviour, packetListenerEvent, networkType]);
         return packetListenerEvent;
@@ -176,6 +179,19 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         }
     }
 
+    private static void RegisterEntityPacketListenerEvent<T>(
+        INetworkEntity behaviour,
+        Event<IConnection, T> packetListenerEvent,
+        NetworkType networkType
+    ) where T : IEntityNetworkPacket
+    {
+        switch (networkType)
+        {
+            case NetworkType.Client: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerClientEntity<T>)behaviour).OnEntityClientPacketArrived(sender, packet)); break;
+            case NetworkType.Server: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerServerEntity<T>)behaviour).OnEntityServerPacketArrived(sender, packet)); break;
+        }
+    }
+
     private void UnregisterPacketRoutersFor(
         INetworkEntity behaviour,
         Dictionary<Type, Dictionary<string, object>> packetRouters,
@@ -215,8 +231,11 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         if (!_networkEntities.TryAdd(collectedBehaviour.Id, collectedBehaviour))
             throw new($"Unable to add {collectedBehaviour.Id} to {nameof(NetworkManager)}");
 
-        RegisterPacketRoutersFor(collectedBehaviour, clientPacketRouters, clientPacketArrivalMethods, NetworkType.Client);
+        RegisterPacketRoutersFor(collectedBehaviour, clientBroadcastPacketRouters, clientBroadcastPacketArrivalMethods, NetworkType.Client, registerBroadcastPacketListenersMethods);
-        RegisterPacketRoutersFor(collectedBehaviour, serverPacketRouters, serverPacketArrivalMethods, NetworkType.Server);
+        RegisterPacketRoutersFor(collectedBehaviour, clientEntityPacketRouters, clientEntityPacketArrivalMethods, NetworkType.Client, registerEntityPacketListenersMethods);
+
+        RegisterPacketRoutersFor(collectedBehaviour, serverBroadcastPacketRouters, serverBroadcastPacketArrivalMethods, NetworkType.Server, registerBroadcastPacketListenersMethods);
+        RegisterPacketRoutersFor(collectedBehaviour, serverEntityPacketRouters, serverEntityPacketArrivalMethods, NetworkType.Server, registerEntityPacketListenersMethods);
     }
 
     private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourRemovedArguments args)
@@ -225,8 +244,11 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         if (!_networkEntities.Remove(args.BehaviourRemoved.Id))
             return;
 
-        UnregisterPacketRoutersFor(removedBehaviour, clientPacketRouters, clientPacketArrivalMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, clientBroadcastPacketRouters, clientBroadcastPacketArrivalMethods);
-        UnregisterPacketRoutersFor(removedBehaviour, serverPacketRouters, serverPacketArrivalMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, clientEntityPacketRouters, clientEntityPacketArrivalMethods);
+
+        UnregisterPacketRoutersFor(removedBehaviour, serverBroadcastPacketRouters, serverBroadcastPacketArrivalMethods);
+        UnregisterPacketRoutersFor(removedBehaviour, serverEntityPacketRouters, serverEntityPacketArrivalMethods);
     }
 
     public void ExitUniverse(IUniverse universe) => _networkEntityCollector.Unassign();
@@ -240,7 +262,8 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
     #region Initialization
     public NetworkManager()
     {
-        CachePacketRetrievalDelegates();
+        CachePacketRetrievalDelegates(typeof(INetworkPacket), broadcastPacketRetrievalDelegates);
+        CachePacketRetrievalDelegates(typeof(IEntityNetworkPacket), entityPacketRetrievalDelegates);
         CacheRegistrationMethods();
         CachePacketArrivalMethods();
 
@@ -248,45 +271,47 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
         _networkEntityCollector.OnRemoved.AddListener(OnRemoved);
     }
 
-    private void CachePacketRetrievalDelegates()
+    private void CachePacketRetrievalDelegates(Type packetType, List<(Type packetType, Delegate @delegate)> retrievalDelegates)
     {
         IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
-            .Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
+            .Where(t => packetType.IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
 
         MethodInfo onPacketArrivedMethod = GetType()
             .GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
 
-        foreach (Type packetType in packetTypes)
+        foreach (Type pType in packetTypes)
         {
-            MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
+            MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(pType);
 
-            Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), packetType);
+            Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), pType);
             Delegate genericPacketReceivedDelegate = Delegate.CreateDelegate(genericDelegateType, this, genericOnPacketArrivedMethod);
-
+            retrievalDelegates.Add((pType, genericPacketReceivedDelegate));
-            packetRetrievalDelegates.Add((packetType, genericPacketReceivedDelegate));
         }
     }
 
     private void CacheRegistrationMethods()
     {
-        CacheRegistrationMethods(registerPacketListenersMethods, nameof(RegisterPacketListenerEvent));
+        CacheRegistrationMethods(registerBroadcastPacketListenersMethods, nameof(RegisterPacketListenerEvent), broadcastPacketRetrievalDelegates);
-        CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter));
+        CacheRegistrationMethods(registerEntityPacketListenersMethods, nameof(RegisterEntityPacketListenerEvent), entityPacketRetrievalDelegates);
+        CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter), broadcastPacketRetrievalDelegates);
     }
 
-    private void CacheRegistrationMethods(Dictionary<Type, MethodInfo> registrationMethods, string methodName)
+    private void CacheRegistrationMethods(Dictionary<Type, MethodInfo> registrationMethods, string methodName, List<(Type packetType, Delegate @delegate)> packetRetrievalDelegates)
     {
         MethodInfo registerPacketMethod = typeof(NetworkManager).GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Static)!;
         foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
         {
             MethodInfo genericMethod = registerPacketMethod.MakeGenericMethod(packetType);
-            registrationMethods.Add(packetType, genericMethod);
+            registrationMethods.TryAdd(packetType, genericMethod);
         }
     }
 
     private void CachePacketArrivalMethods()
     {
-        CachePacketArrivalMethods(clientPacketArrivalMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<INetworkEntity>.OnClientPacketArrived));
+        CachePacketArrivalMethods(clientBroadcastPacketArrivalMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<>.OnClientPacketArrived));
-        CachePacketArrivalMethods(serverPacketArrivalMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<INetworkEntity>.OnServerPacketArrived));
+        CachePacketArrivalMethods(serverBroadcastPacketArrivalMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<>.OnServerPacketArrived));
+        CachePacketArrivalMethods(clientEntityPacketArrivalMethods, typeof(IPacketListenerClientEntity<>), nameof(IPacketListenerClientEntity<>.OnEntityClientPacketArrived));
+        CachePacketArrivalMethods(serverEntityPacketArrivalMethods, typeof(IPacketListenerServerEntity<>), nameof(IPacketListenerServerEntity<>.OnEntityServerPacketArrived));
     }
 
     private static void CachePacketArrivalMethods(Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods, Type listenerType, string packetArrivalMethodName)