Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

include/Engine/Core/EntityXMLFileParser.h

@@ -6,12 +6,13 @@
 
 class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
     EntityXMLFileParser(const EntityXMLFile* entityFile);
 
+private:
     EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
 
-private:
     const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;

include/Engine/Core/EntityXMLFilePreprocessor.h

@@ -21,12 +21,13 @@
 
 class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
     EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
+private:
     void RegisterComponents(World* world);
 
-private:
     const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;

include/Engine/Editor/EditorSystem.h

@@ -5,8 +5,7 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityXMLFilePreprocessor.h"
-#include "../Core/EntityXMLFileParser.h"
+#include "../Core/EntityFile.h"
 #include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"

include/Game/Systems/AmmoPickupSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"

include/Game/Systems/BoostSystem.h

@@ -3,7 +3,7 @@
 
 #include "Core/System.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 

include/Game/Systems/DamageIndicatorSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 #include <tuple>

include/Game/Systems/PickupSpawnSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"

include/Game/Systems/PlayerDeathSystem.h

@@ -6,10 +6,7 @@
 #include "GLM.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-
-#include "Core/EntityXMLFile.h"
-#include "Core/EntityXMLFileParser.h"
-
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDeath.h"
 #include "Core/EEntityDeleted.h"
 

include/Game/Systems/PlayerMovementSystem.h

@@ -6,9 +6,7 @@
 #include <imgui/imgui.h>
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
-
-#include "Core/EntityXMLFile.h"
-#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityFile.h"
 
 class PlayerMovementSystem : public ImpureSystem
 {