mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
NavMesh hot swap system improvements
* Check if server is active in command callback before attempting to hot swap. * Hook 'v_Detour_LevelInit', and log NavMeshes that failed to load. * Split free/destroy logic into separate function. * Created constants for NavMesh and AI Network paths/extensions. * Added performance profiler for hot swap logic in command callback. * Renamed "navmesh_reload" to "navmesh_hotswap". * "navmesh_hotswap" is now development only.
This commit is contained in:
Kawe Mazidjatari
parent
2fc0bea3a2
commit
4bd164a535
@ -20,6 +20,7 @@
|
||||
#ifndef CLIENT_DLL
|
||||
#include "game/server/ai_networkmanager.h"
|
||||
#include "game/server/fairfight_impl.h"
|
||||
#include "game/server/detour_impl.h"
|
||||
#endif // !CLIENT_DLL
|
||||
#include "rtech/rtech_game.h"
|
||||
#include "rtech/rui/rui.h"
|
||||
@ -370,7 +371,7 @@ void RuntimePtc_Init() /* .TEXT */
|
||||
#if defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
|
||||
#ifndef CLIENT_DLL
|
||||
//p_CAI_NetworkManager__ShouldRebuild.Offset(0xA0).FindPatternSelf("FF ?? ?? ?? 00 00", CMemory::Direction::DOWN, 200).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Virtual call to restart when building AIN (which clears the AIN memory). Remove this once writing to file works.
|
||||
//Detour_LevelInit.Offset(0x100).FindPatternSelf("74", CMemory::Direction::DOWN, 600).Patch({ 0xEB }); // JE --> JMP | Do while loop setting fields to -1 in navmesh is writing out of bounds (!TODO).
|
||||
//p_Detour_LevelInit.Offset(0x100).FindPatternSelf("74", CMemory::Direction::DOWN, 600).Patch({ 0xEB }); // JE --> JMP | Do while loop setting fields to -1 in navmesh is writing out of bounds (!TODO).
|
||||
#endif // !CLIENT_DLL
|
||||
#endif
|
||||
#ifndef CLIENT_DLL
|
||||
|
||||
@ -58,11 +58,6 @@ inline CMemory Host_Shutdown;
|
||||
//-------------------------------------------------------------------------
|
||||
inline CMemory Host_Disconnect;
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// RUNTIME: DETOUR_LEVELINIT
|
||||
//-------------------------------------------------------------------------
|
||||
inline CMemory Detour_LevelInit;
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// RUNTIME: S2C_CHALLENGE
|
||||
//-------------------------------------------------------------------------
|
||||
@ -201,10 +196,6 @@ class VOpcodes : public IDetour
|
||||
Host_Disconnect = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x30\x0F\xB6\xD9"), "xxxxxxxxx");
|
||||
#endif // 0x14023CCA0 // 40 53 48 83 EC 30 0F B6 D9 //
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
Detour_LevelInit = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xAC\x24\x00\x00\x00\x00\x48\x81\xEC\x00\x00\x00\x00\x45\x33\xE4"), "xxxx?xxxx?xxxx?xxxxxxxxxxxxx????xxx????xxx");
|
||||
// 0x140EF9100 // 48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 55 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 45 33 E4 //
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
#ifndef CLIENT_DLL
|
||||
Server_S2C_CONNECT_1 = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x3B\x05\x00\x00\x00\x00\x74\x0C"), "xxx????xx");
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
constexpr int AINET_SCRIPT_VERSION_NUMBER = 21;
|
||||
constexpr int AINET_VERSION_NUMBER = 57;
|
||||
constexpr int AINET_MIN_FILE_SIZE = 82;
|
||||
constexpr const char* AINETWORK_EXT = ".ain";
|
||||
constexpr const char* AINETWORK_PATH = "maps/graphs/";
|
||||
|
||||
/*
|
||||
==============================
|
||||
@ -32,11 +34,11 @@ CAI_NetworkBuilder::BuildFile
|
||||
*/
|
||||
void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
|
||||
{
|
||||
const string svMeshDir = "maps/navmesh/";
|
||||
const string svGraphDir = "maps/graphs/";
|
||||
const string svMeshDir = NAVMESH_PATH;
|
||||
const string svGraphDir = AINETWORK_PATH;
|
||||
|
||||
fs::path fsMeshPath(svMeshDir + g_pHostState->m_levelName + "_" + SHULL_SIZE[EHULL_SIZE::LARGE] + ".nm");
|
||||
fs::path fsGraphPath(svGraphDir + g_pHostState->m_levelName + ".ain");
|
||||
fs::path fsMeshPath(svMeshDir + g_pHostState->m_levelName + "_" + S_HULL_TYPE[E_HULL_TYPE::LARGE] + NAVMESH_EXT);
|
||||
fs::path fsGraphPath(svGraphDir + g_pHostState->m_levelName + AINETWORK_EXT);
|
||||
|
||||
CFastTimer masterTimer;
|
||||
CFastTimer timer;
|
||||
@ -68,7 +70,7 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
|
||||
|
||||
if (!pNavMesh)
|
||||
{
|
||||
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network\n", __FUNCTION__, SHULL_SIZE[EHULL_SIZE::LARGE].c_str());
|
||||
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network\n", __FUNCTION__, S_HULL_TYPE[E_HULL_TYPE::LARGE]);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -305,11 +307,11 @@ CAI_NetworkManager::LoadNetworkGraph
|
||||
*/
|
||||
void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager, void* pBuffer, const char* szAIGraphFile)
|
||||
{
|
||||
string svMeshDir = "maps/navmesh/";
|
||||
string svGraphDir = "maps/graphs/";
|
||||
string svMeshDir = NAVMESH_PATH;
|
||||
string svGraphDir = AINETWORK_PATH;
|
||||
|
||||
fs::path fsMeshPath(svMeshDir + g_pHostState->m_levelName + "_" + SHULL_SIZE[EHULL_SIZE::LARGE] + ".nm");
|
||||
fs::path fsGraphPath(svGraphDir + g_pHostState->m_levelName + ".ain");
|
||||
fs::path fsMeshPath(svMeshDir + g_pHostState->m_levelName + "_" + S_HULL_TYPE[E_HULL_TYPE::LARGE] + NAVMESH_EXT);
|
||||
fs::path fsGraphPath(svGraphDir + g_pHostState->m_levelName + AINETWORK_EXT);
|
||||
|
||||
int nAiNetVersion = NULL;
|
||||
int nAiMapVersion = NULL;
|
||||
@ -321,7 +323,7 @@ void CAI_NetworkManager::LoadNetworkGraph(CAI_NetworkManager* pAINetworkManager,
|
||||
FileHandle_t pNavMesh = FileSystem()->Open(fsMeshPath.relative_path().u8string().c_str(), "rb", "GAME");
|
||||
if (!pNavMesh)
|
||||
{
|
||||
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network\n", __FUNCTION__, SHULL_SIZE[EHULL_SIZE::LARGE].c_str());
|
||||
Warning(eDLL_T::SERVER, "%s - No %s NavMesh found. Unable to calculate CRC for AI Network\n", __FUNCTION__, S_HULL_TYPE[E_HULL_TYPE::LARGE]);
|
||||
bNavMeshAvailable = false;
|
||||
}
|
||||
else
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
|
||||
#include "core/stdafx.h"
|
||||
#include "tier1/cvar.h"
|
||||
#include "public/edict.h"
|
||||
#include "game/server/detour_impl.h"
|
||||
#include "game/server/ai_networkmanager.h"
|
||||
|
||||
@ -54,33 +55,74 @@ uint8_t IsGoalPolyReachable(dtNavMesh* nav, dtPolyRef fromRef, dtPolyRef goalRef
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: hot swaps the NavMesh with the current files on the disk
|
||||
// (All hulls will be reloaded! If NavMesh for hull no longer exist, it will be empty!!!)
|
||||
// Purpose: initialize NavMesh and Detour query singleton for level
|
||||
//-----------------------------------------------------------------------------
|
||||
void Detour_Reload()
|
||||
void Detour_LevelInit()
|
||||
{
|
||||
v_Detour_LevelInit();
|
||||
Detour_IsLoaded(); // Inform user which NavMesh files had failed to load.
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: free's the memory used by all valid NavMesh slots
|
||||
//-----------------------------------------------------------------------------
|
||||
void Detour_Free()
|
||||
{
|
||||
// Destroy and free the memory for all NavMesh hulls.
|
||||
for (int i = 0; i < MAX_HULLS; i++)
|
||||
{
|
||||
dtNavMesh* nav = GetNavMeshForHull(i);
|
||||
if (nav)
|
||||
if (nav) // Only free if NavMesh for hull is loaded.
|
||||
{
|
||||
v_Detour_FreeNavMesh(nav);
|
||||
MemAllocSingleton()->Free(nav);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reload NavMesh for current level.
|
||||
v_Detour_LevelInit();
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: checks if a NavMesh has failed to load
|
||||
// Output : true if a NavMesh has successfully loaded, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool Detour_IsLoaded()
|
||||
{
|
||||
int ret = 0;
|
||||
for (int i = 0; i < MAX_HULLS; i++)
|
||||
{
|
||||
const dtNavMesh* nav = GetNavMeshForHull(i);
|
||||
if (!nav) // Failed to load...
|
||||
{
|
||||
Warning(eDLL_T::SERVER, "NavMesh '%s%s_%s%s' not loaded\n",
|
||||
NAVMESH_PATH, g_ServerGlobalVariables->m_pszMapName, S_HULL_TYPE[i], NAVMESH_EXT);
|
||||
|
||||
ret++;
|
||||
}
|
||||
}
|
||||
|
||||
assert(i <= MAX_HULLS);
|
||||
return (ret != MAX_HULLS);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: hot swaps the NavMesh with the current files on the disk
|
||||
// (All hulls will be reloaded! If NavMesh for hull no longer exist, it will be kept empty!!!)
|
||||
//-----------------------------------------------------------------------------
|
||||
void Detour_HotSwap()
|
||||
{
|
||||
// Free and re-init NavMesh.
|
||||
Detour_Free();
|
||||
if (!Detour_IsLoaded())
|
||||
Error(eDLL_T::SERVER, NOERROR, "%s - Failed to hot swap NavMesh\n", __FUNCTION__);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
void CAI_Utility_Attach()
|
||||
{
|
||||
DetourAttach((LPVOID*)&v_dtNavMesh__isPolyReachable, &IsGoalPolyReachable);
|
||||
DetourAttach((LPVOID*)&v_Detour_LevelInit, &Detour_LevelInit);
|
||||
}
|
||||
|
||||
void CAI_Utility_Detach()
|
||||
{
|
||||
DetourDetach((LPVOID*)&v_dtNavMesh__isPolyReachable, &IsGoalPolyReachable);
|
||||
DetourDetach((LPVOID*)&v_Detour_LevelInit, &Detour_LevelInit);
|
||||
}
|
||||
@ -21,7 +21,11 @@ inline auto v_dtNavMesh__addTile = p_dtNavMesh__addTile.RCast<dtStatus(*)(dtNavM
|
||||
inline CMemory p_dtNavMesh__isPolyReachable;
|
||||
inline auto v_dtNavMesh__isPolyReachable = p_dtNavMesh__isPolyReachable.RCast<bool(*)(dtNavMesh* thisptr, dtPolyRef poly_1, dtPolyRef poly_2, int hull_type)>();
|
||||
|
||||
const string SHULL_SIZE[5] =
|
||||
|
||||
constexpr const char* NAVMESH_PATH = "maps/navmesh/";
|
||||
constexpr const char* NAVMESH_EXT = ".nm";
|
||||
|
||||
static const char* S_HULL_TYPE[5] =
|
||||
{
|
||||
"small",
|
||||
"med_short",
|
||||
@ -30,7 +34,7 @@ const string SHULL_SIZE[5] =
|
||||
"extra_large"
|
||||
};
|
||||
|
||||
enum EHULL_SIZE
|
||||
enum E_HULL_TYPE
|
||||
{
|
||||
SMALL = 0,
|
||||
MED_SHORT,
|
||||
@ -44,14 +48,18 @@ inline dtNavMeshQuery* g_pNavMeshQuery = nullptr;
|
||||
|
||||
dtNavMesh* GetNavMeshForHull(int hullSize);
|
||||
uint32_t GetHullMaskById(int hullId);
|
||||
void Detour_Reload();
|
||||
|
||||
void Detour_LevelInit();
|
||||
void Detour_Free();
|
||||
bool Detour_IsLoaded();
|
||||
void Detour_HotSwap();
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
class VRecast : public IDetour
|
||||
{
|
||||
virtual void GetAdr(void) const
|
||||
{
|
||||
spdlog::debug("| FUN: Detour_LevelInit : {:#18x} |\n", p_Detour_LevelInit.GetPtr());
|
||||
spdlog::debug("| FUN: p_Detour_FreeNavMesh : {:#18x} |\n", p_Detour_FreeNavMesh.GetPtr());
|
||||
spdlog::debug("| FUN: Detour_FreeNavMesh : {:#18x} |\n", p_Detour_FreeNavMesh.GetPtr());
|
||||
spdlog::debug("| FUN: dtNavMesh::Init : {:#18x} |\n", p_dtNavMesh__Init.GetPtr());
|
||||
spdlog::debug("| FUN: dtNavMesh::addTile : {:#18x} |\n", p_dtNavMesh__addTile.GetPtr());
|
||||
spdlog::debug("| FUN: dtNavMesh::isPolyReachable : {:#18x} |\n", p_dtNavMesh__isPolyReachable.GetPtr());
|
||||
|
||||
@ -344,7 +344,7 @@ void ConCommand::Init(void)
|
||||
ConCommand::Create("sv_unban", "Unbans a client from the server by nucleus id or ip address | Usage: sv_unban \"<NucleusID>\"/\"<IPAddress>\".", FCVAR_RELEASE, Host_Unban_f, nullptr);
|
||||
ConCommand::Create("sv_reloadbanlist", "Reloads the banned list.", FCVAR_RELEASE, Host_ReloadBanList_f, nullptr);
|
||||
|
||||
ConCommand::Create("navmesh_reload", "Reloads the NavMesh for all hulls.", FCVAR_RELEASE, Detour_Reload_f, nullptr);
|
||||
ConCommand::Create("navmesh_hotswap", "Hot swap the NavMesh for all hulls.", FCVAR_DEVELOPMENTONLY, Detour_HotSwap_f, nullptr);
|
||||
#endif // !CLIENT_DLL
|
||||
#ifndef DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
#ifndef CLIENT_DLL
|
||||
#include "networksystem/bansystem.h"
|
||||
#endif // !CLIENT_DLL
|
||||
#include "public/edict.h"
|
||||
#include "public/worldsize.h"
|
||||
#include "mathlib/crc32.h"
|
||||
#include "mathlib/mathlib.h"
|
||||
@ -215,14 +216,27 @@ void Host_Changelevel_f(const CCommand& args)
|
||||
|
||||
/*
|
||||
=====================
|
||||
Detour_Reload_f
|
||||
Detour_HotSwap_f
|
||||
|
||||
Hot swaps the NavMesh
|
||||
while the game is running
|
||||
=====================
|
||||
*/
|
||||
void Detour_Reload_f(const CCommand& args)
|
||||
void Detour_HotSwap_f(const CCommand& args)
|
||||
{
|
||||
Detour_Reload();
|
||||
if (!g_pServer->IsActive())
|
||||
return;
|
||||
|
||||
DevMsg(eDLL_T::SERVER, "Executing NavMesh hot swap for level '%s'\n",
|
||||
g_ServerGlobalVariables->m_pszMapName);
|
||||
|
||||
CFastTimer timer;
|
||||
|
||||
timer.Start();
|
||||
Detour_HotSwap();
|
||||
|
||||
timer.End();
|
||||
DevMsg(eDLL_T::SERVER, "Hot swap took '%.6f' seconds\n", timer.GetDuration().GetSeconds());
|
||||
}
|
||||
#endif // !CLIENT_DLL
|
||||
/*
|
||||
|
||||
@ -24,7 +24,7 @@ void Host_Unban_f(const CCommand& args);
|
||||
void Host_ReloadBanList_f(const CCommand& args);
|
||||
void Host_ReloadPlaylists_f(const CCommand& args);
|
||||
void Host_Changelevel_f(const CCommand& args);
|
||||
void Detour_Reload_f(const CCommand& args);
|
||||
void Detour_HotSwap_f(const CCommand& args);
|
||||
#endif // !CLIENT_DLL
|
||||
void Pak_ListPaks_f(const CCommand& args);
|
||||
void Pak_RequestUnload_f(const CCommand& args);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user