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: find the best traverse type rather than returning the first valid

Browse Source 
Better results + slightly updated table to allow coverage on all traverse types again.
This commit is contained in:
Kawe Mazidjatari 2024-08-21 02:45:32 +02:00
parent 291ce4488a
commit dd9493d651
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/naveditor/Editor.cpp
View File

@ -100,11 +100,11 @@ static void initTraverseTableParams()
#if DT_NAVMESH_SET_VERSION > 5
s_traverseTable[19] = { 0.0f, 0.0f, 0, 0 }; // Unused
s_traverseTable[20] = { 0, 104, 220, 410 }; // Maps to type 19 in MSET 5
s_traverseTable[21] = { 104, 416, 410, 640 }; // Maps to type 20 in MSET 5
s_traverseTable[20] = { 120, 330, 160, 400 }; // Maps to type 19 in MSET 5
s_traverseTable[21] = { 104, 416, 330, 640 }; // Maps to type 20 in MSET 5
#else
s_traverseTable[19] = { 0, 104, 220, 410 }; // Maps to type 19 in MSET 5
s_traverseTable[20] = { 104, 416, 410, 640 }; // Maps to type 20 in MSET 5
s_traverseTable[19] = { 120, 330, 160, 400 }; // Maps to type 19 in MSET 5
s_traverseTable[20] = { 104, 416, 330, 640 }; // Maps to type 20 in MSET 5
s_traverseTable[21] = { 0.0f, 0.0f, 0, 0 }; // Unused
#endif
@ -599,6 +599,7 @@ void Editor::handleUpdate(const float dt)
TraverseType_e GetBestTraverseType(const float elevation, const float traverseDist)
{
TraverseType_e bestTraverseType = INVALID_TRAVERSE_TYPE;
float smallestDiff = FLT_MAX;
for (int i = NUM_TRAVERSE_TYPES-1; i >= 0; --i)
{
@ -623,8 +624,18 @@ TraverseType_e GetBestTraverseType(const float elevation, const float traverseDi
continue;
}
bestTraverseType = (TraverseType_e)i;
break;
const float midElev = (traverseType.minElev+traverseType.maxElev) / 2.0f;
const float midDist = (traverseType.minDist+traverseType.maxDist) / 2.0f;
const float elevDiff = rdMathFabsf(elevation-midElev);
const float distDiff = rdMathFabsf(traverseDist-midDist);
const float totalDiff = elevDiff+distDiff;
if (totalDiff < smallestDiff)
{
smallestDiff = totalDiff;
bestTraverseType = (TraverseType_e)i;
}
}
return bestTraverseType;