Merge remote-tracking branch 'origin/Animations'

2016-01-24 23:06:59 +01:00
parent d0de169613 79fe7693a6
commit d6cc1eaac4
15 changed files with 276 additions and 33 deletions
@@ -10,6 +10,7 @@
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 #include "Game/Systems/WeaponSystem.h"
+#include "../Engine/Rendering/AnimationSystem.h"

 Game::Game(int argc, char* argv[])
 {
@@ -86,6 +87,7 @@ Game::Game(int argc, char* argv[])
    // Populate Octree with collidables
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision);
+    m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
    // Collision and TriggerSystem should update after player.
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);