Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Revert "improve astar cleanup performance. thanks @Andrettin""

Browse source 
This reverts commit 740701089f.
This commit is contained in:
Tim Felgentreff 2022-02-16 08:44:22 +01:00
parent 9dd63b37fa
commit 9df43cc3d0
1 changed files with 4 additions and 1 deletions

5
src/pathfinder/astar.cpp
View file

@ -263,6 +263,7 @@ void InitAStar(int mapWidth, int mapHeight)
memset(AStarMatrix, 0, AStarMatrixSize);
Threshold = AStarMapWidth * AStarMapHeight / MAX_CLOSE_SET_RATIO;
CloseSetSize = Threshold;
CloseSet = new int[Threshold];
OpenSetMaxSize = AStarMapWidth * AStarMapHeight / MAX_OPEN_SET_RATIO;
@ -307,16 +308,19 @@ static void AStarPrepare()
/**
** Clean up A*
*/
static void CostMoveToCacheCleanUp();
static void AStarCleanUp()
{
ProfileBegin("AStarCleanUp");
if (CloseSetSize >= Threshold) {
AStarPrepare();
CostMoveToCacheCleanUp();
} else {
for (int i = 0; i < CloseSetSize; ++i) {
AStarMatrix[CloseSet[i]].CostFromStart = 0;
AStarMatrix[CloseSet[i]].InGoal = 0;
CostMoveToCache[CloseSet[i]] = CacheNotSet;
}
}
ProfileEnd("AStarCleanUp");
@ -936,7 +940,6 @@ int AStarFindPath(const Vec2i &startPos, const Vec2i &goalPos, int gw, int gh,
// Initialize
AStarCleanUp();
CostMoveToCacheCleanUp();
OpenSetSize = 0;
CloseSetSize = 0;