EntityFileParser

2016-01-07 13:10:44 +01:00
parent 0bcbcda8b8
commit 03456ad731
5 changed files with 153 additions and 36 deletions
@@ -49,9 +49,11 @@ Game::Game(int argc, char* argv[])
    m_World = new World();
    std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
    if (!mapToLoad.empty()) {
-        //ResourceManager::Load<EntityXMLFile>(mapToLoad)->PopulateWorld(m_World);
-        EntityFilePreprocessor fp(mapToLoad);
-        fp.RegisterComponents(m_World);
+        auto file = ResourceManager::Load<EntityFile>(mapToLoad);
+        EntityFilePreprocessor fpp(mapToLoad);
+        fpp.RegisterComponents(m_World);
+        EntityFileParser fp(file);
+        fp.MergeEntities(m_World);
    }

    // Create system pipeline