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:rcBuildLayerRegions missing areaType

Browse Source 
Merge recastnavitagion/recastnavitagion@ddaa361b08
This commit is contained in:
Kawe Mazidjatari 2023-12-26 16:24:43 +01:00
parent 714674ae33
commit e3bf2036b3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/thirdparty/recast/Recast/Source/RecastRegion.cpp vendored
View File

@ -1073,11 +1073,13 @@ static bool mergeAndFilterLayerRegions(rcContext* ctx, int minRegionArea,
for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i) for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
{ {
const rcCompactSpan& s = chf.spans[i]; const rcCompactSpan& s = chf.spans[i];
const unsigned char area = chf.areas[i];
const unsigned short ri = srcReg[i]; const unsigned short ri = srcReg[i];
if (ri == 0 || ri >= nreg) continue; if (ri == 0 || ri >= nreg) continue;
rcRegion& reg = regions[ri]; rcRegion& reg = regions[ri];
reg.spanCount++; reg.spanCount++;
reg.areaType = area;
reg.zmin = rcMin(reg.zmin, s.z); reg.zmin = rcMin(reg.zmin, s.z);
reg.zmax = rcMax(reg.zmax, s.z); reg.zmax = rcMax(reg.zmax, s.z);
@ -1158,6 +1160,9 @@ static bool mergeAndFilterLayerRegions(rcContext* ctx, int minRegionArea,
// Skip already visited. // Skip already visited.
if (regn.id != 0) if (regn.id != 0)
continue; continue;
// Skip if different area type, do not connect regions with different area type.
if (reg.areaType != regn.areaType)
continue;
// Skip if the neighbour is overlapping root region. // Skip if the neighbour is overlapping root region.
bool overlap = false; bool overlap = false;
for (int k = 0; k < root.floors.size(); k++) for (int k = 0; k < root.floors.size(); k++)