Move AI navigation to xrAICore.

Author: nitrocaster

src/xrServerEntities/LevelGameDef.h renamed to src/Common/LevelGameDef.h

@@ -1,6 +1,4 @@
-//---------------------------------------------------------------------------
-#ifndef LevelGameDefH
-#define LevelGameDefH
+#pragma once
 
 #define RPOINT_CHOOSE_NAME 		"$rpoint"
 #define ENVMOD_CHOOSE_NAME 		"$env_mod"
@@ -20,9 +18,10 @@ enum EWayType{
 };
 
 enum ERPpointType{		// [0..255]
-	rptActorSpawn		= 0,
-	rptArtefactSpawn	,
-    rptItemSpawn		,
+	rptActorSpawn = 0,
+	rptArtefactSpawn,
+    rptItemSpawn,
+    rptLast = 0xff
 };
 
 enum EEnvModUsedParams{	eViewDist 		=(1<<0),
@@ -33,8 +32,14 @@ enum EEnvModUsedParams{	eViewDist 		=(1<<0),
                         eHemiColor 		=(1<<5)
 };
 
-extern ECORE_API xr_token rpoint_type[];
-extern ECORE_API xr_token rpoint_game_type[];
+/* // XXX: find better place for this (need cpp)
+xr_token rpoint_type[] = {
+    {"Actor Spawn", rptActorSpawn},
+    {"Artefact Spawn", rptArtefactSpawn},
+    {"Item Spawn", rptItemSpawn},
+    {nullptr, rptLast}
+};
+*/
 
 // BASE offset
 #define WAY_BASE					0x1000
@@ -98,6 +103,3 @@ extern ECORE_API xr_token rpoint_game_type[];
 	-//-
 
 */
-//---------------------------------------------------------------------------
-#endif //LevelGameDefH
-

src/Common/LevelStructure.hpp

@@ -288,6 +288,8 @@ struct SNodePositionOld
 typedef SNodePositionOld NodePosition;
 #endif
 
+const char LEVEL_GRAPH_NAME[] = "level.ai";
+
 const u32 XRCL_CURRENT_VERSION = 18; // input
 const u32 XRCL_PRODUCTION_VERSION = 14; // output
 const u32 CFORM_CURRENT_VERSION = 4;

src/Include/xrAPI/xrAPI.h

@@ -17,6 +17,7 @@ class IUIRender;
 class CGameMtlLibrary;
 class CRender;
 class CScriptEngine;
+class AISpaceBase;
 
 class XRAPI_API EngineGlobalEnvironment
 {
@@ -33,6 +34,8 @@ class XRAPI_API EngineGlobalEnvironment
 #endif
     IRenderFactory* RenderFactory;
     CScriptEngine* ScriptEngine;
+    AISpaceBase *AISpace;
 };
 
-extern XRAPI_API EngineGlobalEnvironment GlobalEnv;
+extern XRAPI_API EngineGlobalEnvironment GlobalEnv; // XXX: rename to GEnv
+extern XRAPI_API bool g_dedicated_server; // XXX: move to EngineGlobalEnvironment

src/Layers/xrAPI/xrAPI.cpp

@@ -2,3 +2,4 @@
 #include "Include/xrAPI/xrAPI.h"
 
 EngineGlobalEnvironment GlobalEnv = {};
+bool g_dedicated_server = false;

src/utils/xrAI/compiler.h

@@ -51,7 +51,7 @@ struct vertex					// definition of "patch" or "node"
 
 DEF_VECTOR(DWORDs,u32);
 
-#include "xrGame/level_graph.h"
+#include "xrAICore/Navigation/level_graph.h"
 
 void	Compress	(CLevelGraph::CVertex& Dest, vertex& Src);
 

src/utils/xrAI/compiler_load.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "compiler.h"
-#include "levelgamedef.h"
-#include "xrGame/level_graph.h"
+#include "Common/LevelGameDef.h"
+#include "xrAICore/Navigation/level_graph.h"
 #include "AIMapExport.h"
 
 IC	const Fvector vertex_position(const CLevelGraph::CPosition &Psrc, const Fbox &bb, const SAIParams &params)

src/utils/xrAI/game_graph_builder.cpp

@@ -8,15 +8,15 @@
 
 #include "stdafx.h"
 #include "game_graph_builder.h"
-#include "xrGame/level_graph.h"
-#include "xrGame/graph_abstract.h"
+#include "xrAICore/Navigation/level_graph.h"
+#include "xrAICore/Navigation/graph_abstract.h"
 #include "xrMessages.h"
 #include "xrServer_Objects_ALife.h"
 #include "factory_api.h"
-#include "xrGame/game_level_cross_table.h"
+#include "xrAICore/Navigation/game_level_cross_table.h"
 #include "xrCrossTable.h"
 #include "guid_generator.h"
-#include "xrGame/graph_engine.h"
+#include "xrAICore/Navigation/graph_engine.h"
 
 CGameGraphBuilder::CGameGraphBuilder		()
 {

src/utils/xrAI/game_spawn_constructor.cpp

@@ -13,8 +13,8 @@
 #include "xrServer_Objects_ALife_All.h"
 #include "xrai.h"
 #include "server_entity_wrapper.h"
-#include "xrGame/graph_engine.h"
-#include "xrGame/patrol_path_storage.h"
+#include "xrAICore/Navigation/graph_engine.h"
+#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
 
 extern LPCSTR GAME_CONFIG;
 extern LPCSTR generate_temp_file_name			(LPCSTR header0, LPCSTR header1, string_path& buffer);

src/utils/xrAI/game_spawn_constructor.h

@@ -11,7 +11,7 @@
 #include "alife_space.h"
 #include "xr_graph_merge.h"
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "xrGame/graph_abstract.h"
+#include "xrAICore/Navigation/graph_abstract.h"
 #include "xrServer_Object_Base.h"
 #include "spawn_constructor_space.h"
 #include "server_entity_wrapper.h"

src/utils/xrAI/level_spawn_constructor.cpp

@@ -8,16 +8,16 @@
 
 #include "stdafx.h"
 #include "level_spawn_constructor.h"
-#include "xrGame/game_level_cross_table.h"
-#include "xrGame/level_graph.h"
-#include "xrGame/graph_engine.h"
+#include "xrAICore/Navigation/game_level_cross_table.h"
+#include "xrAICore/Navigation/level_graph.h"
+#include "xrAICore/Navigation/graph_engine.h"
 #include "xrmessages.h"
 #include "xrServer_Objects_ALife_All.h"
 #include "factory_api.h"
 #include "clsid_game.h"
 #include "game_base_space.h"
 #include "game_spawn_constructor.h"
-#include "xrGame/patrol_path_storage.h"
+#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
 #include "space_restrictor_wrapper.h"
 #include "Common/object_broker.h"
 #include "restriction_space.h"