From 41f830d6bb4d6693000be2588082a4ee22fb6347 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:04:17 +0200 Subject: [PATCH] Recast: rename render option Renamed to "Ledge Spans" as this is actually what it is. --- src/naveditor/Editor.cpp | 16 ++++++++-------- .../recast/DebugUtils/Include/DetourDebugDraw.h | 6 +++--- .../recast/DebugUtils/Source/DetourDebugDraw.cpp | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/naveditor/Editor.cpp b/src/naveditor/Editor.cpp index c8cb7609..091ecafe 100644 --- a/src/naveditor/Editor.cpp +++ b/src/naveditor/Editor.cpp @@ -299,9 +299,9 @@ void Editor::handleCommonSettings() ImGui::Separator(); ImGui::Text("Filtering"); - ImGui::Checkbox("Low Hanging Obstacles", &m_filterLowHangingObstacles); - ImGui::Checkbox("Ledge Spans", &m_filterLedgeSpans); - ImGui::Checkbox("Walkable Low Height Spans", &m_filterWalkableLowHeightSpans); + ImGui::Checkbox("Low Hanging Obstacles##FilterSettings", &m_filterLowHangingObstacles); + ImGui::Checkbox("Ledge Spans##FilterSettings", &m_filterLedgeSpans); + ImGui::Checkbox("Walkable Low Height Spans##FilterSettings", &m_filterWalkableLowHeightSpans); ImGui::PushItemWidth(145.f); ImGui::Separator(); @@ -983,6 +983,11 @@ void Editor::renderDetourDebugMenu() if (ImGui::Checkbox("Poly Group Colors", &isEnabled)) toggleNavMeshDrawFlag(DU_DRAWNAVMESH_POLY_GROUPS); + isEnabled = (getNavMeshDrawFlags() & DU_DRAWNAVMESH_LEDGE_SPANS); + + if (ImGui::Checkbox("Ledge Spans", &isEnabled)) + toggleNavMeshDrawFlag(DU_DRAWNAVMESH_LEDGE_SPANS); + isEnabled = (getNavMeshDrawFlags() & DU_DRAWNAVMESH_DEPTH_MASK); if (ImGui::Checkbox("Depth Mask", &isEnabled)) @@ -993,11 +998,6 @@ void Editor::renderDetourDebugMenu() if (ImGui::Checkbox("Transparency", &isEnabled)) toggleNavMeshDrawFlag(DU_DRAWNAVMESH_ALPHA); - isEnabled = (getNavMeshDrawFlags() & DU_DRAWNAVMESH_TRAVERSE_RAY_OFFSET); - - if (ImGui::Checkbox("Traverse Ray Offsets", &isEnabled)) - toggleNavMeshDrawFlag(DU_DRAWNAVMESH_TRAVERSE_RAY_OFFSET); - isEnabled = (getNavMeshDrawFlags() & DU_DRAWNAVMESH_TRAVERSE_LINKS); if (ImGui::Checkbox("Traverse Links", &isEnabled)) diff --git a/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h b/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h index a2b865fc..184cc4ed 100644 --- a/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h +++ b/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h @@ -38,9 +38,9 @@ enum DrawNavMeshFlags DU_DRAWNAVMESH_POLY_BOUNDS_OUTER = 1 << 10, // Render outer poly boundaries. DU_DRAWNAVMESH_POLY_CENTERS = 1 << 11, // Render poly centers. DU_DRAWNAVMESH_POLY_GROUPS = 1 << 12, // Render poly group by color. - DU_DRAWNAVMESH_DEPTH_MASK = 1 << 13, // Use depth mask. - DU_DRAWNAVMESH_ALPHA = 1 << 14, // Use transparency. - DU_DRAWNAVMESH_TRAVERSE_RAY_OFFSET= 1 << 15, // Render traverse link raycast offset. + DU_DRAWNAVMESH_LEDGE_SPANS = 1 << 13, // Render ledge spans. + DU_DRAWNAVMESH_DEPTH_MASK = 1 << 14, // Use depth mask. + DU_DRAWNAVMESH_ALPHA = 1 << 15, // Use transparency. DU_DRAWNAVMESH_TRAVERSE_LINKS = 1 << 16, // Render traverse links. }; diff --git a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp index a940a96d..90fcce58 100644 --- a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp +++ b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp @@ -96,7 +96,7 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile, const float* v0 = &tile->verts[p->verts[j]*3]; const float* v1 = &tile->verts[p->verts[(j+1) % nj]*3]; - if (!inner && flags & DU_DRAWNAVMESH_TRAVERSE_RAY_OFFSET) + if (!inner && flags & DU_DRAWNAVMESH_LEDGE_SPANS) { float perp[3]; rdPerpDirPtEdge2D(v0, v1, false, perp);