Migrated some small types to structs

This commit is contained in:
Gabriel Alexandre 2023-10-28 11:04:11 +01:00 committed by Choi Ikpil
parent 70c9adeb2f
commit 23405ea5a7
10 changed files with 33 additions and 32 deletions

View File

@ -99,7 +99,7 @@ namespace DotRecast.Detour.Dynamic
config.maxEdgeLen, config.maxSimplificationError, config.maxEdgeLen, config.maxSimplificationError,
Math.Min(DtDynamicNavMesh.MAX_VERTS_PER_POLY, config.vertsPerPoly), Math.Min(DtDynamicNavMesh.MAX_VERTS_PER_POLY, config.vertsPerPoly),
config.detailSampleDistance, config.detailSampleMaxError, config.detailSampleDistance, config.detailSampleMaxError,
true, true, true, null, true); true, true, true, default, true);
RcBuilderResult r = builder.Build(vt.tileX, vt.tileZ, null, rcConfig, heightfield, telemetry); RcBuilderResult r = builder.Build(vt.tileX, vt.tileZ, null, rcConfig, heightfield, telemetry);
if (config.keepIntermediateResults) if (config.keepIntermediateResults)
{ {

View File

@ -61,7 +61,15 @@ namespace DotRecast.Recast.Toolset.Builder
public static RcAreaModification OfValue(int value) public static RcAreaModification OfValue(int value)
{ {
return Values.FirstOrDefault(x => x.Value == value) ?? SAMPLE_AREAMOD_GRASS; foreach(var v in Values)
{
if(v.Value == value)
{
return v;
}
}
return SAMPLE_AREAMOD_GRASS;
} }
} }
} }

View File

