R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add tile range for NavMesh debug draw

Browse Source 
New cvar 'navmesh_debug_tile_range' (tile shift index to this cvar gets drawn).
This commit is contained in:
Kawe Mazidjatari 2022-07-22 12:44:33 +02:00
parent ff0ae1c13b
commit 8198866f6f
4 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
r5dev/engine/debugoverlay.cpp
View File

@ -284,6 +284,10 @@ void DrawNavMeshBVTree()
OverlayBox_t::Transforms vTransforms; OverlayBox_t::Transforms vTransforms;
for (int i = navmesh_draw_bvtree->GetInt(); i < mesh->getTileCount(); ++i) for (int i = navmesh_draw_bvtree->GetInt(); i < mesh->getTileCount(); ++i)
{ {
if (navmesh_debug_tile_range->GetBool())
if (i > navmesh_debug_tile_range->GetInt())
break;
const dtMeshTile* tile = &mesh->m_tiles[i]; const dtMeshTile* tile = &mesh->m_tiles[i];
if (!tile->header) if (!tile->header)
continue; continue;
@ -325,6 +329,10 @@ static void DrawNavMeshPortals()
OverlayBox_t::Transforms vTransforms; OverlayBox_t::Transforms vTransforms;
for (int i = navmesh_draw_portal->GetInt(); i < mesh->getTileCount(); ++i) for (int i = navmesh_draw_portal->GetInt(); i < mesh->getTileCount(); ++i)
{ {
if (navmesh_debug_tile_range->GetBool())
if (i > navmesh_debug_tile_range->GetInt())
break;
const dtMeshTile* tile = &mesh->m_tiles[i]; const dtMeshTile* tile = &mesh->m_tiles[i];
if (!tile->header) if (!tile->header)
continue; continue;
@ -354,7 +362,7 @@ static void DrawNavMeshPortals()
if (side == 0 || side == 4) if (side == 0 || side == 4)
{ {
Color col = side == 0 ? Color(188, 0, 0, 188) : Color(188, 0, 188, 188); Color col = side == 0 ? Color(188, 0, 0, 255) : Color(188, 0, 188, 255);
const float x = va[0] + ((side == 0) ? -padx : padx); const float x = va[0] + ((side == 0) ? -padx : padx);
v_RenderLine(Vector3D(x, va[1], va[2] - padz), Vector3D(x, va[1], va[2] + padz), col, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(Vector3D(x, va[1], va[2] - padz), Vector3D(x, va[1], va[2] + padz), col, r_debug_overlay_zbuffer->GetBool());
@ -364,7 +372,7 @@ static void DrawNavMeshPortals()
} }
else if (side == 2 || side == 6) else if (side == 2 || side == 6)
{ {
Color col = side == 2 ? Color(0, 188, 0, 188) : Color(0, 188, 188, 188); Color col = side == 2 ? Color(0, 188, 0, 255) : Color(0, 188, 188, 255);
const float y = va[1] + ((side == 2) ? -padx : padx); const float y = va[1] + ((side == 2) ? -padx : padx);
v_RenderLine(Vector3D(va[0], y, va[2] - padz), Vector3D(va[0], y, va[2] + padz), col, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(Vector3D(va[0], y, va[2] - padz), Vector3D(va[0], y, va[2] + padz), col, r_debug_overlay_zbuffer->GetBool());
@ -387,6 +395,10 @@ void DrawNavMeshPolys()
OverlayBox_t::Transforms vTransforms; OverlayBox_t::Transforms vTransforms;
for (int i = navmesh_draw_polys->GetInt(); i < mesh->getTileCount(); ++i) for (int i = navmesh_draw_polys->GetInt(); i < mesh->getTileCount(); ++i)
{ {
if (navmesh_debug_tile_range->GetBool())
if (i > navmesh_debug_tile_range->GetInt())
break;
const dtMeshTile* tile = &mesh->m_tiles[i]; const dtMeshTile* tile = &mesh->m_tiles[i];
if (!tile->header) if (!tile->header)
continue; continue;
@ -396,21 +408,13 @@ void DrawNavMeshPolys()
{ {
const dtPoly* poly = &tile->polys[j]; const dtPoly* poly = &tile->polys[j];
Color col{ 110, 200, 220, 255 };
Color c{ 0, 140, 240, 255 };
const unsigned int ip = (unsigned int)(poly - tile->polys); const unsigned int ip = (unsigned int)(poly - tile->polys);
if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION) if (poly->getType() == DT_POLYTYPE_OFFMESH_CONNECTION)
{ {
//dtOffMeshConnection* con = &tile->offMeshCons[ip - tile->header->offMeshBase]; const dtOffMeshConnection* con = &tile->offMeshCons[ip - tile->header->offMeshBase];
v_RenderLine(Vector3D(con->pos[0], con->pos[1], con->pos[2]), Vector3D(con->pos[3], con->pos[4], con->pos[5]), Color(188, 0, 188, 255), r_debug_overlay_zbuffer->GetBool());
//dd->begin(DU_DRAW_LINES, 2.0f);
//// Connection arc.
//duAppendArc(dd, con->pos[0], con->pos[1], con->pos[2], con->pos[3], con->pos[4], con->pos[5], 0.25f,
// (con->flags & 1) ? 0.6f : 0.0f, 0.6f, c);
//dd->end();
} }
else else
{ {
@ -439,12 +443,11 @@ void DrawNavMeshPolys()
} }
} }
v_RenderLine(tris[0], tris[1], c, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(tris[0], tris[1], col, r_debug_overlay_zbuffer->GetBool());
v_RenderLine(tris[1], tris[2], c, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(tris[1], tris[2], col, r_debug_overlay_zbuffer->GetBool());
v_RenderLine(tris[2], tris[0], c, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(tris[2], tris[0], col, r_debug_overlay_zbuffer->GetBool());
} }
} }
} }
} }
} }
@ -452,9 +455,7 @@ void DrawNavMeshPolys()
static void DrawNavMeshPolyBoundaries() static void DrawNavMeshPolyBoundaries()
{ {
static const float thr = 0.01f * 0.01f; static const float thr = 0.01f * 0.01f;
Color col{20, 210, 255, 255}; Color col{20, 140, 255, 255};
//dd->begin(DU_DRAW_LINES, linew);
const dtNavMesh* mesh = GetNavMeshForHull(navmesh_debug_type->GetInt()); const dtNavMesh* mesh = GetNavMeshForHull(navmesh_debug_type->GetInt());
if (!mesh) if (!mesh)
@ -463,6 +464,10 @@ static void DrawNavMeshPolyBoundaries()
OverlayBox_t::Transforms vTransforms; OverlayBox_t::Transforms vTransforms;
for (int i = navmesh_draw_poly_bounds->GetInt(); i < mesh->getTileCount(); ++i) for (int i = navmesh_draw_poly_bounds->GetInt(); i < mesh->getTileCount(); ++i)
{ {
if (navmesh_debug_tile_range->GetBool())
if (i > navmesh_debug_tile_range->GetInt())
break;
const dtMeshTile* tile = &mesh->m_tiles[i]; const dtMeshTile* tile = &mesh->m_tiles[i];
if (!tile->header) if (!tile->header)
continue; continue;
@ -478,8 +483,7 @@ static void DrawNavMeshPolyBoundaries()
for (int j = 0, nj = (int)p->vertCount; j < nj; ++j) for (int j = 0, nj = (int)p->vertCount; j < nj; ++j)
{ {
Color c = col; if (navmesh_draw_poly_bounds_inner->GetBool())
if (navmesh_draw_poly_inner->GetBool())
{ {
if (p->neis[j] == 0) if (p->neis[j] == 0)
continue; continue;
@ -496,12 +500,12 @@ static void DrawNavMeshPolyBoundaries()
} }
} }
if (con) if (con)
c = Color(255, 255, 255, 48); col = Color(255, 255, 255, 48);
else else
c = Color(0, 0, 0, 48); col = Color(0, 0, 0, 48);
} }
else else
c = Color(0, 48, 64, 32); col = Color(0, 48, 64, 32);
} }
else else
{ {
@ -532,7 +536,7 @@ static void DrawNavMeshPolyBoundaries()
if (distancePtLine2d(tv[n], v0, v1) < thr && if (distancePtLine2d(tv[n], v0, v1) < thr &&
distancePtLine2d(tv[m], v0, v1) < thr) distancePtLine2d(tv[m], v0, v1) < thr)
{ {
v_RenderLine(Vector3D(tv[n][0], tv[n][1], tv[n][2]), Vector3D(tv[m][0], tv[m][1], tv[m][2]), c, r_debug_overlay_zbuffer->GetBool()); v_RenderLine(Vector3D(tv[n][0], tv[n][1], tv[n][2]), Vector3D(tv[m][0], tv[m][1], tv[m][2]), col, r_debug_overlay_zbuffer->GetBool());
} }
} }
} }

