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

Merge pull request #82 from teamfisk/BoxModelCollision

Browse Source 
Small fixes to collision/trigger-boxes, etc.
This commit is contained in:
Simon Holmberg
2016-02-10 10:08:54 +01:00
parent 5987751add 830e0f66c9
commit 90192e016a
12 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
#include "Game.h"
#include "Collision/CollidableOctreeSystem.h"
#include "Collision/FillOctreeSystem.h"
#include "Collision/EntityAABB.h"
#include "Collision/TriggerSystem.h"
#include "Collision/CollisionSystem.h"
@@ -97,8 +97,8 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
// Populate Octree with collidables
++updateOrderLevel;
m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);