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

Merge remote-tracking branch 'origin/master' into Sound

Browse Source 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
This commit is contained in:
stiffly
2016-01-15 16:25:32 +01:00
parent be33dfbd69 ce8dcd3022
commit 5c45dbdd10
46 changed files with 1306 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+4
View File
@@ -9,11 +9,13 @@ Game::Game(int argc, char* argv[])
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
ResourceManager::RegisterType<Sound>("Sound");
ResourceManager::RegisterType<Model>("Model");
ResourceManager::RegisterType<RawModel>("RawModel");
ResourceManager::RegisterType<Texture>("Texture");
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
ResourceManager::RegisterType<EntityFile>("EntityFile");
m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
ResourceManager::UseThreading = m_Config->Get<bool>("Multithreading.ResourceLoading", true);
LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));
// Create the core event broker
@@ -56,6 +58,8 @@ Game::Game(int argc, char* argv[])
EntityFileParser fp(file);
fp.MergeEntities(m_World);
}
//SO MUCH TEMP PLEASE REMOVE ME OMFG VIKTOR HELP
m_Renderer->m_World = m_World;
// Create system pipeline
m_SystemPipeline = new SystemPipeline(m_EventBroker);