server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issue 20: removed unused variable from mergePolys() function.

Browse Source
This commit is contained in:
Mikko Mononen 2009-11-20 13:47:15 +00:00
parent ab023b1700
commit 753ebdc319
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Recast/Source/RecastMesh.cpp
View File

@ -454,8 +454,7 @@ static int getPolyMergeValue(unsigned short* pa, unsigned short* pb,
return dx*dx + dy*dy; return dx*dx + dy*dy;
} }
static void mergePolys(unsigned short* pa, unsigned short* pb, static void mergePolys(unsigned short* pa, unsigned short* pb, int ea, int eb,
const unsigned short* verts, int ea, int eb,
unsigned short* tmp, const int nvp) unsigned short* tmp, const int nvp)
{ {
const int na = countPolyVerts(pa, nvp); const int na = countPolyVerts(pa, nvp);
@ -732,7 +731,7 @@ static bool removeVertex(rcPolyMesh& mesh, const unsigned short rem, const int m
// Found best, merge. // Found best, merge.
unsigned short* pa = &polys[bestPa*nvp]; unsigned short* pa = &polys[bestPa*nvp];
unsigned short* pb = &polys[bestPb*nvp]; unsigned short* pb = &polys[bestPb*nvp];
mergePolys(pa, pb, mesh.verts, bestEa, bestEb, tmpPoly, nvp); mergePolys(pa, pb, bestEa, bestEb, tmpPoly, nvp);
memcpy(pb, &polys[(npolys-1)*nvp], sizeof(unsigned short)*nvp); memcpy(pb, &polys[(npolys-1)*nvp], sizeof(unsigned short)*nvp);
pregs[bestPb] = pregs[npolys-1]; pregs[bestPb] = pregs[npolys-1];
npolys--; npolys--;
@ -960,7 +959,7 @@ bool rcBuildPolyMesh(rcContourSet& cset, int nvp, rcPolyMesh& mesh)
// Found best, merge. // Found best, merge.
unsigned short* pa = &polys[bestPa*nvp]; unsigned short* pa = &polys[bestPa*nvp];
unsigned short* pb = &polys[bestPb*nvp]; unsigned short* pb = &polys[bestPb*nvp];
mergePolys(pa, pb, mesh.verts, bestEa, bestEb, tmpPoly, nvp); mergePolys(pa, pb, bestEa, bestEb, tmpPoly, nvp);
memcpy(pb, &polys[(npolys-1)*nvp], sizeof(unsigned short)*nvp); memcpy(pb, &polys[(npolys-1)*nvp], sizeof(unsigned short)*nvp);
npolys--; npolys--;
} }