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

Recast: fix a crash during NavMesh load without traverse tables

Browse Source 
The sizes still need to be set as the engine at least needs to allocate the traverse table buffer.
This commit is contained in:
Kawe Mazidjatari 2024-10-18 13:29:32 +02:00
parent 5ddc96dc34
commit fc43cbabd9
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/thirdparty/recast/Detour/Source/DetourNavMesh.cpp vendored
View File

@ -191,10 +191,6 @@ int dtCalcTraverseTableCellIndex(const int numPolyGroups,
int dtCalcTraverseTableSize(const int numPolyGroups)
{
// If we only have 2 poly groups, we don't need a traverse table.
if (numPolyGroups < DT_MIN_POLY_GROUP_COUNT)
return 0;
return sizeof(int)*(numPolyGroups*((numPolyGroups+(RD_BITS_PER_BIT_CELL-1))/RD_BITS_PER_BIT_CELL));
}

15
src/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp vendored
View File

@ -549,20 +549,8 @@ bool dtCreateDisjointPolyGroups(const dtTraverseTableCreateParams* params)
bool dtCreateTraverseTableData(const dtTraverseTableCreateParams* params)
{
const dtDisjointSet& baseSet = params->sets[0];
const int polyGroupCount = baseSet.getSetCount();
dtNavMesh* nav = params->nav;
if (polyGroupCount < DT_MIN_POLY_GROUP_COUNT)
{
nav->setTraverseTableCount(0);
nav->setTraverseTableSize(0);
nav->setPolyGroupCount(polyGroupCount);
return true;
}
nav->freeTraverseTables();
const int tableCount = params->tableCount;
@ -572,6 +560,9 @@ bool dtCreateTraverseTableData(const dtTraverseTableCreateParams* params)
nav->setTraverseTableCount(tableCount);
copyBaseDisjointSets(params);
const dtDisjointSet& baseSet = params->sets[0];
const int polyGroupCount = baseSet.getSetCount();
const int tableSize = dtCalcTraverseTableSize(polyGroupCount);
nav->setTraverseTableSize(tableSize);