BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Can add any objects that inherit from AABB into the Octree.

Browse Source
This commit is contained in:
William Moberg
2016-01-19 14:50:46 +01:00
parent 621d935d7a
commit 713ebbe18c
8 changed files with 224 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Collision/TriggerSystem.h
+2 -2
View File
@@ -14,7 +14,7 @@ class AABB;
class TriggerSystem : public PureSystem
{
public:
TriggerSystem(EventBroker* eventBroker, Octree* octree)
TriggerSystem(EventBroker* eventBroker, Octree<AABB>* octree)
: System(eventBroker)
, PureSystem("Trigger")
, m_Octree(octree)
@@ -27,7 +27,7 @@ public:
virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override;
private:
Octree* m_Octree;
Octree<AABB>* m_Octree;
std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesTouchingTrigger;
std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesCompletelyInTrigger;