a.samsonkin
/
DotRecastNetSim
forked from bit/DotRecastNetSim
1
0
Fork 0
Code Pull Requests Activity

remove new int[3] in GetPolyMergeValue

This commit is contained in:
ikpil 2023-06-06 19:06:01 +09:00
parent 695fe15a6e
commit c70d2ebfd4
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/DotRecast.Detour.TileCache/TileCacheBuilder.cs
View File

@ -1189,18 +1189,21 @@ namespace DotRecast.Detour.TileCache
- (verts[c] - verts[a]) * (verts[b + 2] - verts[a + 2]) < 0; - (verts[c] - verts[a]) * (verts[b + 2] - verts[a + 2]) < 0;
} }
private int[] GetPolyMergeValue(int[] polys, int pa, int pb, int[] verts, int maxVertsPerPoly) private int GetPolyMergeValue(int[] polys, int pa, int pb, int[] verts, out int ea, out int eb, int maxVertsPerPoly)
{ {
ea = 0;
eb = 0;
int na = CountPolyVerts(polys, pa, maxVertsPerPoly); int na = CountPolyVerts(polys, pa, maxVertsPerPoly);
int nb = CountPolyVerts(polys, pb, maxVertsPerPoly); int nb = CountPolyVerts(polys, pb, maxVertsPerPoly);
// If the merged polygon would be too big, do not merge. // If the merged polygon would be too big, do not merge.
if (na + nb - 2 > maxVertsPerPoly) if (na + nb - 2 > maxVertsPerPoly)
return new int[] { -1, 0, 0 }; return -1;
// Check if the polygons share an edge. // Check if the polygons share an edge.
int ea = -1; ea = -1;
int eb = -1; eb = -1;
for (int i = 0; i < na; ++i) for (int i = 0; i < na; ++i)
{ {
@ -1208,9 +1211,7 @@ namespace DotRecast.Detour.TileCache
int va1 = polys[pa + (i + 1) % na]; int va1 = polys[pa + (i + 1) % na];
if (va0 > va1) if (va0 > va1)
{ {
int tmp = va0; (va0, va1) = (va1, va0);
va0 = va1;
va1 = tmp;
} }
for (int j = 0; j < nb; ++j) for (int j = 0; j < nb; ++j)
@ -1219,9 +1220,7 @@ namespace DotRecast.Detour.TileCache
int vb1 = polys[pb + (j + 1) % nb]; int vb1 = polys[pb + (j + 1) % nb];
if (vb0 > vb1) if (vb0 > vb1)
{ {
int tmp = vb0; (vb0, vb1) = (vb1, vb0);
vb0 = vb1;
vb1 = tmp;
} }
if (va0 == vb0 && va1 == vb1) if (va0 == vb0 && va1 == vb1)
@ -1235,7 +1234,7 @@ namespace DotRecast.Detour.TileCache
// No common edge, cannot merge. // No common edge, cannot merge.
if (ea == -1 || eb == -1) if (ea == -1 || eb == -1)
return new int[] { -1, ea, eb }; return -1;
// Check to see if the merged polygon would be convex. // Check to see if the merged polygon would be convex.
int va, vb, vc; int va, vb, vc;
@ -1244,13 +1243,13 @@ namespace DotRecast.Detour.TileCache
vb = polys[pa + ea]; vb = polys[pa + ea];
vc = polys[pb + (eb + 2) % nb]; vc = polys[pb + (eb + 2) % nb];
if (!Uleft(verts, va * 3, vb * 3, vc * 3)) if (!Uleft(verts, va * 3, vb * 3, vc * 3))
return new int[] { -1, ea, eb }; return -1;
va = polys[pb + (eb + nb - 1) % nb]; va = polys[pb + (eb + nb - 1) % nb];
vb = polys[pb + eb]; vb = polys[pb + eb];
vc = polys[pa + (ea + 2) % na]; vc = polys[pa + (ea + 2) % na];
if (!Uleft(verts, va * 3, vb * 3, vc * 3)) if (!Uleft(verts, va * 3, vb * 3, vc * 3))
return new int[] { -1, ea, eb }; return -1;
va = polys[pa + ea]; va = polys[pa + ea];
vb = polys[pa + (ea + 1) % na]; vb = polys[pa + (ea + 1) % na];
@ -1258,7 +1257,7 @@ namespace DotRecast.Detour.TileCache
int dx = verts[va * 3 + 0] - verts[vb * 3 + 0]; int dx = verts[va * 3 + 0] - verts[vb * 3 + 0];
int dy = verts[va * 3 + 2] - verts[vb * 3 + 2]; int dy = verts[va * 3 + 2] - verts[vb * 3 + 2];
return new int[] { dx * dx + dy * dy, ea, eb }; return (dx * dx) + (dy * dy);
} }
private void MergePolys(int[] polys, int pa, int pb, int ea, int eb, int maxVertsPerPoly) private void MergePolys(int[] polys, int pa, int pb, int ea, int eb, int maxVertsPerPoly)
@ -1581,10 +1580,7 @@ namespace DotRecast.Detour.TileCache
for (int k = j + 1; k < npolys; ++k) for (int k = j + 1; k < npolys; ++k)
{ {
int pk = k * maxVertsPerPoly; int pk = k * maxVertsPerPoly;
int[] pm = GetPolyMergeValue(polys, pj, pk, mesh.verts, maxVertsPerPoly); int v = GetPolyMergeValue(polys, pj, pk, mesh.verts, out var ea, out var eb, maxVertsPerPoly);
int v = pm[0];
int ea = pm[1];
int eb = pm[2];
if (v > bestMergeVal) if (v > bestMergeVal)
{ {
bestMergeVal = v; bestMergeVal = v;
@ -1740,10 +1736,7 @@ namespace DotRecast.Detour.TileCache
for (int k = j + 1; k < npolys; ++k) for (int k = j + 1; k < npolys; ++k)
{ {
int pk = k * maxVertsPerPoly; int pk = k * maxVertsPerPoly;
int[] pm = GetPolyMergeValue(polys, pj, pk, mesh.verts, maxVertsPerPoly); int v = GetPolyMergeValue(polys, pj, pk, mesh.verts, out var ea, out var eb, maxVertsPerPoly);
int v = pm[0];
int ea = pm[1];
int eb = pm[2];
if (v > bestMergeVal) if (v > bestMergeVal)
{ {
bestMergeVal = v; bestMergeVal = v;

8
src/DotRecast.Recast/RecastMesh.cs
View File

@ -463,8 +463,9 @@ namespace DotRecast.Recast
private static int GetPolyMergeValue(int[] polys, int pa, int pb, int[] verts, out int ea, out int eb, int nvp) private static int GetPolyMergeValue(int[] polys, int pa, int pb, int[] verts, out int ea, out int eb, int nvp)
{ {
ea = -1; ea = 0;
eb = -1; eb = 0;
int na = CountPolyVerts(polys, pa, nvp); int na = CountPolyVerts(polys, pa, nvp);
int nb = CountPolyVerts(polys, pb, nvp); int nb = CountPolyVerts(polys, pb, nvp);
@ -472,6 +473,9 @@ namespace DotRecast.Recast
if (na + nb - 2 > nvp) if (na + nb - 2 > nvp)
return -1; return -1;
ea = -1;
eb = -1;
// Check if the polygons share an edge. // Check if the polygons share an edge.
for (int i = 0; i < na; ++i) for (int i = 0; i < na; ++i)