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

NavMesh system improvements

Browse Source 
* Confirmed DT_MAX_AREAS size being 32 (originally 64).
* header->offMeshEnds to -1.
* Added pointer to 'g_pHullMask'.
This commit is contained in:
Kawe Mazidjatari 2022-07-19 22:00:40 +02:00
parent 0ec03a62b1
commit 59dd3e2228
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/game/server/detour_impl.h
View File

@ -33,8 +33,10 @@ enum EHULL_SIZE
EXTRA_LARGE
};
inline dtPolyRef** g_pHullMask = nullptr;
inline dtNavMesh** g_pNavMesh = nullptr;
inline dtNavMeshQuery* g_pNavMeshQuery = nullptr;
dtNavMesh* GetNavMeshForHull(int hull);
///////////////////////////////////////////////////////////////////////////////
class VRecast : public IDetour
@ -44,6 +46,7 @@ class VRecast : public IDetour
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());
spdlog::debug("| VAR: g_pHullMask[10] : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pHullMask));
spdlog::debug("| VAR: g_pNavMesh[5] : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pNavMesh));
spdlog::debug("| VAR: g_pNavMeshQuery : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pNavMeshQuery));
spdlog::debug("+----------------------------------------------------------------+\n");
@ -64,6 +67,8 @@ class VRecast : public IDetour
.FindPatternSelf("48 8D 3D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<dtNavMesh**>();
g_pNavMeshQuery = g_mGameDll.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")
.FindPatternSelf("48 89 0D").ResolveRelativeAddressSelf(0x3, 0x7).RCast<dtNavMeshQuery*>();
g_pHullMask = p_dtNavMesh__isPolyReachable.FindPattern("48 8D 0D", CMemory::Direction::DOWN).ResolveRelativeAddressSelf(0x3, 0x7).RCast<dtPolyRef**>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }

16
r5dev/naveditor/Sample.cpp
View File

@ -661,16 +661,18 @@ void Sample::saveAll(std::string path, dtNavMesh* mesh)
for (int i = 0; i < link_data.setCount; i++)
set_reachable(reachability, link_data.setCount, i, i, true);
size_t del = 0;
for (size_t i = reachability.size() - 1; i >= 0; i--)
if (reachability.size() > 0)
{
if (reachability[i] == 0)
for (size_t i = reachability.size() - 1; i >= 0; i--)
{
reachability.erase(reachability.begin() + i);
table_size--;
if (reachability[i] == 0)
{
reachability.erase(reachability.begin() + i);
table_size--;
}
else
break;
}
else
break;
}
header.params.disjointPolyGroupCount = link_data.setCount;

6
r5dev/thirdparty/recast/Detour/Include/DetourNavMesh.h vendored
View File

@ -95,7 +95,7 @@ static const unsigned int DT_OFFMESH_CON_BIDIR = 1;
/// The maximum number of user defined area ids.
/// @ingroup detour
static const int DT_MAX_AREAS = 64;
static const int DT_MAX_AREAS = 32; // <-- confirmed 32 see [r5apex_ds.exe + 0xf47dda] '-> test [rcx+80h], ax'.
/// Tile flags used for various functions and fields.
/// For an example, see dtNavMesh::addTile().
@ -193,8 +193,6 @@ struct dtPoly
/// Gets the polygon type. (See: #dtPolyTypes)
inline unsigned char getType() const { return areaAndtype >> 6; }
inline unsigned char getTest() const { return areaAndtype & 0xc0; }
};
/// Defines the location of detail sub-mesh data within a dtMeshTile.
@ -694,7 +692,7 @@ public:
dtMeshTile** m_posLookup; ///< Tile hash lookup.
dtMeshTile* m_nextFree; ///< Freelist of tiles.
dtMeshTile* m_tiles; ///< List of tiles.
void** m_setTables; ///< Array of set tables.
dtPolyRef** m_setTables; ///< Array of set tables.
void* m_unk0; ///< FIXME: unknown structure pointer.
char m_meshFlags; // Maybe.

2
r5dev/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp vendored
View File

@ -491,7 +491,7 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
header->detailTriCount = detailTriCount;
header->bvQuantFactor = 1.0f / params->cs;
header->offMeshBase = params->polyCount;
header->offMeshEnds = 0;
header->offMeshEnds = -1;
header->walkableHeight = params->walkableHeight;
header->walkableRadius = params->walkableRadius;
header->walkableClimb = params->walkableClimb;