From a4892d64fe2433814e92c39cfe9b0c425c08aae5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 22 Apr 2018 00:59:45 +0200 Subject: Dep/Recast: Fixed area type merges --- dep/recastnavigation/Recast/Source/RecastRasterization.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dep/recastnavigation/Recast/Source/RecastRasterization.cpp') diff --git a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp index a4cef749098..2ffffae8b06 100644 --- a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp +++ b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp @@ -122,16 +122,16 @@ static bool addSpan(rcHeightfield& hf, const int x, const int y, } else { + // Merge flags. + if (rcAbs((int)s->smax - (int)cur->smax) <= flagMergeThr) + s->area = rcMax(s->area, cur->area); + // Merge spans. if (cur->smin < s->smin) s->smin = cur->smin; if (cur->smax > s->smax) s->smax = cur->smax; - // Merge flags. - if (rcAbs((int)s->smax - (int)cur->smax) <= flagMergeThr) - s->area = rcMax(s->area, cur->area); - // Remove current span. rcSpan* next = cur->next; freeSpan(hf, cur); -- cgit v1.2.3