mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-13 00:43:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cleanup_navmesh_updater' into 'master'

Browse source 
Cleanup navmesh updater

See merge request OpenMW/openmw!3763
This commit is contained in:
Evil Eye 2024-01-11 17:50:12 +00:00
commit 2fc87efa8f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -180,8 +180,8 @@ namespace DetourNavigator
if (!playerTileChanged && changedTiles.empty()) if (!playerTileChanged && changedTiles.empty())
return; return;
const dtNavMeshParams params = *navMeshCacheItem->lockConst()->getImpl().getParams(); const int maxTiles
const int maxTiles = std::min(mSettings.get().mMaxTilesNumber, params.maxTiles); = std::min(mSettings.get().mMaxTilesNumber, navMeshCacheItem->lockConst()->getImpl().getParams()->maxTiles);
std::unique_lock lock(mMutex); std::unique_lock lock(mMutex);
@ -376,9 +376,10 @@ namespace DetourNavigator
return JobStatus::Done; return JobStatus::Done;
const auto playerTile = *mPlayerTile.lockConst(); const auto playerTile = *mPlayerTile.lockConst();
const auto params = *navMeshCacheItem->lockConst()->getImpl().getParams(); const int maxTiles
= std::min(mSettings.get().mMaxTilesNumber, navMeshCacheItem->lockConst()->getImpl().getParams()->maxTiles);
if (!shouldAddTile(job.mChangedTile, playerTile, std::min(mSettings.get().mMaxTilesNumber, params.maxTiles))) if (!shouldAddTile(job.mChangedTile, playerTile, maxTiles))
{ {
Log(Debug::Debug) << "Ignore add tile by job " << job.mId << ": too far from player"; Log(Debug::Debug) << "Ignore add tile by job " << job.mId << ": too far from player";
navMeshCacheItem->lock()->removeTile(job.mChangedTile); navMeshCacheItem->lock()->removeTile(job.mChangedTile);