13
r5dev/tier1/IConVar.cpp
View File

@ -67,13 +67,14 @@ void ConVar::Init(void) const
ai_script_nodes_draw_index = new ConVar("ai_script_nodes_draw_index", "0", FCVAR_DEVELOPMENTONLY, "Start index for drawing script nodes.", false, 0.f, false, 0.f, nullptr, nullptr); ai_script_nodes_draw_index = new ConVar("ai_script_nodes_draw_index", "0", FCVAR_DEVELOPMENTONLY, "Start index for drawing script nodes.", false, 0.f, false, 0.f, nullptr, nullptr);
navmesh_always_reachable = new ConVar("navmesh_always_reachable" , "0" , FCVAR_DEVELOPMENTONLY, "Marks goal poly from agent poly as reachable regardless of table data ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr); navmesh_always_reachable = new ConVar("navmesh_always_reachable" , "0" , FCVAR_DEVELOPMENTONLY, "Marks goal poly from agent poly as reachable regardless of table data ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
navmesh_debug_type = new ConVar("navmesh_debug_type" , "0" , FCVAR_DEVELOPMENTONLY, "NavMesh hull index for debug draw.", true, 0.f, true, 4.f, nullptr, "0 = small, 1 = med_short, 2 = medium, 3 = large, 4 = extra large"); navmesh_debug_type = new ConVar("navmesh_debug_type" , "0" , FCVAR_DEVELOPMENTONLY, "NavMesh debug draw hull index.", true, 0.f, true, 4.f, nullptr, "0 = small, 1 = med_short, 2 = medium, 3 = large, 4 = extra large");
navmesh_debug_tile_range = new ConVar("navmesh_debug_tile_range" , "0" , FCVAR_DEVELOPMENTONLY, "NavMesh debug draw tiles ranging from shift index to this cvar.", true, 0.f, false, 0.f, nullptr, nullptr);
#ifndef DEDICATED #ifndef DEDICATED
navmesh_draw_bvtree = new ConVar("navmesh_draw_bvtree" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the BVTree of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount"); navmesh_draw_bvtree = new ConVar("navmesh_draw_bvtree" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the BVTree of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
navmesh_draw_portal = new ConVar("navmesh_draw_portal" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the portal of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount"); navmesh_draw_portal = new ConVar("navmesh_draw_portal" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the portal of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
navmesh_draw_polys = new ConVar("navmesh_draw_polys" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the polys of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount"); navmesh_draw_polys = new ConVar("navmesh_draw_polys" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the polys of the NavMesh tiles.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
navmesh_draw_poly_bounds = new ConVar("navmesh_draw_poly_bounds" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the bounds of the NavMesh polys.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount"); navmesh_draw_poly_bounds = new ConVar("navmesh_draw_poly_bounds" , "-1", FCVAR_DEVELOPMENTONLY, "Draws the bounds of the NavMesh polys.", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
navmesh_draw_poly_inner = new ConVar("navmesh_draw_poly_inner" , "0" , FCVAR_DEVELOPMENTONLY, "Draws the inner bounds of the NavMesh polys (requires navmesh_draw_poly_bounds).", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount"); navmesh_draw_poly_bounds_inner = new ConVar("navmesh_draw_poly_bounds_inner" , "0" , FCVAR_DEVELOPMENTONLY, "Draws the inner bounds of the NavMesh polys (requires navmesh_draw_poly_bounds).", false, 0.f, false, 0.f, nullptr, "Index: > 0 && < mesh->m_tileCount");
#endif // !DEDICATED #endif // !DEDICATED
sv_showconnecting = new ConVar("sv_showconnecting" , "1", FCVAR_RELEASE, "Logs information about the connecting client to the console.", false, 0.f, false, 0.f, nullptr, nullptr); sv_showconnecting = new ConVar("sv_showconnecting" , "1", FCVAR_RELEASE, "Logs information about the connecting client to the console.", false, 0.f, false, 0.f, nullptr, nullptr);
sv_pylonVisibility = new ConVar("sv_pylonVisibility", "0", FCVAR_RELEASE, "Determines the visiblity to the Pylon master server, 0 = Offline, 1 = Hidden, 2 = Public.", false, 0.f, false, 0.f, nullptr, nullptr); sv_pylonVisibility = new ConVar("sv_pylonVisibility", "0", FCVAR_RELEASE, "Determines the visiblity to the Pylon master server, 0 = Offline, 1 = Hidden, 2 = Public.", false, 0.f, false, 0.f, nullptr, nullptr);

3
r5dev/tier1/cvar.cpp
View File

@ -50,12 +50,13 @@ ConVar* ai_script_nodes_draw_index = nullptr;
ConVar* navmesh_always_reachable = nullptr; ConVar* navmesh_always_reachable = nullptr;
ConVar* navmesh_debug_type = nullptr; ConVar* navmesh_debug_type = nullptr;
ConVar* navmesh_debug_tile_range = nullptr;
#ifndef DEDICATED #ifndef DEDICATED
ConVar* navmesh_draw_bvtree = nullptr; ConVar* navmesh_draw_bvtree = nullptr;
ConVar* navmesh_draw_portal = nullptr; ConVar* navmesh_draw_portal = nullptr;
ConVar* navmesh_draw_polys = nullptr; ConVar* navmesh_draw_polys = nullptr;
ConVar* navmesh_draw_poly_bounds = nullptr; ConVar* navmesh_draw_poly_bounds = nullptr;
ConVar* navmesh_draw_poly_inner = nullptr; ConVar* navmesh_draw_poly_bounds_inner = nullptr;
#endif // !DEDICATED #endif // !DEDICATED
ConVar* sv_showconnecting = nullptr; ConVar* sv_showconnecting = nullptr;

3
r5dev/tier1/cvar.h
View File

@ -50,12 +50,13 @@ extern ConVar* ai_script_nodes_draw_index;
extern ConVar* navmesh_always_reachable; extern ConVar* navmesh_always_reachable;
extern ConVar* navmesh_debug_type; extern ConVar* navmesh_debug_type;
extern ConVar* navmesh_debug_tile_range;
#ifndef DEDICATED #ifndef DEDICATED
extern ConVar* navmesh_draw_bvtree; extern ConVar* navmesh_draw_bvtree;
extern ConVar* navmesh_draw_portal; extern ConVar* navmesh_draw_portal;
extern ConVar* navmesh_draw_polys; extern ConVar* navmesh_draw_polys;
extern ConVar* navmesh_draw_poly_bounds; extern ConVar* navmesh_draw_poly_bounds;
extern ConVar* navmesh_draw_poly_inner; extern ConVar* navmesh_draw_poly_bounds_inner;
#endif // DEDICATED #endif // DEDICATED
extern ConVar* sv_showconnecting; extern ConVar* sv_showconnecting;
extern ConVar* sv_pylonVisibility; extern ConVar* sv_pylonVisibility;