From 05b6e23a75eed4114f5c47471ab1fe6fae3d345d Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:43:15 +0200 Subject: [PATCH] Recast: fix naming consistency of helper function Should be upper case to match the rest. --- src/game/shared/ai_utility_shared.cpp | 4 ++-- src/naveditor/Editor.cpp | 8 ++++---- .../recast/DebugUtils/Source/DetourDebugDraw.cpp | 4 ++-- src/thirdparty/recast/Shared/Include/SharedCommon.h | 2 +- src/thirdparty/recast/Shared/Source/SharedCommon.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/game/shared/ai_utility_shared.cpp b/src/game/shared/ai_utility_shared.cpp index 8c161528..3a7233e8 100644 --- a/src/game/shared/ai_utility_shared.cpp +++ b/src/game/shared/ai_utility_shared.cpp @@ -546,8 +546,8 @@ void CAI_Utility::DrawNavMeshPolyBoundaries(const dtNavMesh* pMesh, if ((dtGetDetailTriEdgeFlags(t[3], n) & DT_DETAIL_EDGE_BOUNDARY) == 0) continue; - if (rdDistancePtLine2d(tv[n], v0, v1) < thr && - rdDistancePtLine2d(tv[m], v0, v1) < thr) + if (rdDistancePtLine2D(tv[n], v0, v1) < thr && + rdDistancePtLine2D(tv[m], v0, v1) < thr) { v_RenderLine(Vector3D(tv[n][0], tv[n][1], tv[n][2]), Vector3D(tv[m][0], tv[m][1], tv[m][2]), col, bDepthBuffer); } diff --git a/src/naveditor/Editor.cpp b/src/naveditor/Editor.cpp index 3490fd53..9f31b92f 100644 --- a/src/naveditor/Editor.cpp +++ b/src/naveditor/Editor.cpp @@ -928,8 +928,8 @@ void Editor::connectTileTraverseLinks(dtMeshTile* const baseTile, const bool lin if ((dtGetDetailTriEdgeFlags(baseTri[3], m) & DT_DETAIL_EDGE_BOUNDARY) == 0) continue; - if (rdDistancePtLine2d(baseTriVerts[m], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh || - rdDistancePtLine2d(baseTriVerts[l], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh) + if (rdDistancePtLine2D(baseTriVerts[m], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh || + rdDistancePtLine2D(baseTriVerts[l], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh) continue; const float* baseDetailPolyEdgeSpos = baseTriVerts[m]; @@ -1043,8 +1043,8 @@ void Editor::connectTileTraverseLinks(dtMeshTile* const baseTile, const bool lin if ((dtGetDetailTriEdgeFlags(landTri[3], s) & DT_DETAIL_EDGE_BOUNDARY) == 0) continue; - if (rdDistancePtLine2d(landTriVerts[s], landPolySpos, landPolyEpos) >= detailEdgeAlignThresh || - rdDistancePtLine2d(landTriVerts[r], landPolySpos, landPolyEpos) >= detailEdgeAlignThresh) + if (rdDistancePtLine2D(landTriVerts[s], landPolySpos, landPolyEpos) >= detailEdgeAlignThresh || + rdDistancePtLine2D(landTriVerts[r], landPolySpos, landPolyEpos) >= detailEdgeAlignThresh) continue; const float* landDetailPolyEdgeSpos = landTriVerts[s]; diff --git a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp index ea61b8a2..e4d22a36 100644 --- a/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp +++ b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp @@ -210,8 +210,8 @@ static void drawPolyBoundaries(duDebugDraw* dd, const dtMeshTile* tile, if ((dtGetDetailTriEdgeFlags(t[3], n) & DT_DETAIL_EDGE_BOUNDARY) == 0) continue; - if (rdDistancePtLine2d(tv[n],v0,v1) < thr && - rdDistancePtLine2d(tv[m],v0,v1) < thr) + if (rdDistancePtLine2D(tv[n],v0,v1) < thr && + rdDistancePtLine2D(tv[m],v0,v1) < thr) { dd->vertex(tv[n], c); dd->vertex(tv[m], c); diff --git a/src/thirdparty/recast/Shared/Include/SharedCommon.h b/src/thirdparty/recast/Shared/Include/SharedCommon.h index b7328171..014c6926 100644 --- a/src/thirdparty/recast/Shared/Include/SharedCommon.h +++ b/src/thirdparty/recast/Shared/Include/SharedCommon.h @@ -473,7 +473,7 @@ bool rdIntersectSegSeg2D(const float* ap, const float* aq, const float* bp, const float* bq, float& s, float& t); -float rdDistancePtLine2d(const float* pt, const float* p, const float* q); +float rdDistancePtLine2D(const float* pt, const float* p, const float* q); /// Derives the normal of an edge /// @param[in] dir The direction of the edge. [(x, y, z)] diff --git a/src/thirdparty/recast/Shared/Source/SharedCommon.cpp b/src/thirdparty/recast/Shared/Source/SharedCommon.cpp index a8821816..aed6727f 100644 --- a/src/thirdparty/recast/Shared/Source/SharedCommon.cpp +++ b/src/thirdparty/recast/Shared/Source/SharedCommon.cpp @@ -395,7 +395,7 @@ bool rdIntersectSegSeg2D(const float* ap, const float* aq, return true; } -float rdDistancePtLine2d(const float* pt, const float* p, const float* q) +float rdDistancePtLine2D(const float* pt, const float* p, const float* q) { float pqx = q[0] - p[0]; float pqy = q[1] - p[1];