From b1970d93f919b6fcaf4f2140892e041d68f6c8fc Mon Sep 17 00:00:00 2001
From: Syntriax <Syntriax@gmail.com>
Date: Fri, 23 May 2025 22:39:32 +0300
Subject: [PATCH] refactor: draw & update managers to use active & sorted by
 priority collector

---
 Engine.Core/Systems/DrawManager.cs   |  8 +++++---
 Engine.Core/Systems/UpdateManager.cs | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Engine.Core/Systems/DrawManager.cs b/Engine.Core/Systems/DrawManager.cs
index bad774c..d924f37 100644
--- a/Engine.Core/Systems/DrawManager.cs
+++ b/Engine.Core/Systems/DrawManager.cs
@@ -3,9 +3,11 @@ namespace Syntriax.Engine.Core;
 
 public class DrawManager : UniverseObject
 {
-    private readonly BehaviourCollector<IPreDraw> preDrawEntities = new();
-    private readonly BehaviourCollector<IDraw> drawEntities = new();
-    private readonly BehaviourCollector<IPostDraw> postDrawEntities = new();
+    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
+
+    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)
     {
diff --git a/Engine.Core/Systems/UpdateManager.cs b/Engine.Core/Systems/UpdateManager.cs
index a2371f5..7e27e6d 100644
--- a/Engine.Core/Systems/UpdateManager.cs
+++ b/Engine.Core/Systems/UpdateManager.cs
@@ -5,10 +5,12 @@ namespace Syntriax.Engine.Core;
 
 public class UpdateManager : UniverseObject
 {
-    private readonly BehaviourCollector<IFirstFrameUpdate> firstFrameUpdates = new();
-    private readonly BehaviourCollector<IPreUpdate> preUpdateEntities = new();
-    private readonly BehaviourCollector<IUpdate> updateEntities = new();
-    private readonly BehaviourCollector<IPostUpdate> postUpdateEntities = new();
+    private static System.Comparison<IBehaviour> SortByPriority() => (x, y) => y.Priority.CompareTo(x.Priority);
+
+    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 = [];