@ -20,7 +20,7 @@ freely, subject to the following restrictions:
namespace DotRecast.Recast namespace DotRecast.Recast
{ {
public class RcAreaModification public readonly struct RcAreaModification
{ {
public const int RC_AREA_FLAGS_MASK = 0x3F; public const int RC_AREA_FLAGS_MASK = 0x3F;
@ -58,12 +58,12 @@ namespace DotRecast.Recast
Mask = other.Mask; Mask = other.Mask;
} }
public int GetMaskedValue() public readonly int GetMaskedValue()
{ {
return Value & Mask; return Value & Mask;
} }
public int Apply(int area) public readonly int Apply(int area)
{ {
return ((Value & Mask) | (area & ~Mask)); return ((Value & Mask) | (area & ~Mask));
} }

View File

@ -36,7 +36,7 @@ namespace DotRecast.Recast
/// @param[in] span The span to update. /// @param[in] span The span to update.
/// @param[in] direction The direction to set. [Limits: 0 <= value < 4] /// @param[in] direction The direction to set. [Limits: 0 <= value < 4]
/// @param[in] neighborIndex The index of the neighbor span. /// @param[in] neighborIndex The index of the neighbor span.
public static void SetCon(RcCompactSpan span, int direction, int neighborIndex) public static void SetCon(ref RcCompactSpan span, int direction, int neighborIndex)
{ {
int shift = direction * 6; int shift = direction * 6;
int con = span.con; int con = span.con;

View File

@ -21,7 +21,7 @@ freely, subject to the following restrictions:
namespace DotRecast.Recast namespace DotRecast.Recast
{ {
/** Represents a span of unobstructed space within a compact heightfield. */ /** Represents a span of unobstructed space within a compact heightfield. */
public class RcCompactSpan public struct RcCompactSpan
{ {
/** The lower extent of the span. (Measured from the heightfield's base.) */ /** The lower extent of the span. (Measured from the heightfield's base.) */
public int y; public int y;

View File

@ -115,11 +115,11 @@ namespace DotRecast.Recast
RcCompactCell c = chf.cells[x + y * w]; RcCompactCell c = chf.cells[x + y * w];
for (int i = c.index, ni = c.index + c.count; i < ni; ++i) for (int i = c.index, ni = c.index + c.count; i < ni; ++i)
{ {
RcCompactSpan s = chf.spans[i]; ref RcCompactSpan s = ref chf.spans[i];
for (int dir = 0; dir < 4; ++dir) for (int dir = 0; dir < 4; ++dir)
{ {
SetCon(s, dir, RC_NOT_CONNECTED); SetCon(ref s, dir, RC_NOT_CONNECTED);
int nx = x + GetDirOffsetX(dir); int nx = x + GetDirOffsetX(dir);
int ny = y + GetDirOffsetY(dir); int ny = y + GetDirOffsetY(dir);
// First check that the neighbour cell is in bounds. // First check that the neighbour cell is in bounds.
@ -131,7 +131,7 @@ namespace DotRecast.Recast
RcCompactCell nc = chf.cells[nx + ny * w]; RcCompactCell nc = chf.cells[nx + ny * w];
for (int k = nc.index, nk = nc.index + nc.count; k < nk; ++k) for (int k = nc.index, nk = nc.index + nc.count; k < nk; ++k)
{ {
RcCompactSpan ns = chf.spans[k]; ref RcCompactSpan ns = ref chf.spans[k];
int bot = Math.Max(s.y, ns.y); int bot = Math.Max(s.y, ns.y);
int top = Math.Min(s.y + s.h, ns.y + ns.h); int top = Math.Min(s.y + s.h, ns.y + ns.h);
@ -147,7 +147,7 @@ namespace DotRecast.Recast
continue; continue;
} }
SetCon(s, dir, lidx); SetCon(ref s, dir, lidx);
break; break;
} }
} }

View File

@ -632,10 +632,6 @@ namespace DotRecast.Recast
maxVerts += region.holes[i].contour.nverts; maxVerts += region.holes[i].contour.nverts;
RcPotentialDiagonal[] diags = new RcPotentialDiagonal[maxVerts]; RcPotentialDiagonal[] diags = new RcPotentialDiagonal[maxVerts];
for (int pd = 0; pd < maxVerts; pd++)
{
diags[pd] = new RcPotentialDiagonal();
}
RcContour outline = region.outline; RcContour outline = region.outline;
@ -664,8 +660,7 @@ namespace DotRecast.Recast
{ {
int dx = outline.verts[j * 4 + 0] - hole.verts[corner + 0]; int dx = outline.verts[j * 4 + 0] - hole.verts[corner + 0];
int dz = outline.verts[j * 4 + 2] - hole.verts[corner + 2]; int dz = outline.verts[j * 4 + 2] - hole.verts[corner + 2];
diags[ndiags].vert = j; diags[ndiags] = new RcPotentialDiagonal(j, dx * dx + dz * dz);
diags[ndiags].dist = dx * dx + dz * dz;
ndiags++; ndiags++;
} }
} }

View File

@ -30,10 +30,6 @@ namespace DotRecast.Recast
public static class RcLayers public static class RcLayers
{ {
const int RC_MAX_LAYERS = RcConstants.RC_NOT_CONNECTED;
const int RC_MAX_NEIS = 16;
private static void AddUnique(List<int> a, int v) private static void AddUnique(List<int> a, int v)
{ {
if (!a.Contains(v)) if (!a.Contains(v))
@ -63,10 +59,6 @@ namespace DotRecast.Recast
Array.Fill(srcReg, 0xFF); Array.Fill(srcReg, 0xFF);
int nsweeps = chf.width; // Math.Max(chf.width, chf.height); int nsweeps = chf.width; // Math.Max(chf.width, chf.height);
RcSweepSpan[] sweeps = new RcSweepSpan[nsweeps]; RcSweepSpan[] sweeps = new RcSweepSpan[nsweeps];
for (int i = 0; i < sweeps.Length; i++)
{
sweeps[i] = new RcSweepSpan();
}
// Partition walkable area into monotone regions. // Partition walkable area into monotone regions.
int[] prevCount = new int[256]; int[] prevCount = new int[256];
@ -305,7 +297,7 @@ namespace DotRecast.Recast
int newId = ri.layerId; int newId = ri.layerId;
for (;;) while (true)
{ {
int oldId = 0xff; int oldId = 0xff;

View File

@ -1,8 +1,14 @@
namespace DotRecast.Recast namespace DotRecast.Recast
{ {
public class RcPotentialDiagonal public readonly struct RcPotentialDiagonal
{ {
public int dist; public readonly int vert;
public int vert; public readonly int dist;
public RcPotentialDiagonal(int vert, int dist)
{
this.vert = vert;
this.dist = dist;
}
} }
} }

View File

@ -1,6 +1,6 @@
namespace DotRecast.Recast namespace DotRecast.Recast
{ {
public class RcSweepSpan public struct RcSweepSpan
{ {
public int rid; // row id public int rid; // row id
public int id; // region id public int id; // region id