feat: Trigger- & CollisionSystem extended events

src/Apps/GameDesktop/CompositionRoots/Features/RootFeatureCompositionRoot.cs

@@ -165,7 +165,7 @@ private static void RegisterEntryPoint(IServiceRegistry serviceRegistry)
                 Left = -30,
                 Top = -20,
                 TextAlign = TextHorizontalAlignment.Right,
-                Text = "Pre-alpha v0.2.2"
+                Text = "Pre-alpha v0.2.4"
             }));
         serviceRegistry.RegisterSingleton<Func<GameVersion>>(factory => factory.GetInstance<GameVersion>);
 

src/Libs/Entities/Factories/Characters/PlayerEntityFactory.cs

@@ -12,29 +12,29 @@ namespace Entities.Factories.Characters;
 // But also, for the factory, ig, the view of the entities class will change.
 // For now, Imma keep it as it is.
 public class PlayerEntityFactory(
-    NameComponent nameComponent,
+    NameComponent name,
     InputMovableComponent inputMovable,
     MovableComponent movable,
     TransformComponent transform,
     CameraComponent cameraComponent,
     RectangleColliderComponent rectangleCollider,
-    InventoryComponent inventoryComponent)
+    InventoryComponent inventory)
     : EntityFactory
 {
     private readonly MovementAnimationsComponent _movementAnimations;
     private readonly CharacterAnimatorComponent _characterAnimator;
 
     public PlayerEntityFactory(
-        NameComponent nameComponent,
+        NameComponent name,
         InputMovableComponent inputMovable,
         MovableComponent movable,
         TransformComponent transform,
         CameraComponent cameraComponent,
         RectangleColliderComponent rectangleCollider,
         MovementAnimationsComponent movementAnimations,
         CharacterAnimatorComponent characterAnimator,
-        InventoryComponent inventoryComponent) : this(nameComponent, inputMovable, movable, transform, cameraComponent,
-        rectangleCollider, inventoryComponent)
+        InventoryComponent inventory) : this(name, inputMovable, movable, transform, cameraComponent, rectangleCollider,
+        inventory)
     {
         _movementAnimations = movementAnimations;
         _characterAnimator = characterAnimator;
@@ -49,10 +49,10 @@ protected override void AddTags(Entity e)
 
     protected override void AddData(Entity e)
     {
-        e.AddComponent(nameComponent);
+        e.AddComponent(name);
         e.AddComponent(transform);
         e.AddComponent(rectangleCollider);
-        e.AddComponent(inventoryComponent);
+        // e.AddComponent(inventory);
     }
 
     protected override void AddRender(Entity e)

src/Libs/Systems/CollisionSystem.cs

@@ -16,9 +16,18 @@ public class CollisionSystem(World world) : IFixedSystem
 {
     public World World { get; set; } = world;
 
-    public delegate void TriggerHandler(Entity sender, CustomEventArgs args);
+    // TODO: Use graph instead (e.g. QuikGraph library), so will be handled the cases of relations like (combinatorics):
+    // { 1: [2, 3] }, { 2: [1, 2] }, { 3: [1] }, { 4: [] }
+    private (EntityId, EntityId)[] _activeIntersect = [];
 
-    public event TriggerHandler? RaiseTriggerIntersect;
+    public delegate void OutsideHandler(Entity sender, Entity with);
+
+    public delegate void InsideHandler(Entity sender, Entity with, bool isTriggerEvent);
+
+    // https://stackoverflow.com/questions/803242/understanding-events-and-event-handlers-in-c-sharp#:~:text=For%20completeness%27%20sake,fun%22%20NullReferenceException%20there.
+    public event InsideHandler? Entered;
+    public event InsideHandler? Stay;
+    public event OutsideHandler? Exited;
 
     public void OnAwake()
     {
@@ -43,22 +52,42 @@ public void OnUpdate(float deltaTime)
                 ref var rightTransform = ref other.GetComponent<TransformComponent>();
                 ref var rightCollider = ref other.GetComponent<RectangleColliderComponent>();
 
-                if (!Intersect(new(leftTransform, leftCollider),
-                        new(rightTransform, rightCollider))) continue;
-
-                // TODO: OnEnter, OnStay, OnExit
-                if (leftCollider.IsTrigger || rightCollider.IsTrigger)
-                    OnRaiseTriggerIntersect(other, new CustomEventArgs("Intersect"));
-                else OnCollision(ref leftTransform, ref rightTransform);
+                var intersect = Intersect(new(leftTransform, leftCollider),
+                    new(rightTransform, rightCollider));
+                var entities = (e.ID, other.ID);
+                if (!intersect)
+                {
+                    if (_activeIntersect.Contains(entities))
+                    {
+                        _activeIntersect = _activeIntersect
+                            .TakeWhile(x => x != entities)
+                            .ToArray();
+
+                        Exited?.Invoke(e, other);
+                    }
+
+                    continue;
+                }
+
+                var isTriggerEvent = leftCollider.IsTrigger || rightCollider.IsTrigger;
+                if (!isTriggerEvent) OnCollision(ref leftTransform, ref rightTransform);
+
+                if (_activeIntersect.Contains(entities) || _activeIntersect.Contains((entities.Item2, entities.Item1)))
+                {
+                    Stay?.Invoke(e, other, isTriggerEvent);
+                    continue;
+                }
+
+                _activeIntersect = _activeIntersect
+                    .TakeWhile(x => x != entities || x != (entities.Item2, entities.Item1))
+                    .Append(entities)
+                    .ToArray();
+
+                Entered?.Invoke(e, other, isTriggerEvent);
             }
         }
     }
 
