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 incorrect dtLink allocation count for off-mesh links

Browse Source 
Noticed this issue when creating multiple number of off-mesh links between 2 polygon islands. Turns out a pull request was already created to address this problem at https://github.com/recastnavigation/recastnavigation/pull/622. Merged the changes directly as this yields correct behavior as far as off-mesh links have been tested.
This commit is contained in:
Kawe Mazidjatari 2024-08-24 20:33:37 +02:00
parent 5b1bdbef68
commit 1a8acd5c16
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,7 +753,8 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
// whose start point is inside the tile. // whose start point is inside the tile.
unsigned char* offMeshConClass = 0; unsigned char* offMeshConClass = 0;
int storedOffMeshConCount = 0; int storedOffMeshConCount = 0;
int offMeshConLinkCount = 0; int baseOffMeshConLinkCount = 0;
int landOffMeshConLinkCount = 0;
if (params->offMeshConCount > 0) if (params->offMeshConCount > 0)
{ {
@ -808,9 +809,9 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
// Count how many links should be allocated for off-mesh connections. // Count how many links should be allocated for off-mesh connections.
if (offMeshConClass[i*2+0] == 0xff) if (offMeshConClass[i*2+0] == 0xff)
offMeshConLinkCount++; baseOffMeshConLinkCount++;
if (offMeshConClass[i*2+1] == 0xff) if (offMeshConClass[i*2+1] == 0xff && params->offMeshConDir[i])
offMeshConLinkCount++; landOffMeshConLinkCount++;
if (offMeshConClass[i*2+0] == 0xff) if (offMeshConClass[i*2+0] == 0xff)
storedOffMeshConCount++; storedOffMeshConCount++;
@ -841,7 +842,7 @@ bool dtCreateNavMeshData(dtNavMeshCreateParams* params, unsigned char** outData,
} }
} }
const int maxLinkCount = edgeCount + portalCount*2 + offMeshConLinkCount*2; const int maxLinkCount = edgeCount + portalCount*2 + baseOffMeshConLinkCount*3 + landOffMeshConLinkCount;
// Find unique detail vertices. // Find unique detail vertices.
int uniqueDetailVertCount = 0; int uniqueDetailVertCount = 0;