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: delay sub-edge area calculation

Browse Source 
Optimization by only calulcating it when its used to avoid calculating it for nothing when we end up moving to the next edge. This is only used when the link is established.
This commit is contained in:
Kawe Mazidjatari 2024-11-10 14:28:10 +01:00
parent 427860e6e9
commit 0806b10f79
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/thirdparty/recast/Detour/Source/DetourNavMesh.cpp vendored
View File

@ -858,16 +858,6 @@ dtStatus dtNavMesh::connectTraverseLinks(const dtTileRef tileRef, const dtTraver
rdDistancePtLine2D(baseTriVerts[l], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh) rdDistancePtLine2D(baseTriVerts[l], basePolySpos, basePolyEpos) >= detailEdgeAlignThresh)
continue; continue;
const float* baseDetailPolyEdgeSpos = baseTriVerts[m];
const float* baseDetailPolyEdgeEpos = baseTriVerts[l];
float baseTmin;
float baseTmax;
rdCalcSubEdgeArea2D(basePolySpos, basePolyEpos, baseDetailPolyEdgeSpos, baseDetailPolyEdgeEpos, baseTmin, baseTmax);
float basePolyEdgeMid[3];
rdVsad(basePolyEdgeMid, baseDetailPolyEdgeSpos, baseDetailPolyEdgeEpos, 0.5f);
const int MAX_NEIS = 32; // Max neighbors const int MAX_NEIS = 32; // Max neighbors
dtMeshTile* neis[MAX_NEIS]; dtMeshTile* neis[MAX_NEIS];
@ -899,12 +889,22 @@ dtStatus dtNavMesh::connectTraverseLinks(const dtTileRef tileRef, const dtTraver
neis[0] = baseTile; neis[0] = baseTile;
} }
const float* baseDetailPolyEdgeSpos = baseTriVerts[m];
const float* baseDetailPolyEdgeEpos = baseTriVerts[l];
float basePolyEdgeMid[3];
rdVsad(basePolyEdgeMid, baseDetailPolyEdgeSpos, baseDetailPolyEdgeEpos, 0.5f);
float baseEdgeDir[3]; float baseEdgeDir[3];
rdVsub(baseEdgeDir, baseDetailPolyEdgeEpos, baseDetailPolyEdgeSpos); rdVsub(baseEdgeDir, baseDetailPolyEdgeEpos, baseDetailPolyEdgeSpos);
float baseEdgeNorm[3]; float baseEdgeNorm[3];
rdCalcEdgeNormal2D(baseEdgeDir, baseEdgeNorm); rdCalcEdgeNormal2D(baseEdgeDir, baseEdgeNorm);
float baseTmin;
float baseTmax;
rdCalcSubEdgeArea2D(basePolySpos, basePolyEpos, baseDetailPolyEdgeSpos, baseDetailPolyEdgeEpos, baseTmin, baseTmax);
for (int n = nneis - 1; n >= 0; --n) for (int n = nneis - 1; n >= 0; --n)
{ {
dtMeshTile* landTile = neis[n]; dtMeshTile* landTile = neis[n];
@ -999,10 +999,6 @@ dtStatus dtNavMesh::connectTraverseLinks(const dtTileRef tileRef, const dtTraver
const float* landDetailPolyEdgeSpos = landTriVerts[s]; const float* landDetailPolyEdgeSpos = landTriVerts[s];
const float* landDetailPolyEdgeEpos = landTriVerts[r]; const float* landDetailPolyEdgeEpos = landTriVerts[r];
float landTmin;
float landTmax;
rdCalcSubEdgeArea2D(landPolySpos, landPolyEpos, landDetailPolyEdgeSpos, landDetailPolyEdgeEpos, landTmin, landTmax);
float landPolyEdgeMid[3]; float landPolyEdgeMid[3];
rdVsad(landPolyEdgeMid, landDetailPolyEdgeSpos, landDetailPolyEdgeEpos, 0.5f); rdVsad(landPolyEdgeMid, landDetailPolyEdgeSpos, landDetailPolyEdgeEpos, 0.5f);
@ -1054,14 +1050,18 @@ dtStatus dtNavMesh::connectTraverseLinks(const dtTileRef tileRef, const dtTraver
: rdClassifyPointInsideBounds(landPolyEdgeMid, landHeader->bmin, landHeader->bmax); : rdClassifyPointInsideBounds(landPolyEdgeMid, landHeader->bmin, landHeader->bmax);
const unsigned char baseSide = rdOppositeTile(landSide); const unsigned char baseSide = rdOppositeTile(landSide);
float newBaseTmin; float landTmin;
float newBaseTmax; float landTmax;
alignPortalLimits(basePolyEdgeMid, baseEdgeNorm, landPolyEdgeMid, baseTmin, baseTmax, newBaseTmin, newBaseTmax, params.maxPortalAlign); rdCalcSubEdgeArea2D(landPolySpos, landPolyEpos, landDetailPolyEdgeSpos, landDetailPolyEdgeEpos, landTmin, landTmax);
float newLandTmin; float newLandTmin;
float newLandTmax; float newLandTmax;
alignPortalLimits(landPolyEdgeMid, landEdgeNorm, basePolyEdgeMid, landTmin, landTmax, newLandTmin, newLandTmax, params.maxPortalAlign); alignPortalLimits(landPolyEdgeMid, landEdgeNorm, basePolyEdgeMid, landTmin, landTmax, newLandTmin, newLandTmax, params.maxPortalAlign);
float newBaseTmin;
float newBaseTmax;
alignPortalLimits(basePolyEdgeMid, baseEdgeNorm, landPolyEdgeMid, baseTmin, baseTmax, newBaseTmin, newBaseTmax, params.maxPortalAlign);
const unsigned int forwardIdx = baseTile->allocLink(); const unsigned int forwardIdx = baseTile->allocLink();
const unsigned int reverseIdx = landTile->allocLink(); const unsigned int reverseIdx = landTile->allocLink();