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

Recast: remove unused tool parameters

Browse Source 
These parameters are unused, but since they are checked on and unset, they caused certain elements to not display. Removed them since the expansion logic is now fully handled by Dear ImGui.
This commit is contained in:
Kawe Mazidjatari 2024-07-09 11:45:21 +02:00
parent fdfd7ef416
commit 9bbab5b15e
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/naveditor/CrowdTool.cpp
View File

@ -88,21 +88,17 @@ CrowdToolState::CrowdToolState() :
m_graphSampleTime(0.0f),
m_run(true)
{
m_toolParams.m_expandSelectedDebugDraw = true;
m_toolParams.m_showCorners = false;
m_toolParams.m_showCollisionSegments = false;
m_toolParams.m_showPath = false;
m_toolParams.m_showVO = false;
m_toolParams.m_showOpt = false;
m_toolParams.m_showNeis = false;
m_toolParams.m_expandDebugDraw = false;
m_toolParams.m_showLabels = false;
m_toolParams.m_showGrid = false;
m_toolParams.m_showNodes = false;
m_toolParams.m_showPerfGraph = false;
m_toolParams.m_showDetailAll = false;
m_toolParams.m_expandOptions = true;
m_toolParams.m_expandTraversalOptions = false;
m_toolParams.m_anticipateTurns = true;
m_toolParams.m_optimizeVis = true;
m_toolParams.m_optimizeTopo = true;
@ -1002,31 +998,28 @@ void CrowdTool::handleMenu()
const int traverseTableCount = NavMesh_GetTraversalTableCountForNavMeshType(loadedNavMeshType);
const TraverseAnimType_e baseType = NavMesh_GetFirstTraverseAnimTypeForType(loadedNavMeshType);
if (params->m_expandTraversalOptions)
ImGui::Indent();
for (int i = ANIMTYPE_NONE; i < traverseTableCount; i++)
{
ImGui::Indent();
const bool noAnimtype = i == ANIMTYPE_NONE;
for (int i = ANIMTYPE_NONE; i < traverseTableCount; i++)
const TraverseAnimType_e animTypeIndex = noAnimtype ? ANIMTYPE_NONE : TraverseAnimType_e((int)baseType + i);
const char* animtypeName = noAnimtype ? "none" : g_traverseAnimTypeNames[animTypeIndex];
bool isAnimTypeEnabled = params->m_traverseAnimType == animTypeIndex;
if (ImGui::Checkbox(animtypeName, &isAnimTypeEnabled))
{
const bool noAnimtype = i == ANIMTYPE_NONE;
const TraverseAnimType_e animTypeIndex = noAnimtype ? ANIMTYPE_NONE : TraverseAnimType_e((int)baseType + i);
const char* animtypeName = noAnimtype ? "none" : g_traverseAnimTypeNames[animTypeIndex];
bool isAnimTypeEnabled = params->m_traverseAnimType == animTypeIndex;
if (ImGui::Checkbox(animtypeName, &isAnimTypeEnabled))
{
params->m_traverseAnimType = animTypeIndex;
m_state->updateAgentParams();
}
params->m_traverseAnimType = animTypeIndex;
m_state->updateAgentParams();
}
ImGui::Unindent();
}
ImGui::Unindent();
}
if (ImGui::CollapsingHeader("Selected Debug Draw", 0, params->m_expandSelectedDebugDraw))
if (ImGui::CollapsingHeader("Selected Debug Draw"))
{
ImGui::Indent();
ImGui::Checkbox("Show Corners", &params->m_showCorners);
@ -1038,7 +1031,7 @@ void CrowdTool::handleMenu()
ImGui::Unindent();
}
if (ImGui::CollapsingHeader("Debug Draw", 0, params->m_expandDebugDraw))
if (ImGui::CollapsingHeader("Debug Draw"))
{
ImGui::Indent();
ImGui::Checkbox("Show Labels", &params->m_showLabels);

4
src/naveditor/include/CrowdTool.h
View File

@ -31,7 +31,6 @@
struct CrowdToolParams
{
bool m_expandSelectedDebugDraw; // todo(amos): imgui upgrade; needed?
bool m_showCorners;
bool m_showCollisionSegments;
bool m_showPath;
@ -39,15 +38,12 @@ struct CrowdToolParams
bool m_showOpt;
bool m_showNeis;
bool m_expandDebugDraw; // todo(amos): imgui upgrade; needed?
bool m_showLabels;
bool m_showGrid;
bool m_showNodes;
bool m_showPerfGraph;
bool m_showDetailAll;
bool m_expandOptions; // todo(amos): imgui upgrade; needed?
bool m_expandTraversalOptions; // todo(amos): imgui upgrade; needed?
bool m_anticipateTurns;
bool m_optimizeVis;
bool m_optimizeTopo;