Scarfski/recastnavigation
1
0
Fork 0
mirror of https://github.com/recastnavigation/recastnavigation.git synced 2026-08-19 09:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved pointers from dtMeshHeader to dtMeshTile, allows mixing build/use 32/64 bit builds. Bumbed Detour version number.

Browse Source
This commit is contained in:
Mikko Mononen
2010-03-02 09:24:24 +00:00
parent b50aecfa51
commit 359f15b11c
8 changed files with 708 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
DebugUtils/Source/DetourDebugDraw.cpp
View File

@@ -37,7 +37,7 @@ static float distancePtLine2d(const float* pt, const float* p, const float* q)
return dx*dx + dz*dz;
}
static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshHeader* header,
static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile,
const unsigned int col, const float linew,
bool inner)
{
@@ -45,13 +45,13 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshHeader* header,
dd->begin(DU_DRAW_LINES, linew);
for (int i = 0; i < header->polyCount; ++i)
for (int i = 0; i < tile->header->polyCount; ++i)
{
const dtPoly* p = &header->polys[i];
const dtPoly* p = &tile->polys[i];
if (p->type == DT_POLYTYPE_OFFMESH_CONNECTION) continue;
const dtPolyDetail* pd = &header->detailMeshes[i];
const dtPolyDetail* pd = &tile->detailMeshes[i];
for (int j = 0, nj = (int)p->vertCount; j < nj; ++j)
{
@@ -62,9 +62,9 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshHeader* header,
if (p->neis[j] & DT_EXT_LINK)
{
bool con = false;
for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = header->links[k].next)
for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
{
if (header->links[k].edge == j)
if (tile->links[k].edge == j)
{
con = true;
break;
@@ -83,21 +83,21 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshHeader* header,
if (p->neis[j] != 0) continue;
}
const float* v0 = &header->verts[p->verts[j]*3];
const float* v1 = &header->verts[p->verts[(j+1) % nj]*3];
const float* v0 = &tile->verts[p->verts[j]*3];
const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3];
// Draw detail mesh edges which align with the actual poly edge.
// This is really slow.
for (int k = 0; k < pd->triCount; ++k)
{
const unsigned char* t = &header->detailTris[(pd->triBase+k)*4];
const unsigned char* t = &tile->detailTris[(pd->triBase+k)*4];
const float* tv[3];
for (int m = 0; m < 3; ++m)
{
if (t[m] < p->vertCount)
tv[m] = &header->verts[p->verts[t[m]]*3];
tv[m] = &tile->verts[p->verts[t[m]]*3];
else
tv[m] = &header->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
tv[m] = &tile->detailVerts[(pd->vertBase+(t[m]-p->vertCount))*3];
}
for (int m = 0, n = 2; m < 3; n=m++)
{
@@ -117,19 +117,18 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshHeader* header,
static void drawMeshTile(duDebugDraw* dd, const dtNavMesh* mesh, const dtMeshTile* tile, unsigned char flags)
{
const dtMeshHeader* header = tile->header;
dtPolyRef base = mesh->getTileId(tile);
dd->depthMask(false);
dd->begin(DU_DRAW_TRIS);
for (int i = 0; i < header->polyCount; ++i)
for (int i = 0; i < tile->header->polyCount; ++i)
{
const dtPoly* p = &header->polys[i];
const dtPoly* p = &tile->polys[i];
if (p->type == DT_POLYTYPE_OFFMESH_CONNECTION) // Skip off-mesh links.
continue;
const dtPolyDetail* pd = &header->detailMeshes[i];
const dtPolyDetail* pd = &tile->detailMeshes[i];
unsigned int col;
if ((flags & DU_DRAWNAVMESH_CLOSEDLIST) && mesh->isInClosedList(base | (dtPolyRef)i))
@@ -144,30 +143,30 @@ static void drawMeshTile(duDebugDraw* dd, const dtNavMesh* mesh, const dtMeshTil
for (int j = 0; j < pd->triCount; ++j)
{
const unsigned char* t = &header->detailTris[(pd->triBase+j)*4];
const unsigned char* t = &tile->detailTris[(pd->triBase+j)*4];
for (int k = 0; k < 3; ++k)
{
if (t[k] < p->vertCount)
dd->vertex(&header->verts[p->verts[t[k]]*3], col);
dd->vertex(&tile->verts[p->verts[t[k]]*3], col);
else
dd->vertex(&header->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
dd->vertex(&tile->detailVerts[(pd->vertBase+t[k]-p->vertCount)*3], col);
}
}
}
dd->end();
// Draw inter poly boundaries
drawPolyBoundaries(dd, header, duRGBA(0,48,64,32), 1.5f, true);
drawPolyBoundaries(dd, tile, duRGBA(0,48,64,32), 1.5f, true);
// Draw outer poly boundaries
drawPolyBoundaries(dd, header, duRGBA(0,48,64,220), 2.5f, false);
drawPolyBoundaries(dd, tile, duRGBA(0,48,64,220), 2.5f, false);
if (flags & DU_DRAWNAVMESH_OFFMESHCONS)
{
dd->begin(DU_DRAW_LINES, 2.0f);
for (int i = 0; i < header->polyCount; ++i)
for (int i = 0; i < tile->header->polyCount; ++i)
{
const dtPoly* p = &header->polys[i];
const dtPoly* p = &tile->polys[i];
if (p->type != DT_POLYTYPE_OFFMESH_CONNECTION) // Skip regular polys.
continue;
@@ -177,18 +176,18 @@ static void drawMeshTile(duDebugDraw* dd, const dtNavMesh* mesh, const dtMeshTil
else
col = duDarkenColor(duIntToCol(p->area, 220));
const dtOffMeshConnection* con = &header->offMeshCons[i - header->offMeshBase];
const float* va = &header->verts[p->verts[0]*3];
const float* vb = &header->verts[p->verts[1]*3];
const dtOffMeshConnection* con = &tile->offMeshCons[i - tile->header->offMeshBase];
const float* va = &tile->verts[p->verts[0]*3];
const float* vb = &tile->verts[p->verts[1]*3];
// Check to see if start and end end-points have links.
bool startSet = false;
bool endSet = false;
for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = header->links[k].next)
for (unsigned int k = p->firstLink; k != DT_NULL_LINK; k = tile->links[k].next)
{
if (header->links[k].edge == 0)
if (tile->links[k].edge == 0)
startSet = true;
if (header->links[k].edge == 1)
if (tile->links[k].edge == 1)
endSet = true;
}
@@ -223,9 +222,9 @@ static void drawMeshTile(duDebugDraw* dd, const dtNavMesh* mesh, const dtMeshTil
const unsigned int vcol = duRGBA(0,0,0,196);
dd->begin(DU_DRAW_POINTS, 3.0f);
for (int i = 0; i < header->vertCount; ++i)
for (int i = 0; i < tile->header->vertCount; ++i)
{
const float* v = &header->verts[i*3];
const float* v = &tile->verts[i*3];
dd->vertex(v[0], v[1], v[2], vcol);
}
dd->end();
@@ -330,22 +329,20 @@ void duDebugDrawNavMesh(duDebugDraw* dd, const dtNavMesh* mesh, unsigned char fl
static void drawMeshTileBVTree(duDebugDraw* dd, const dtNavMesh* mesh, const dtMeshTile* tile)
{
const dtMeshHeader* header = tile->header;
// Draw BV nodes.
const float cs = 1.0f / header->bvQuantFactor;
const float cs = 1.0f / tile->header->bvQuantFactor;
dd->begin(DU_DRAW_LINES, 1.0f);
for (int i = 0; i < header->bvNodeCount; ++i)
for (int i = 0; i < tile->header->bvNodeCount; ++i)
{
const dtBVNode* n = &header->bvTree[i];
const dtBVNode* n = &tile->bvTree[i];
if (n->i < 0) // Leaf indices are positive.
continue;
duAppendBoxWire(dd, header->bmin[0] + n->bmin[0]*cs,
header->bmin[1] + n->bmin[1]*cs,
header->bmin[2] + n->bmin[2]*cs,
header->bmin[0] + n->bmax[0]*cs,
header->bmin[1] + n->bmax[1]*cs,
header->bmin[2] + n->bmax[2]*cs,
duAppendBoxWire(dd, tile->header->bmin[0] + n->bmin[0]*cs,
tile->header->bmin[1] + n->bmin[1]*cs,
tile->header->bmin[2] + n->bmin[2]*cs,
tile->header->bmin[0] + n->bmax[0]*cs,
tile->header->bmin[1] + n->bmax[1]*cs,
tile->header->bmin[2] + n->bmax[2]*cs,
duRGBA(255,255,255,128));
}
dd->end();
@@ -450,8 +447,7 @@ void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh* mesh, dtPolyRef re
const dtMeshTile* tile = mesh->getTileByRef(ref, &ip);
if (!tile)
return;
const dtMeshHeader* header = tile->header;
const dtPoly* p = &header->polys[ip];
const dtPoly* p = &tile->polys[ip];
dd->depthMask(false);
@@ -459,7 +455,7 @@ void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh* mesh, dtPolyRef re
if (p->type == DT_POLYTYPE_OFFMESH_CONNECTION)
{
dtOffMeshConnection* con = &header->offMeshCons[ip - header->offMeshBase];
dtOffMeshConnection* con = &tile->offMeshCons[ip - tile->header->offMeshBase];
dd->begin(DU_DRAW_LINES, 2.0f);
@@ -472,18 +468,18 @@ void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh* mesh, dtPolyRef re
}
else
{
const dtPolyDetail* pd = &header->detailMeshes[ip];
const dtPolyDetail* pd = &tile->detailMeshes[ip];
dd->begin(DU_DRAW_TRIS);
for (int i = 0; i < pd->triCount; ++i)
{
const unsigned char* t = &header->detailTris[(pd->triBase+i)*4];
const unsigned char* t = &tile->detailTris[(pd->triBase+i)*4];
for (int j = 0; j < 3; ++j)
{
if (t[j] < p->vertCount)
dd->vertex(&header->verts[p->verts[t[j]]*3], c);
dd->vertex(&tile->verts[p->verts[t[j]]*3], c);
else
dd->vertex(&header->detailVerts[(pd->vertBase+t[j]-p->vertCount)*3], c);
dd->vertex(&tile->detailVerts[(pd->vertBase+t[j]-p->vertCount)*3], c);
}
}
dd->end();