-    private void OnRaiseTriggerIntersect(Entity sender, CustomEventArgs customEventArgs)
-    {
-        customEventArgs.Message += $" at {DateTime.Now}";
-        RaiseTriggerIntersect?.Invoke(sender, customEventArgs);
-    }
 
     private static void OnCollision(ref TransformComponent left, ref TransformComponent right)
     {

src/Libs/Systems/InventorySystem.cs

@@ -7,20 +7,20 @@ public class InventorySystem(World world) : ISystem
 {
     public World World { get; set; } = world;
 
-    public delegate void InventoryHandler(Entity sender, ref InventoryComponent inventory);
+    public delegate void InitializeHandler(Entity sender, ref InventoryComponent inventory);
 
-    public event InventoryHandler? RaiseInventoryInitialized;
+    public event InitializeHandler? InventoryInitialized;
 
     public void OnAwake()
     {
         var filter = World.Filter.With<InventoryComponent>().Build();
 
-        if (filter is null) return;
+        if (filter.IsEmpty()) return;
 
         var entity = filter.First();
         ref var inventory = ref entity.GetComponent<InventoryComponent>();
 
-        RaiseInventoryInitialized?.Invoke(entity, ref inventory);
+        InventoryInitialized?.Invoke(entity, ref inventory);
     }
 
     public void OnUpdate(float deltaTime)

src/Libs/Systems/TriggerSystem.cs

@@ -5,15 +5,24 @@ namespace Systems;
 public class TriggerSystem : IFixedSystem
 {
     public World World { get; set; }
-    // TODO: List/Dictionary of intersecting colliders, so we can know who entered, staying, exited
 
     public TriggerSystem(World world, CollisionSystem collisionSystem)
     {
         World = world;
-        collisionSystem.RaiseTriggerIntersect += OnTriggerIntersect;
+        collisionSystem.Entered += OnTriggerEntered;
+        collisionSystem.Stay += OnTriggerStay;
+        collisionSystem.Exited += OnTriggerExited;
     }
 
-    private void OnTriggerIntersect(Entity sender, CustomEventArgs e)
+    private void OnTriggerEntered(Entity sender, Entity with, bool isTriggerEvent)
+    {
+    }
+
+    private void OnTriggerStay(Entity sender, Entity with, bool isTriggerEvent)
+    {
+    }
+
+    private void OnTriggerExited(Entity sender, Entity with)
     {
     }
 

src/Libs/UI/Blocks/Counter.cs

@@ -12,4 +12,9 @@ public Counter(Container container, Label counterLabel) : this(counterLabel) =>
         container.Widgets.Add(_counterLabel);
 
     public void UpdateText() => _counterLabel.Text = $"Count: {Count}";
+
+    // Test methods
+    public void SayEntered() => _counterLabel.Text = "Entered";
+
+    public void SayExited() => _counterLabel.Text = "Exited";
 }

src/Libs/UI/Blocks/Inventory.cs

@@ -16,7 +16,7 @@ public Inventory(Container container, InventorySystem inventorySystem)
         _container = container;
         _inventorySystem = inventorySystem;
 
-        _inventorySystem.RaiseInventoryInitialized += OnInventoryInitialized;
+        _inventorySystem.InventoryInitialized += OnInventoryInitialized;
     }
 
     private void OnInventoryInitialized(Entity sender, ref InventoryComponent inventory)

src/Libs/UI/Factories/UIFactory.cs

@@ -14,11 +14,16 @@ public UIFactory AddTriggerCounter()
 
         counter.UpdateText();
 
-        collisionSystem.RaiseTriggerIntersect += (_, _) =>
-        {
-            ++counter.Count;
-            counter.UpdateText();
-        };
+        // collisionSystem.Stay += (_, _, isTriggerEvent) =>
+        // {
+        //     if (!isTriggerEvent) return;
+        //
+        //     ++counter.Count;
+        //     counter.UpdateText();
+        // };
+
+        collisionSystem.Entered += (_, _, _) => counter.SayEntered();
+        collisionSystem.Exited += (_, _) => counter.SayExited();
 
         return this;
     }