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: fix misleading member variable name

Browse Source 
These are draw parameters.
This commit is contained in:
Kawe Mazidjatari 2024-08-26 00:54:10 +02:00
parent d81f6a24aa
commit 2ccd443a8d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/naveditor/Editor.cpp
View File

@ -259,7 +259,7 @@ void Editor::resetCommonSettings()
m_cellSize = 16.0f;
m_cellHeight = 5.85f;
m_traverseLinkParams.cellHeight = m_cellHeight;
m_traverseLinkDrawParams.cellHeight = m_cellHeight;
// todo(amos): check if this applies for all hulls, and check if this is the
// actual value used by the game. This seems to generate slopes very close
@ -305,7 +305,7 @@ void Editor::handleCommonSettings()
ImGui::SliderFloat("Cell Size", &m_cellSize, 12.1f, 100.0f);
if (ImGui::SliderFloat("Cell Height", &m_cellHeight, 0.4f, 100.0f))
m_traverseLinkParams.cellHeight = m_cellHeight;
m_traverseLinkDrawParams.cellHeight = m_cellHeight;
if (m_geom)
{
@ -559,10 +559,10 @@ void Editor::handleCommonSettings()
initTraverseMasks();
if (ImGui::Checkbox("Dynamic Traverse Ray Offset", &m_traverseRayDynamicOffset))
m_traverseLinkParams.dynamicOffset = m_traverseRayDynamicOffset;
m_traverseLinkDrawParams.dynamicOffset = m_traverseRayDynamicOffset;
if (ImGui::SliderFloat("Extra Offset", &m_traverseRayExtraOffset, 0, 128))
m_traverseLinkParams.extraOffset = m_traverseRayExtraOffset;
m_traverseLinkDrawParams.extraOffset = m_traverseRayExtraOffset;
ImGui::Separator();
}
@ -1321,9 +1321,9 @@ void Editor::renderDetourDebugMenu()
if (isEnabled && m_navMesh) // Supplemental options only available with a valid navmesh!
{
ImGui::PushItemWidth(190);
ImGui::SliderInt("Traverse Type", &m_traverseLinkParams.traverseLinkType, -1, DT_MAX_TRAVERSE_TYPES-1);
ImGui::SliderInt("Traverse Dist", &m_traverseLinkParams.traverseLinkDistance, -1, dtQuantLinkDistance(DT_TRAVERSE_DIST_MAX));
ImGui::SliderInt("Traverse Anim", &m_traverseLinkParams.traverseAnimType, -2, m_navMesh->getParams()->traverseTableCount-1);
ImGui::SliderInt("Traverse Type", &m_traverseLinkDrawParams.traverseLinkType, -1, DT_MAX_TRAVERSE_TYPES-1);
ImGui::SliderInt("Traverse Dist", &m_traverseLinkDrawParams.traverseLinkDistance, -1, dtQuantLinkDistance(DT_TRAVERSE_DIST_MAX));
ImGui::SliderInt("Traverse Anim", &m_traverseLinkDrawParams.traverseAnimType, -2, m_navMesh->getParams()->traverseTableCount-1);
ImGui::PopItemWidth();
}
}
@ -1556,7 +1556,7 @@ bool Editor::loadNavMesh(const char* path, const bool fullPath)
m_navQuery->init(m_navMesh, 2048);
m_loadedNavMeshType = m_selectedNavMeshType;
m_traverseLinkParams.traverseAnimType = -2;
m_traverseLinkDrawParams.traverseAnimType = -2;
if (m_tool)
{

4
src/naveditor/Editor_Common.cpp
View File

@ -308,7 +308,7 @@ void Editor_StaticTileMeshCommon::renderTileMeshData()
{
if (m_tileMeshDrawFlags & TM_DRAWFLAGS_NAVMESH)
{
duDebugDrawNavMeshWithClosedList(&m_dd, *m_navMesh, *m_navQuery, detourDrawOffset, m_navMeshDrawFlags, m_traverseLinkParams);
duDebugDrawNavMeshWithClosedList(&m_dd, *m_navMesh, *m_navQuery, detourDrawOffset, m_navMeshDrawFlags, m_traverseLinkDrawParams);
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, EDITOR_POLYFLAGS_DISABLED, detourDrawOffset, detourDrawFlags, duRGBA(0, 0, 0, 128));
}
}
@ -573,7 +573,7 @@ void Editor_DynamicTileMeshCommon::renderTileMeshData()
{
if (recastDrawFlags & TM_DRAWFLAGS_NAVMESH)
{
duDebugDrawNavMeshWithClosedList(&m_dd, *m_navMesh, *m_navQuery, detourDrawOffset, detourDrawFlags, m_traverseLinkParams);
duDebugDrawNavMeshWithClosedList(&m_dd, *m_navMesh, *m_navQuery, detourDrawOffset, detourDrawFlags, m_traverseLinkDrawParams);
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, EDITOR_POLYFLAGS_DISABLED, detourDrawOffset, detourDrawFlags, duRGBA(0, 0, 0, 128));
}
}

2
src/naveditor/Editor_Debug.cpp
View File

@ -188,7 +188,7 @@ void Editor_Debug::handleRender()
}
if (m_navMesh)
duDebugDrawNavMesh(&m_dd, *m_navMesh, m_detourDrawOffset, DU_DRAWNAVMESH_OFFMESHCONS, m_traverseLinkParams);
duDebugDrawNavMesh(&m_dd, *m_navMesh, m_detourDrawOffset, DU_DRAWNAVMESH_OFFMESHCONS, m_traverseLinkDrawParams);
if (m_ref && m_navMesh)
duDebugDrawNavMeshPoly(&m_dd, *m_navMesh, m_ref, m_detourDrawOffset, m_navMeshDrawFlags, duRGBA(255,0,0,128));

2
src/naveditor/Editor_TileMesh.cpp
View File

@ -605,7 +605,7 @@ bool Editor_TileMesh::handleBuild()
}
m_loadedNavMeshType = m_selectedNavMeshType;
m_traverseLinkParams.traverseAnimType = -2;
m_traverseLinkDrawParams.traverseAnimType = -2;
dtNavMeshParams params;
rdVcopy(params.orig, m_geom->getNavMeshBoundsMin());

2
src/naveditor/include/Editor.h
View File

@ -304,7 +304,7 @@ protected:
EditorDebugDraw m_dd;
unsigned int m_navMeshDrawFlags;
duDrawTraverseLinkParams m_traverseLinkParams;
duDrawTraverseLinkParams m_traverseLinkDrawParams;
float m_recastDrawOffset[3];
float m_detourDrawOffset[3];