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

Optimization of of the mesh detail construction: replaced the first of the 2 flood-fill algorithms (the one used to find the span corresponding to the center of the polygon) with a search of span at the center with the region matching the polygon.

Browse Source
This commit is contained in:
axelrodR 2014-01-19 14:02:41 +02:00
parent e063ba6f5a
commit 98f2f02c2b
1 changed files with 35 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
Recast/Source/RecastMeshDetail.cpp
View File

@ -744,60 +744,20 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
static void getHeightData(const rcCompactHeightfield& chf, static void getHeightData(const rcCompactHeightfield& chf,
const unsigned short* poly, const int npoly, const unsigned short* poly, const int npoly,
const unsigned short* verts, const int bs, const unsigned short* verts, const int bs,
rcHeightPatch& hp, rcIntArray& stack) rcHeightPatch& hp, rcIntArray& stack,
int region)
{ {
// Floodfill the heightfield to get 2D height data,
// starting at vertex locations as seeds.
// Note: Reads to the compact heightfield are offset by border size (bs) // Note: Reads to the compact heightfield are offset by border size (bs)
// since border size offset is already removed from the polymesh vertices. // since border size offset is already removed from the polymesh vertices.
memset(hp.data, 0, sizeof(unsigned short)*hp.width*hp.height);
stack.resize(0); stack.resize(0);
static const int offset[9*2] = static const int offset[9*2] =
{ {
0,0, -1,-1, 0,-1, 1,-1, 1,0, 1,1, 0,1, -1,1, -1,0, 0,0, -1,0, 0,1, 1,0, 0,-1, -1,-1, -1,1, 1,1, 1,-1
}; };
// Use poly vertices as seed points for the flood fill. // find the center of the polygon
for (int j = 0; j < npoly; ++j)
{
int cx = 0, cz = 0, ci =-1;
int dmin = RC_UNSET_HEIGHT;
for (int k = 0; k < 9; ++k)
{
const int ax = (int)verts[poly[j]*3+0] + offset[k*2+0];
const int ay = (int)verts[poly[j]*3+1];
const int az = (int)verts[poly[j]*3+2] + offset[k*2+1];
if (ax < hp.xmin || ax >= hp.xmin+hp.width ||
az < hp.ymin || az >= hp.ymin+hp.height)
continue;
const rcCompactCell& c = chf.cells[(ax+bs)+(az+bs)*chf.width];
for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
{
const rcCompactSpan& s = chf.spans[i];
int d = rcAbs(ay - (int)s.y);
if (d < dmin)
{
cx = ax;
cz = az;
ci = i;
dmin = d;
}
}
}
if (ci != -1)
{
stack.push(cx);
stack.push(cz);
stack.push(ci);
}
}
// Find center of the polygon using flood fill.
int pcx = 0, pcz = 0; int pcx = 0, pcz = 0;
for (int j = 0; j < npoly; ++j) for (int j = 0; j < npoly; ++j)
{ {
@ -807,57 +767,36 @@ static void getHeightData(const rcCompactHeightfield& chf,
pcx /= npoly; pcx /= npoly;
pcz /= npoly; pcz /= npoly;
for (int i = 0; i < stack.size(); i += 3) // find a span with the right region around this point
// No need to check for connectivity because the region ensures it
for (int dir = 0; dir < 9; ++dir)
{ {
int cx = stack[i+0]; int ax = pcx + offset[dir*2+0];
int cy = stack[i+1]; int az = pcz + offset[dir*2+1];
int idx = cx-hp.xmin+(cy-hp.ymin)*hp.width;
hp.data[idx] = 1;
}
while (stack.size() > 0) if (ax < hp.xmin || ax >= hp.xmin+hp.width ||
{ az < hp.ymin || az >= hp.ymin+hp.height)
int ci = stack.pop(); continue;
int cy = stack.pop();
int cx = stack.pop();
// Check if close to center of the polygon. const rcCompactCell& c = chf.cells[(ax+bs)+(az+bs)*chf.width];
if (rcAbs(cx-pcx) <= 1 && rcAbs(cy-pcz) <= 1) for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
{ {
stack.resize(0); const rcCompactSpan& s = chf.spans[i];
stack.push(cx); if (s.reg == region)
stack.push(cy); {
stack.push(ci); stack.push(ax);
stack.push(az);
stack.push(i);
break;
}
}
if (stack.size() > 0)
break; break;
}
const rcCompactSpan& cs = chf.spans[ci];
for (int dir = 0; dir < 4; ++dir)
{
if (rcGetCon(cs, dir) == RC_NOT_CONNECTED) continue;
const int ax = cx + rcGetDirOffsetX(dir);
const int ay = cy + rcGetDirOffsetY(dir);
if (ax < hp.xmin || ax >= (hp.xmin+hp.width) ||
ay < hp.ymin || ay >= (hp.ymin+hp.height))
continue;
if (hp.data[ax-hp.xmin+(ay-hp.ymin)*hp.width] != 0)
continue;
const int ai = (int)chf.cells[(ax+bs)+(ay+bs)*chf.width].index + rcGetCon(cs, dir);
int idx = ax-hp.xmin+(ay-hp.ymin)*hp.width;
hp.data[idx] = 1;
stack.push(ax);
stack.push(ay);
stack.push(ai);
}
} }
// Floodfill the heightfield to get 2D height data,
// starting at center location found above as seed.
memset(hp.data, 0xff, sizeof(unsigned short)*hp.width*hp.height); memset(hp.data, 0xff, sizeof(unsigned short)*hp.width*hp.height);
// Mark start locations. // Mark start locations.
@ -914,7 +853,6 @@ static void getHeightData(const rcCompactHeightfield& chf,
stack.push(ai); stack.push(ai);
} }
} }
} }
static unsigned char getEdgeFlags(const float* va, const float* vb, static unsigned char getEdgeFlags(const float* va, const float* vb,
@ -1072,7 +1010,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
hp.ymin = bounds[i*4+2]; hp.ymin = bounds[i*4+2];
hp.width = bounds[i*4+1]-bounds[i*4+0]; hp.width = bounds[i*4+1]-bounds[i*4+0];
hp.height = bounds[i*4+3]-bounds[i*4+2]; hp.height = bounds[i*4+3]-bounds[i*4+2];
getHeightData(chf, p, npoly, mesh.verts, borderSize, hp, stack); getHeightData(chf, p, npoly, mesh.verts, borderSize, hp, stack, mesh.regs[i]);
// Build detail mesh. // Build detail mesh.
int nverts = 0; int nverts = 0;