R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
r5sdk/r5dev/game/server/detour_impl.h

104 lines
6.0 KiB
C
Raw Normal View History

Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
#pragma once
#include "thirdparty/recast/detour/include/detourstatus.h"
#include "thirdparty/recast/detour/include/detournavmesh.h"
Add g_pNavMeshQuery signature to SDK
2022-07-17 12:55:38 +02:00
#include "thirdparty/recast/Detour/Include/DetourNavMeshQuery.h"
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
Massive performance improvements Inline every signature defined in the SDK (previously each translation unit had its own copy of the signature and function prototype). DLL init is near instant now (85% speed improvements).
2022-04-09 02:18:57 +02:00
//-------------------------------------------------------------------------
// RUNTIME: DETOUR
//-------------------------------------------------------------------------
Implement logic for hot swapping NavMesh The new command 'navmesh_reload' hot swaps the current NavMesh for all hulls in memory, with that of the 'new' files on the disk. The memory of the old NavMesh gets freed and destroyed.
2022-11-03 10:44:59 +01:00
inline CMemory p_Detour_LevelInit;
inline auto v_Detour_LevelInit = p_Detour_LevelInit.RCast<void(*)(void)>();
inline CMemory p_Detour_FreeNavMesh;
inline auto v_Detour_FreeNavMesh = p_Detour_FreeNavMesh.RCast<void(*)(dtNavMesh* mesh)>();
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
inline CMemory p_dtNavMesh__Init;
Prefix internal function pointers with 'v_'
2022-06-12 13:24:30 +02:00
inline auto v_dtNavMesh__Init = p_dtNavMesh__Init.RCast<dtStatus(*)(dtNavMesh* thisptr, unsigned char* data, int flags)>();
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
inline CMemory p_dtNavMesh__addTile;
Prefix internal function pointers with 'v_'
2022-06-12 13:24:30 +02:00
inline auto v_dtNavMesh__addTile = p_dtNavMesh__addTile.RCast<dtStatus(*)(dtNavMesh* thisptr, unsigned char* data, dtMeshHeader* header, int dataSize, int flags, dtTileRef lastRef)>();
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
inline CMemory p_dtNavMesh__isPolyReachable;
Prefix internal function pointers with 'v_'
2022-06-12 13:24:30 +02:00
inline auto v_dtNavMesh__isPolyReachable = p_dtNavMesh__isPolyReachable.RCast<bool(*)(dtNavMesh* thisptr, dtPolyRef poly_1, dtPolyRef poly_2, int hull_type)>();
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02: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.
2022-11-03 17:12:22 +01:00
constexpr const char* NAVMESH_PATH = "maps/navmesh/";
constexpr const char* NAVMESH_EXT = ".nm";
static const char* S_HULL_TYPE[5] =
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02:00
{
"small",
"med_short",
"medium",
"large",
"extra_large"
};
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.
2022-11-03 17:12:22 +01:00
enum E_HULL_TYPE
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02:00
{
SMALL = 0,
MED_SHORT,
MEDIUM,
LARGE,
EXTRA_LARGE
};
inline dtNavMesh** g_pNavMesh = nullptr;
Add g_pNavMeshQuery signature to SDK
2022-07-17 12:55:38 +02:00
inline dtNavMeshQuery* g_pNavMeshQuery = nullptr;
NavMesh system improvements * Confirmed DT_MAX_AREAS size being 32 (originally 64). * header->offMeshEnds to -1. * Added pointer to 'g_pHullMask'.
2022-07-19 22:00:40 +02:00
Add 'g_pHullMasks' into SDK Static array of hull masks
2022-07-20 12:33:39 +02:00
dtNavMesh* GetNavMeshForHull(int hullSize);
uint32_t GetHullMaskById(int hullId);
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.
2022-11-03 17:12:22 +01:00
void Detour_LevelInit();
Rename Detour_Free() to Detour_LevelShutdown() Added the missing call to v_Detour_LevelInit(), which was removed for debugging purposes.
2022-11-05 00:11:17 +01:00
void Detour_LevelShutdown();
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.
2022-11-03 17:12:22 +01:00
bool Detour_IsLoaded();
void Detour_HotSwap();
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
///////////////////////////////////////////////////////////////////////////////
Update GetAdr implementations to feature spdlog Fixed all alignments and reduced code verbosity
2022-05-13 14:53:25 +02:00
class VRecast : public IDetour
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
{
Start of migration to IDetour interface Migrating to this to initialize all patterns and prototypes in Systems_Init() instead. This should make debugging missing/not found patterns easier and allow for opting out variable/constant search (some of these require other patterns to be found, thus resulting in seg faults..). Also added check to detect if user has a eligible CPU to run this SDK. The game requires SSE and SSE2 instruction sets. Our SDK requires this too due to the use of SSE intrinsics, so we cannot let the game handle this. We have to check it ourselves.
2022-04-11 01:44:30 +02:00
virtual void GetAdr(void) const
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
{
Implement logic for hot swapping NavMesh The new command 'navmesh_reload' hot swaps the current NavMesh for all hulls in memory, with that of the 'new' files on the disk. The memory of the old NavMesh gets freed and destroyed.
2022-11-03 10:44:59 +01:00
spdlog::debug("| FUN: Detour_LevelInit : {:#18x} |\n", p_Detour_LevelInit.GetPtr());
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.
2022-11-03 17:12:22 +01:00
spdlog::debug("| FUN: Detour_FreeNavMesh : {:#18x} |\n", p_Detour_FreeNavMesh.GetPtr());
Update GetAdr implementations to feature spdlog Fixed all alignments and reduced code verbosity
2022-05-13 14:53:25 +02:00
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());
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02:00
spdlog::debug("| VAR: g_pNavMesh[5] : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pNavMesh));
Add g_pNavMeshQuery signature to SDK
2022-07-17 12:55:38 +02:00
spdlog::debug("| VAR: g_pNavMeshQuery : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pNavMeshQuery));
Update GetAdr implementations to feature spdlog Fixed all alignments and reduced code verbosity
2022-05-13 14:53:25 +02:00
spdlog::debug("+----------------------------------------------------------------+\n");
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
}
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
virtual void GetFun(void) const
{
Implement logic for hot swapping NavMesh The new command 'navmesh_reload' hot swaps the current NavMesh for all hulls in memory, with that of the 'new' files on the disk. The memory of the old NavMesh gets freed and destroyed.
2022-11-03 10:44:59 +01:00
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_Detour_LevelInit = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x81\xEC\x00\x00\x00\x00\x45\x33\xF6\x48\x8D\x3D\x00\x00\x00\x00"), "xxxx?xxxx?xxxx?xxxxxxxxxxxx????xxxxxx????");
p_Detour_FreeNavMesh = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x30\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00"), "xxxxxxxxxx?xxxx?");
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
p_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");
p_Detour_FreeNavMesh = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x30\x48\x89\x6C\x24\x00\x48\x8B\xD9"), "xxxxxxxxxx?xxx");
#endif
Remove 'm' prefix from dll globals Large commit.
2022-08-09 03:02:00 +02:00
p_dtNavMesh__Init = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x4C\x89\x44\x24\x00\x53\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x0F\x10\x11"), "xxxx?xxxxxx????xxx");
p_dtNavMesh__addTile = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x44\x89\x4C\x24\x00\x41\x55"), "xxxx?xx");
p_dtNavMesh__isPolyReachable = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x6C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x41\x56\x49\x63\xF1"), "xxxx?xxxx?xxxx?xxxxx");
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
Implement logic for hot swapping NavMesh The new command 'navmesh_reload' hot swaps the current NavMesh for all hulls in memory, with that of the 'new' files on the disk. The memory of the old NavMesh gets freed and destroyed.
2022-11-03 10:44:59 +01:00
v_Detour_LevelInit = p_Detour_LevelInit.RCast<void(*)(void)>(); /*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*/
v_Detour_FreeNavMesh = p_Detour_FreeNavMesh.RCast<void(*)(dtNavMesh*)>();
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02:00
v_dtNavMesh__Init = p_dtNavMesh__Init.RCast<dtStatus(*)(dtNavMesh*, unsigned char*, int)>(); /*4C 89 44 24 ?? 53 41 56 48 81 EC ?? ?? ?? ?? 0F 10 11*/
v_dtNavMesh__addTile = p_dtNavMesh__addTile.RCast<dtStatus(*)(dtNavMesh*, unsigned char*, dtMeshHeader*, int, int, dtTileRef)>(); /*44 89 4C 24 ?? 41 55*/
v_dtNavMesh__isPolyReachable = p_dtNavMesh__isPolyReachable.RCast<bool(*)(dtNavMesh*, dtPolyRef, dtPolyRef, int)>(); /*48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 49 63 F1*/
}
virtual void GetVar(void) const
{
Remove 'm' prefix from dll globals Large commit.
2022-08-09 03:02:00 +02:00
g_pNavMesh = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x54\x24\x00\x48\x89\x4C\x24\x00\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\x6C\x24\x00\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x02"), "xxxx?xxxx?xxxxxxxxxxxxxxxx?xxx????xxx")
Add g_pNavMesh to SDK Add g_pNavMesh to SDK and a simple wrapper for obtaining NavMesh from array.
2022-07-13 11:42:07 +02:00
.FindPatternSelf("48 8D 3D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<dtNavMesh**>();
Remove 'm' prefix from dll globals Large commit.
2022-08-09 03:02:00 +02:00
g_pNavMeshQuery = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x56\x57\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x48\x63\xD9"), "xxxx?xxxx?xxxxxxx????xxx")
Add g_pNavMeshQuery signature to SDK
2022-07-17 12:55:38 +02:00
.FindPatternSelf("48 89 0D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<dtNavMeshQuery*>();
Code overhaul Moved every pattern to IDetour interface. This allows for debugging patterns scans more easily, and create threads during pattern searching (Operation is now fired in APIENTRY). Also cleaned up some unused code/extraneous comments. Slightly increased performance by purging duplicate patterns. Made variable search less dependent from other results (except if pattern-to-scan results is within the same header)
2022-04-18 03:35:08 +02:00
}
Start of migration to IDetour interface Migrating to this to initialize all patterns and prototypes in Systems_Init() instead. This should make debugging missing/not found patterns easier and allow for opting out variable/constant search (some of these require other patterns to be found, thus resulting in seg faults..). Also added check to detect if user has a eligible CPU to run this SDK. The game requires SSE and SSE2 instruction sets. Our SDK requires this too due to the use of SSE intrinsics, so we cannot let the game handle this. We have to check it ourselves.
2022-04-11 01:44:30 +02:00
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
Somewhat correct working navmesh The reachability table needs to be figured out still. The issue should be very small, but at the moment I do not have time for it. The pointer to the table, and table pointers to data is correct, however, not a single poly is ever getting marked as 'reachable' (0xffffffff). This could be either within recast itself (see build_link_table() and set_reachable() functions), or the way the engine parses the data. The function that determines whether poly is reachable is located at '0x140F448E0'
2022-03-18 03:14:07 +01:00
};
///////////////////////////////////////////////////////////////////////////////
Update GetAdr implementations to feature spdlog Fixed all alignments and reduced code verbosity
2022-05-13 14:53:25 +02:00
REGISTER(VRecast);
Reference in New Issue Copy Permalink