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

Made list in DtPathCorridor.cs readonly

This commit is contained in:
wrenge 2024-11-13 11:32:38 +03:00
parent fba594724c
commit c7c6e53d61
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/DotRecast.Detour.Crowd/DtPathCorridor.cs
View File

@ -33,7 +33,7 @@ namespace DotRecast.Detour.Crowd
private RcVec3f m_pos; private RcVec3f m_pos;
private RcVec3f m_target; private RcVec3f m_target;
private List<long> m_path; private List<long> m_path = new List<long>();
private int m_npath; private int m_npath;
private int m_maxPath; private int m_maxPath;
@ -89,7 +89,8 @@ namespace DotRecast.Detour.Crowd
/// @return True if the initialization succeeded. /// @return True if the initialization succeeded.
public bool Init(int maxPath) public bool Init(int maxPath)
{ {
m_path = new List<long>(maxPath); if (m_path.Capacity < maxPath)
m_path.Capacity = maxPath;
m_npath = 0; m_npath = 0;
m_maxPath = maxPath; m_maxPath = maxPath;
return true; return true;
@ -218,7 +219,7 @@ namespace DotRecast.Detour.Crowd
{ {
if (res.Count > 1 && t > 0.99f) if (res.Count > 1 && t > 0.99f)
{ {
m_npath = DtPathUtils.MergeCorridorStartShortcut(ref m_path, m_npath, m_maxPath, res, res.Count); m_npath = DtPathUtils.MergeCorridorStartShortcut(m_path, m_npath, m_maxPath, res, res.Count);
} }
} }
} }
@ -250,7 +251,7 @@ namespace DotRecast.Detour.Crowd
if (status.Succeeded() && res.Count > 0) if (status.Succeeded() && res.Count > 0)
{ {
m_npath = DtPathUtils.MergeCorridorStartShortcut(ref m_path, m_npath, m_maxPath, res, res.Count); m_npath = DtPathUtils.MergeCorridorStartShortcut(m_path, m_npath, m_maxPath, res, res.Count);
return true; return true;
} }
@ -276,7 +277,7 @@ namespace DotRecast.Detour.Crowd
} }
// Prune path // Prune path
m_path = m_path.GetRange(npos, m_npath - npos); m_path.RemoveRange(0, npos);
m_npath -= npos; m_npath -= npos;
refs[0] = prevRef; refs[0] = prevRef;
@ -322,7 +323,7 @@ namespace DotRecast.Detour.Crowd
var status = navquery.MoveAlongSurface(m_path[0], m_pos, npos, filter, out var result, visited, out var nvisited, MAX_VISITED); var status = navquery.MoveAlongSurface(m_path[0], m_pos, npos, filter, out var result, visited, out var nvisited, MAX_VISITED);
if (status.Succeeded()) if (status.Succeeded())
{ {
m_npath = DtPathUtils.MergeCorridorStartMoved(ref m_path, m_npath, m_maxPath, visited, nvisited); m_npath = DtPathUtils.MergeCorridorStartMoved(m_path, m_npath, m_maxPath, visited, nvisited);
// Adjust the position to stay on top of the navmesh. // Adjust the position to stay on top of the navmesh.
m_pos = result; m_pos = result;
@ -366,7 +367,7 @@ namespace DotRecast.Detour.Crowd
var status = navquery.MoveAlongSurface(m_path[^1], m_target, npos, filter, out var result, visited, out nvisited, MAX_VISITED); var status = navquery.MoveAlongSurface(m_path[^1], m_target, npos, filter, out var result, visited, out nvisited, MAX_VISITED);
if (status.Succeeded()) if (status.Succeeded())
{ {
m_npath = DtPathUtils.MergeCorridorEndMoved(ref m_path, m_npath, m_maxPath, visited, nvisited); m_npath = DtPathUtils.MergeCorridorEndMoved(m_path, m_npath, m_maxPath, visited, nvisited);
// TODO: should we do that? // TODO: should we do that?
// Adjust the position to stay on top of the navmesh. // Adjust the position to stay on top of the navmesh.
@ -394,7 +395,11 @@ namespace DotRecast.Detour.Crowd
public void SetCorridor(RcVec3f target, List<long> path) public void SetCorridor(RcVec3f target, List<long> path)
{ {
m_target = target; m_target = target;
m_path = new List<long>(path); if(path != m_path)
{
m_path.Clear();
m_path.AddRange(path);
}
m_npath = path.Count; m_npath = path.Count;
} }
@ -444,7 +449,7 @@ namespace DotRecast.Detour.Crowd
else if (n < m_npath) else if (n < m_npath)
{ {
// The path is partially usable. // The path is partially usable.
m_path = m_path.GetRange(0, n); m_path.RemoveRange(n, m_path.Count - n);
m_npath = n; m_npath = n;
} }

15
src/DotRecast.Detour/DtPathUtils.cs
View File

@ -148,7 +148,7 @@ namespace DotRecast.Detour
return npath; return npath;
} }
public static int MergeCorridorStartMoved(ref List<long> path, int npath, int maxPath, Span<long> visited, int nvisited) public static int MergeCorridorStartMoved(List<long> path, int npath, int maxPath, Span<long> visited, int nvisited)
{ {
int furthestPath = -1; int furthestPath = -1;
int furthestVisited = -1; int furthestVisited = -1;
@ -191,11 +191,12 @@ namespace DotRecast.Detour
result.AddRange(path.GetRange(furthestPath, npath - furthestPath)); result.AddRange(path.GetRange(furthestPath, npath - furthestPath));
path = result; path.Clear();
path.AddRange(result);
return result.Count; return result.Count;
} }
public static int MergeCorridorEndMoved(ref List<long> path, int npath, int maxPath, Span<long> visited, int nvisited) public static int MergeCorridorEndMoved(List<long> path, int npath, int maxPath, Span<long> visited, int nvisited)
{ {
int furthestPath = -1; int furthestPath = -1;
int furthestVisited = -1; int furthestVisited = -1;
@ -233,11 +234,12 @@ namespace DotRecast.Detour
result.Add(v); result.Add(v);
} }
path = result; path.Clear();
path.AddRange(path);
return result.Count; return result.Count;
} }
public static int MergeCorridorStartShortcut(ref List<long> path, int npath, int maxPath, List<long> visited, int nvisited) public static int MergeCorridorStartShortcut(List<long> path, int npath, int maxPath, List<long> visited, int nvisited)
{ {
int furthestPath = -1; int furthestPath = -1;
int furthestVisited = -1; int furthestVisited = -1;
@ -274,7 +276,8 @@ namespace DotRecast.Detour
List<long> result = visited.GetRange(0, furthestVisited); List<long> result = visited.GetRange(0, furthestVisited);
result.AddRange(path.GetRange(furthestPath, npath - furthestPath)); result.AddRange(path.GetRange(furthestPath, npath - furthestPath));
path = result; path.Clear();
path.AddRange(result);
return result.Count; return result.Count;
} }
} }

2
src/DotRecast.Recast.Toolset/Tools/RcTestNavMeshTool.cs
View File

@ -98,7 +98,7 @@ namespace DotRecast.Recast.Toolset.Tools
iterPos = result; iterPos = result;
pathIterPolyCount = DtPathUtils.MergeCorridorStartMoved(ref pathIterPolys, pathIterPolyCount, MAX_POLYS, visited, nvisited); pathIterPolyCount = DtPathUtils.MergeCorridorStartMoved(pathIterPolys, pathIterPolyCount, MAX_POLYS, visited, nvisited);
pathIterPolyCount = DtPathUtils.FixupShortcuts(ref pathIterPolys, pathIterPolyCount, navQuery); pathIterPolyCount = DtPathUtils.FixupShortcuts(ref pathIterPolys, pathIterPolyCount, navQuery);
var status = navQuery.GetPolyHeight(pathIterPolys[0], result, out var h); var status = navQuery.GetPolyHeight(pathIterPolys[0], result, out var h);