bit
/
DotRecastNetSim
forked from mirror/DotRecast
40
0
Fork 1
Code Pull Requests Releases Activity

refactor: int[3] -> RcLevelStackEntry

This commit is contained in:
ikpil 2024-01-18 14:09:05 +09:00 committed by Ikpil
parent 78b29920cb
commit e0e31c19b9
1 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/DotRecast.Recast/RcRegions.cs
View File

@ -274,8 +274,11 @@ namespace DotRecast.Recast
return dst; return dst;
} }
private static bool FloodRegion(int x, int y, int i, int level, int r, RcCompactHeightfield chf, int[] srcReg, private static bool FloodRegion(int x, int y, int i,
int[] srcDist, List<int> stack) int level, int r,
RcCompactHeightfield chf,
int[] srcReg, int[] srcDist,
List<RcLevelStackEntry> stack)
{ {
int w = chf.width; int w = chf.width;
@ -283,9 +286,7 @@ namespace DotRecast.Recast
// Flood fill mark region. // Flood fill mark region.
stack.Clear(); stack.Clear();
stack.Add(x); stack.Add(new RcLevelStackEntry(x, y, i));
stack.Add(y);
stack.Add(i);
srcReg[i] = r; srcReg[i] = r;
srcDist[i] = 0; srcDist[i] = 0;
@ -294,13 +295,10 @@ namespace DotRecast.Recast
while (stack.Count > 0) while (stack.Count > 0)
{ {
int ci = stack[^1]; RcLevelStackEntry back = stack[^1];
stack.RemoveAt(stack.Count - 1); int ci = back.x;
int cy = back.y;
int cy = stack[^1]; int cx = back.index;
stack.RemoveAt(stack.Count - 1);
int cx = stack[^1];
stack.RemoveAt(stack.Count - 1); stack.RemoveAt(stack.Count - 1);
@ -381,9 +379,7 @@ namespace DotRecast.Recast
{ {
srcReg[ai] = r; srcReg[ai] = r;
srcDist[ai] = 0; srcDist[ai] = 0;
stack.Add(ax); stack.Add(new RcLevelStackEntry(ax, ay, ai));
stack.Add(ay);
stack.Add(ai);
} }
} }
} }
@ -392,8 +388,11 @@ namespace DotRecast.Recast
return count > 0; return count > 0;
} }
private static int[] ExpandRegions(int maxIter, int level, RcCompactHeightfield chf, int[] srcReg, int[] srcDist, private static void ExpandRegions(int maxIter, int level,
List<int> stack, bool fillStack) RcCompactHeightfield chf,
int[] srcReg, int[] srcDist,
List<RcLevelStackEntry> stack,
bool fillStack)
{ {
int w = chf.width; int w = chf.width;
int h = chf.height; int h = chf.height;
@ -411,9 +410,7 @@ namespace DotRecast.Recast
{ {
if (chf.dist[i] >= level && srcReg[i] == 0 && chf.areas[i] != RC_NULL_AREA) if (chf.dist[i] >= level && srcReg[i] == 0 && chf.areas[i] != RC_NULL_AREA)
{ {
stack.Add(x); stack.Add(new RcLevelStackEntry(x, y, i));
stack.Add(y);
stack.Add(i);
} }
} }
} }
@ -422,12 +419,12 @@ namespace DotRecast.Recast
else // use cells in the input stack else // use cells in the input stack
{ {
// mark all cells which already have a region // mark all cells which already have a region
for (int j = 0; j < stack.Count; j += 3) for (int j = 0; j < stack.Count; j++)
{ {
int i = stack[j + 2]; int i = stack[j].index;
if (srcReg[i] != 0) if (srcReg[i] != 0)
{ {
stack[j + 2] = -1; stack[j] = new RcLevelStackEntry(stack[j].x, stack[j].y, -1);
} }
} }
} }
@ -439,11 +436,11 @@ namespace DotRecast.Recast
int failed = 0; int failed = 0;
dirtyEntries.Clear(); dirtyEntries.Clear();
for (int j = 0; j < stack.Count; j += 3) for (int j = 0; j < stack.Count; j++)
{ {
int x = stack[j + 0]; int x = stack[j].x;
int y = stack[j + 1]; int y = stack[j].y;
int i = stack[j + 2]; int i = stack[j].index;
if (i < 0) if (i < 0)
{ {
failed++; failed++;
@ -481,7 +478,7 @@ namespace DotRecast.Recast
if (r != 0) if (r != 0)
{ {
stack[j + 2] = -1; // mark as used stack[j] = new RcLevelStackEntry(stack[j].x, stack[j].y, -1); // mark as used
dirtyEntries.Add(i); dirtyEntries.Add(i);
dirtyEntries.Add(r); dirtyEntries.Add(r);
dirtyEntries.Add(d2); dirtyEntries.Add(d2);
@ -500,7 +497,7 @@ namespace DotRecast.Recast
srcDist[idx] = dirtyEntries[i + 2]; srcDist[idx] = dirtyEntries[i + 2];
} }
if (failed * 3 == stack.Count()) if (failed == stack.Count())
{ {
break; break;
} }
@ -514,12 +511,13 @@ namespace DotRecast.Recast
} }
} }
} }
return srcReg;
} }
private static void SortCellsByLevel(int startLevel, RcCompactHeightfield chf, int[] srcReg, int nbStacks, private static void SortCellsByLevel(int startLevel,
List<List<int>> stacks, int loglevelsPerStack) // the levels per stack (2 in our case) as a bit shift RcCompactHeightfield chf,
int[] srcReg,
int nbStacks, List<List<RcLevelStackEntry>> stacks,
int loglevelsPerStack) // the levels per stack (2 in our case) as a bit shift
{ {
int w = chf.width; int w = chf.width;
int h = chf.height; int h = chf.height;
@ -555,27 +553,25 @@ namespace DotRecast.Recast
sId = 0; sId = 0;
} }
stacks[sId].Add(x); stacks[sId].Add(new RcLevelStackEntry(x, y, i));
stacks[sId].Add(y);
stacks[sId].Add(i);
} }
} }
} }
} }
private static void AppendStacks(List<int> srcStack, List<int> dstStack, int[] srcReg) private static void AppendStacks(List<RcLevelStackEntry> srcStack,
List<RcLevelStackEntry> dstStack,
int[] srcReg)
{ {
for (int j = 0; j < srcStack.Count; j += 3) for (int j = 0; j < srcStack.Count; j++)
{ {
int i = srcStack[j + 2]; int i = srcStack[j].index;
if ((i < 0) || (srcReg[i] != 0)) if ((i < 0) || (srcReg[i] != 0))
{ {
continue; continue;
} }
dstStack.Add(srcStack[j]); dstStack.Add(srcStack[j]);
dstStack.Add(srcStack[j + 1]);
dstStack.Add(srcStack[j + 2]);
} }
} }
@ -1207,10 +1203,10 @@ namespace DotRecast.Recast
reg.spanCount++; reg.spanCount++;
reg.areaType = area; reg.areaType = area;
reg.ymin = Math.Min(reg.ymin, s.y); reg.ymin = Math.Min(reg.ymin, s.y);
reg.ymax = Math.Max(reg.ymax, s.y); reg.ymax = Math.Max(reg.ymax, s.y);
// Collect all region layers. // Collect all region layers.
lregs.Add(ri); lregs.Add(ri);
@ -1673,13 +1669,13 @@ namespace DotRecast.Recast
int LOG_NB_STACKS = 3; int LOG_NB_STACKS = 3;
int NB_STACKS = 1 << LOG_NB_STACKS; int NB_STACKS = 1 << LOG_NB_STACKS;
List<List<int>> lvlStacks = new List<List<int>>(); List<List<RcLevelStackEntry>> lvlStacks = new List<List<RcLevelStackEntry>>();
for (int i = 0; i < NB_STACKS; ++i) for (int i = 0; i < NB_STACKS; ++i)
{ {
lvlStacks.Add(new List<int>(1024)); lvlStacks.Add(new List<RcLevelStackEntry>(256));
} }
List<int> stack = new List<int>(1024); List<RcLevelStackEntry> stack = new List<RcLevelStackEntry>(256);
int[] srcReg = new int[chf.spanCount]; int[] srcReg = new int[chf.spanCount];
int[] srcDist = new int[chf.spanCount]; int[] srcDist = new int[chf.spanCount];
@ -1740,11 +1736,12 @@ namespace DotRecast.Recast
ctx.StartTimer(RcTimerLabel.RC_TIMER_BUILD_REGIONS_FLOOD); ctx.StartTimer(RcTimerLabel.RC_TIMER_BUILD_REGIONS_FLOOD);
// Mark new regions with IDs. // Mark new regions with IDs.
for (int j = 0; j < lvlStacks[sId].Count; j += 3) for (int j = 0; j < lvlStacks[sId].Count; j++)
{ {
int x = lvlStacks[sId][j]; RcLevelStackEntry current = lvlStacks[sId][j];
int y = lvlStacks[sId][j + 1]; int x = current.x;
int i = lvlStacks[sId][j + 2]; int y = current.y;
int i = current.index;
if (i >= 0 && srcReg[i] == 0) if (i >= 0 && srcReg[i] == 0)
{ {
if (FloodRegion(x, y, i, level, regionId, chf, srcReg, srcDist, stack)) if (FloodRegion(x, y, i, level, regionId, chf, srcReg, srcDist, stack))