WIP of xrAI and xrSE_Factory. Headers reorganization and cleanup.

Author: intorr

src/utils/xrAI/compiler.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include "xrCDB/xrCDB.h"
-#include "AIMapExport.h"
 #include "utils/Shader_xrLC.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "editors/LevelEditor/Engine/communicate.h"
 #include "Layers/xrRender/ETextureParams.h"
+#include "AIMapExport.h"
 
 // base patch used all the time up to merging
 const u32 InvalidNode = (1 << 24) - 1;

src/utils/xrAI/factory_api.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrServer_Object_Base.h"
+#include "xrServerEntities/xrServer_Object_Base.h"
 
 extern "C" {
 typedef XR_IMPORT IServerEntity* __stdcall Factory_Create(LPCSTR section);

src/utils/xrAI/game_graph_builder.cpp

@@ -8,9 +8,7 @@
 
 #include "stdafx.h"
 #include "game_graph_builder.h"
-#include "xrAICore/Navigation/graph_abstract.h"
-#include "xrAICore/Navigation/graph_engine.h"
-#include "xrServer_Objects_ALife.h"
+#include "xrServerEntities/xrServer_Objects_ALife.h"
 #include "factory_api.h"
 #include "guid_generator.h"
 

src/utils/xrAI/game_graph_builder.h

@@ -8,36 +8,14 @@
 
 #pragma once
 
-#include "Common/LevelStructure.hpp"
-#include "alife_space.h"
-#include <loki/EmptyType.h>
-
-class CLevelGraph;
-class CGameLevelCrossTable;
-
-template
-<
-    typename _data_type /*= Loki::EmptyType*/,
-    typename _edge_weight_type /*= float*/,
-    typename _vertex_id_type/* = u32*/,
-    typename _edge_data_type = Loki::EmptyType
->
-class CGraphAbstract;
-
-namespace GameGraph
-{
-struct CVertex;
-};
-
-class NET_Packet;
-
-class CGraphEngine;
+#include "xrAICore/Navigation/graph_abstract.h"
+#include "xrAICore/Navigation/graph_engine.h"
 
 class CGameGraphBuilder
 {
 private:
     typedef GameGraph::CVertex vertex_type;
-    typedef CGraphAbstract<vertex_type, float, u32> graph_type;
+    typedef CGraphAbstract<vertex_type, float, u32, Loki::EmptyType> graph_type;
     typedef xr_vector<xr_vector<u32>> DISTANCES;
     typedef std::pair<u32, u32> PAIR;
     typedef std::pair<float, PAIR> TRIPPLE;

src/utils/xrAI/game_spawn_constructor.cpp

@@ -8,10 +8,9 @@
 
 #include "stdafx.h"
 #include "game_spawn_constructor.h"
-#include "level_spawn_constructor.h"
-#include "xrServer_Objects_ALife_All.h"
 #include "xrAICore/Navigation/graph_engine.h"
 #include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
+#include "level_spawn_constructor.h"
 #include "xrAI.h"
 
 extern LPCSTR GAME_CONFIG;

src/utils/xrAI/game_spawn_constructor.h

@@ -8,17 +8,15 @@
 
 #pragma once
 
-#include "alife_space.h"
 #include "xr_graph_merge.h"
 #include "xrAICore/Navigation/graph_abstract.h"
+#include "xrServerEntities/alife_space.h"
+#include "level_spawn_constructor.h"
 #include "spawn_constructor_space.h"
 #include "server_entity_wrapper.h"
 #include "guid_generator.h"
 
-class CSE_Abstract;
 class CLevelSpawnConstructor;
-class CSE_ALifeCreatureAbstract;
-class CPatrolPathStorage;
 
 class CGameSpawnConstructor
 {

src/utils/xrAI/level_spawn_constructor.cpp

@@ -8,14 +8,9 @@
 
 #include "stdafx.h"
 #include "level_spawn_constructor.h"
-#include "xrAICore/Navigation/graph_engine.h"
-#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
-#include "xrServer_Objects_ALife_All.h"
+#include "xrServerEntities/restriction_space.h"
+#include "xrServerEntities/clsid_game.h"
 #include "factory_api.h"
-#include "clsid_game.h"
-#include "game_spawn_constructor.h"
-#include "space_restrictor_wrapper.h"
-#include "restriction_space.h"
 
 #define IGNORE_ZERO_SPAWN_POSITIONS
 

src/utils/xrAI/level_spawn_constructor.h

@@ -8,22 +8,13 @@
 
 #pragma once
 
+#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
 #include "utils/xrLCUtil/xrThread.hpp"
 #include "spawn_constructor_space.h"
+#include "space_restrictor_wrapper.h"
+#include "game_spawn_constructor.h"
 
-class CLevelGraph;
-class CGameLevelCrossTable;
 class CGameSpawnConstructor;
-class CSE_ALifeCreatureActor;
-class CGraphEngine;
-class CSE_Abstract;
-class CSE_ALifeObject;
-class CSE_ALifeGraphPoint;
-// class CSE_SpawnGroup;
-class CSE_ALifeAnomalousZone;
-class CSpaceRestrictorWrapper;
-class CPatrolPathStorage;
-class CSE_ALifeDynamicObject;
 
 class CLevelSpawnConstructor : public CThread
 {

src/utils/xrAI/server_entity_wrapper.cpp

@@ -8,8 +8,8 @@
 
 #include "stdafx.h"
 #include "server_entity_wrapper.h"
-#include "xrServer_Objects.h"
-#include "xrmessages.h"
+#include "xrServerEntities/xrServer_Objects.h"
+#include "xrServerEntities/xrmessages.h"
 
 #ifdef AI_COMPILER
 #include "factory_api.h"

src/utils/xrAI/server_entity_wrapper.h

@@ -8,9 +8,7 @@
 
 #pragma once
 
-#include "Common/object_interfaces.h"
-
-class CSE_Abstract;
+#include "xrServerEntities/xrServer_Object_Base.h"
 
 class CServerEntityWrapper : public ISerializable
 {