Added a TriggerSystem, seems to work as intended.

include/Engine/Collision/Collision.h

@@ -37,6 +37,7 @@ bool RayVsModel(const Ray& ray,
 
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
+bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f);
 
 }
 

include/Engine/Collision/ETrigger.h

@@ -25,7 +25,7 @@ struct TriggerLeave : Event
     EntityID Trigger;
 };
 
-/** Thrown when an entity is completely inside a trigger. */
+/** Thrown once, when an entity is completely inside a trigger. */
 struct TriggerEnter : Event
 {
     /** The id of the entity that entered the trigger. */

include/Engine/Collision/TriggerSystem.h

@@ -8,6 +8,8 @@
 #include "Core/EventBroker.h"
 #include "ETrigger.h"
 
+class AABB;
+
 class TriggerSystem : public System
 {
 public:
@@ -18,7 +20,21 @@ public:
     virtual void Update(World* world, ComponentWrapper& collision, double dt) override;
 
 private:
-    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesInTrigger;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;
+
+    bool getEntityBox(World* world, EntityID id, AABB& outBox);
+    //True if leave event was thrown.
+    bool throwLeaveIfWasInTrigger(std::unordered_set<EntityID>& triggerSet, EntityID pId, EntityID tId);
+    void attachAABBComponentFromModel(World* world, EntityID id);
+    template<typename Event>
+    void publish(EntityID pId, EntityID tId)
+    {
+        Event e;
+        e.Trigger = tId;
+        e.Entity = pId;
+        m_EventBroker->Publish(e);
+    }
 };
 
 #endif

include/Game/PlayerSystem.h

@@ -9,6 +9,7 @@
 #include "Core/EventBroker.h"
 #include "Core/EKeyDown.h"
 #include "Core/EKeyUp.h"
+#include "Collision/ETrigger.h"
 
 struct KeyInput
 {
@@ -26,6 +27,9 @@ public:
     {
         EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown);
         EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp);
+        EVENT_SUBSCRIBE_MEMBER(m_ETouch, &PlayerSystem::OnTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_EEnter, &PlayerSystem::OnEnter);
+        EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave);
     }
 
     virtual void Update(World* world, ComponentWrapper& player, double dt) override;
@@ -39,6 +43,12 @@ private:
     bool OnKeyDown(const Events::KeyDown &event);
     EventRelay<PlayerSystem, Events::KeyUp> m_EKeyUp;
     bool OnKeyUp(const Events::KeyUp &event);
+    EventRelay<PlayerSystem, Events::TriggerEnter> m_EEnter;
+    bool OnEnter(const Events::TriggerEnter &event);
+    EventRelay<PlayerSystem, Events::TriggerTouch> m_ETouch;
+    bool PlayerSystem::OnTouch(const Events::TriggerTouch &event);
+    EventRelay<PlayerSystem, Events::TriggerLeave> m_ELeave;
+    bool PlayerSystem::OnLeave(const Events::TriggerLeave &event);
 };
 
 #endif