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

Merge remote-tracking branch 'origin/Menu' into DamageIndicator

Browse Source
This commit is contained in:
verysecrethero
2016-02-08 15:03:45 +01:00
parent 5987751add 8034b42c87
commit db5301ff2c
16 changed files with 318 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+2 -1
View File
@@ -16,6 +16,7 @@
#include "Game/Systems/PlayerHUD.h"
#include "Game/Systems/LifetimeSystem.h"
#include "../Engine/Rendering/AnimationSystem.h"
#include "../Engine/Core/UniformScaleSystem.h"
Game::Game(int argc, char* argv[])
{
@@ -101,7 +102,7 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<UniformScaleSystem>(updateOrderLevel);
// Collision and TriggerSystem should update after player.
++updateOrderLevel;
m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);