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: add option to disable rendering of shape volumes

Browse Source
This commit is contained in:
Kawe Mazidjatari 2024-10-25 00:40:40 +02:00
parent 349f7bd3b9
commit 563427ae63
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/naveditor/Editor_Common.cpp
View File

@ -260,6 +260,11 @@ void Editor_StaticTileMeshCommon::renderRecastDebugMenu()
ImGui::EndDisabled(); ImGui::EndDisabled();
isEnabled = getTileMeshDrawFlags() & DU_DRAW_RECASTMESH_SHAPE_VOLUMES;
if (ImGui::Checkbox("Shape Volumes", &isEnabled))
toggleTileMeshDrawFlag(DU_DRAW_RECASTMESH_SHAPE_VOLUMES);
//if (intermediateDataUnavailable) // todo(amos): tool tip //if (intermediateDataUnavailable) // todo(amos): tool tip
//{ //{
// ImGui::Separator(); // ImGui::Separator();
@ -382,16 +387,20 @@ void Editor_StaticTileMeshCommon::renderTileMeshData()
} }
int selectedVolumeIndex = -1; int selectedVolumeIndex = -1;
if (m_tool->type() == TOOL_SHAPE_VOLUME) const bool isShapeVolumeTool = (m_tool->type() == TOOL_SHAPE_VOLUME);
if (isShapeVolumeTool)
{ {
const ShapeVolumeTool* volTool = (const ShapeVolumeTool*)m_tool; const ShapeVolumeTool* volTool = (const ShapeVolumeTool*)m_tool;
selectedVolumeIndex = volTool->getSelectedVolumeIndex(); selectedVolumeIndex = volTool->getSelectedVolumeIndex();
} }
// TODO: also add flags for this if ((recastDrawFlags & DU_DRAW_RECASTMESH_SHAPE_VOLUMES) || isShapeVolumeTool)
{
m_geom->drawBoxVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex); m_geom->drawBoxVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
m_geom->drawCylinderVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex); m_geom->drawCylinderVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
m_geom->drawConvexVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex); m_geom->drawConvexVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
}
// NOTE: commented out because this already gets rendered when the off-mesh // NOTE: commented out because this already gets rendered when the off-mesh
// connection tool is activated. And if we generated an off-mesh link, this // connection tool is activated. And if we generated an off-mesh link, this
@ -586,10 +595,21 @@ void Editor_DynamicTileMeshCommon::renderTileMeshData()
} }
} }
// TODO: also add flags for this int selectedVolumeIndex = -1;
m_geom->drawBoxVolumes(&m_dd, recastDrawOffset); const bool isShapeVolumeTool = (m_tool->type() == TOOL_SHAPE_VOLUME);
m_geom->drawCylinderVolumes(&m_dd, recastDrawOffset);
m_geom->drawConvexVolumes(&m_dd, recastDrawOffset); if (isShapeVolumeTool)
{
const ShapeVolumeTool* volTool = (const ShapeVolumeTool*)m_tool;
selectedVolumeIndex = volTool->getSelectedVolumeIndex();
}
if ((recastDrawFlags & DU_DRAW_RECASTMESH_SHAPE_VOLUMES) || isShapeVolumeTool)
{
m_geom->drawBoxVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
m_geom->drawCylinderVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
m_geom->drawConvexVolumes(&m_dd, recastDrawOffset, selectedVolumeIndex);
}
// NOTE: commented out because this already gets rendered when the off-mesh // NOTE: commented out because this already gets rendered when the off-mesh
// connection tool is activated. And if we generated an off-mesh link, this // connection tool is activated. And if we generated an off-mesh link, this

1
src/thirdparty/recast/DebugUtils/Include/RecastDebugDraw.h vendored
View File

@ -33,6 +33,7 @@ enum DrawRecastMeshFlags
DU_DRAW_RECASTMESH_CONTOURS = 1<<9, DU_DRAW_RECASTMESH_CONTOURS = 1<<9,
DU_DRAW_RECASTMESH_POLYMESH = 1<<10, DU_DRAW_RECASTMESH_POLYMESH = 1<<10,
DU_DRAW_RECASTMESH_POLYMESH_DETAIL = 1<<11, DU_DRAW_RECASTMESH_POLYMESH_DETAIL = 1<<11,
DU_DRAW_RECASTMESH_SHAPE_VOLUMES = 1<<12,
}; };
void duDebugDrawTriMesh(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris, void duDebugDrawTriMesh(struct duDebugDraw* dd, const float* verts, int nverts, const int* tris, const float* normals, int ntris,