From 601d958e14d48f8b2cfef0f7efb6c7e0b01d05b6 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 6 Jul 2024 02:20:17 +0200 Subject: [PATCH] Recast: invert render toggle flags --- src/naveditor/Editor.cpp | 2 +- src/naveditor/Editor_TileMesh.cpp | 12 ++++++------ .../recast/DebugUtils/Include/DetourDebugDraw.h | 6 +++--- .../recast/DebugUtils/Source/DetourDebugDraw.cpp | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/naveditor/Editor.cpp b/src/naveditor/Editor.cpp index 309975fd..230391db 100644 --- a/src/naveditor/Editor.cpp +++ b/src/naveditor/Editor.cpp @@ -55,7 +55,7 @@ Editor::Editor() : m_navMesh(0), m_navQuery(0), m_crowd(0), - m_navMeshDrawFlags(DU_DRAWNAVMESH_OFFMESHCONS|DU_DRAWNAVMESH_CLOSEDLIST), + m_navMeshDrawFlags(DU_DRAWNAVMESH_OFFMESHCONS|DU_DRAWNAVMESH_CLOSEDLIST|DU_DRAWNAVMESH_VERTS|DU_DRAWNAVMESH_INNERBOUND|DU_DRAWNAVMESH_OUTERBOUND), m_filterLowHangingObstacles(true), m_filterLedgeSpans(true), m_filterWalkableLowHeightSpans(true), diff --git a/src/naveditor/Editor_TileMesh.cpp b/src/naveditor/Editor_TileMesh.cpp index 214cd0db..ccf907a4 100644 --- a/src/naveditor/Editor_TileMesh.cpp +++ b/src/naveditor/Editor_TileMesh.cpp @@ -377,14 +377,14 @@ void Editor_TileMesh::handleDebugMode() imguiLabel("Render Options"); - if (imguiCheck("Draw Vertex Points", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_NO_VERTS) == 0)) - toggleNavMeshDrawFlag(DU_DRAWNAVMESH_NO_VERTS); + if (imguiCheck("Draw Vertex Points", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_VERTS))) + toggleNavMeshDrawFlag(DU_DRAWNAVMESH_VERTS); - if (imguiCheck("Draw Inner Poly Boundaries", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_NO_INNERBOUND) == 0)) - toggleNavMeshDrawFlag(DU_DRAWNAVMESH_NO_INNERBOUND); + if (imguiCheck("Draw Inner Poly Boundaries", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_INNERBOUND))) + toggleNavMeshDrawFlag(DU_DRAWNAVMESH_INNERBOUND); - if (imguiCheck("Draw Outer Poly Boundaries", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_NO_OUTERBOUND) == 0)) - toggleNavMeshDrawFlag(DU_DRAWNAVMESH_NO_OUTERBOUND); + if (imguiCheck("Draw Outer Poly Boundaries", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_OUTERBOUND))) + toggleNavMeshDrawFlag(DU_DRAWNAVMESH_OUTERBOUND); if (imguiCheck("Disable NavMesh Transparency", (getNavMeshDrawFlags() & DU_DRAWNAVMESH_NO_ALPHA))) toggleNavMeshDrawFlag(DU_DRAWNAVMESH_NO_ALPHA); diff --git a/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h b/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h index 8ac8382d..7feb44cf 100644 --- a/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h +++ b/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h @@ -28,9 +28,9 @@ enum DrawNavMeshFlags DU_DRAWNAVMESH_OFFMESHCONS = 1 << 0, DU_DRAWNAVMESH_CLOSEDLIST = 1 << 1, DU_DRAWNAVMESH_COLOR_TILES = 1 << 2, - DU_DRAWNAVMESH_NO_VERTS = 1 << 3, // Do not render vertex points - DU_DRAWNAVMESH_NO_INNERBOUND = 1 << 4, // Do not render inner poly boundaries - DU_DRAWNAVMESH_NO_OUTERBOUND = 1 << 5, // Do not render outer poly boundaries + DU_DRAWNAVMESH_VERTS = 1 << 3, // Render vertex points + DU_DRAWNAVMESH_INNERBOUND = 1 << 4, // Render inner poly boundaries + DU_DRAWNAVMESH_OUTERBOUND = 1 << 5, // Render outer poly boundaries DU_DRAWNAVMESH_NO_ALPHA = 1 << 6, // Render meshes as opaque. }; diff --git a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp index 3179bdff..4503b080 100644 --- a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp +++ b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp @@ -182,11 +182,11 @@ static void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMesh dd->end(); // Draw inner poly boundaries - if (!(flags & DU_DRAWNAVMESH_NO_INNERBOUND)) + if (flags & DU_DRAWNAVMESH_INNERBOUND) drawPolyBoundaries(dd, tile, 1.5f, true); // Draw outer poly boundaries - if (!(flags & DU_DRAWNAVMESH_NO_OUTERBOUND)) + if (flags & DU_DRAWNAVMESH_OUTERBOUND) drawPolyBoundaries(dd, tile, 2.5f, false); // Draw poly centers @@ -250,7 +250,7 @@ static void drawMeshTile(duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMesh dd->end(); } - if ((flags & DU_DRAWNAVMESH_NO_VERTS) == 0) + if (flags & DU_DRAWNAVMESH_VERTS) { const unsigned int vcol = duRGBA(0,0,0,196); dd->begin(DU_DRAW_POINTS, 3.0f);