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

Merge branch 'master' into OctTree

Browse Source 
# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2015-12-17 16:44:01 +01:00
parent 3e2ffdb85b 8000654005
commit 46ae2d39af
15 changed files with 423 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+1 -1
View File
@@ -54,9 +54,9 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline = new SystemPipeline(m_EventBroker);
m_SystemPipeline->AddSystem<RaptorCopterSystem>();
m_SystemPipeline->AddSystem<PlayerSystem>();
m_SystemPipeline->AddSystem<EditorSystem>(m_Renderer);
m_SystemPipeline->AddSystem<CollisionSystem>();
m_SystemPipeline->AddSystem<TriggerSystem>();
m_SystemPipeline->AddSystem<EditorSystem>();
m_LastTime = glfwGetTime();