mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Check "wait until min distance to player" only for requiredTilesPresent wait condition

Browse Source 
allJobsDone should wait even if "wait until min distance to player" is 0.
This commit is contained in:
elsid 2022-09-05 11:28:09 +02:00
parent 955db8f825
commit 180d609e0d
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw_test_suite/detournavigator/navigator.cpp
View File

@ -190,6 +190,9 @@ namespace
TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh) TEST_F(DetourNavigatorNavigatorTest, add_object_should_change_navmesh)
{ {
mSettings.mWaitUntilMinDistanceToPlayer = 0;
mNavigator.reset(new NavigatorImpl(mSettings, std::make_unique<NavMeshDb>(":memory:", std::numeric_limits<std::uint64_t>::max())));
const std::array<float, 5 * 5> heightfieldData {{ const std::array<float, 5 * 5> heightfieldData {{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, -25, -25, -25, -25, 0, -25, -25, -25, -25,

4
components/detournavigator/asyncnavmeshupdater.cpp
View File

@ -256,12 +256,14 @@ namespace DetourNavigator
void AsyncNavMeshUpdater::waitUntilJobsDoneForNotPresentTiles(Loading::Listener& listener) void AsyncNavMeshUpdater::waitUntilJobsDoneForNotPresentTiles(Loading::Listener& listener)
{ {
const int maxDistanceToPlayer = mSettings.get().mWaitUntilMinDistanceToPlayer;
if (maxDistanceToPlayer <= 0)
return;
const std::size_t initialJobsLeft = getTotalJobs(); const std::size_t initialJobsLeft = getTotalJobs();
std::size_t maxProgress = initialJobsLeft; std::size_t maxProgress = initialJobsLeft;
std::size_t prevJobsLeft = initialJobsLeft; std::size_t prevJobsLeft = initialJobsLeft;
std::size_t jobsDone = 0; std::size_t jobsDone = 0;
std::size_t jobsLeft = 0; std::size_t jobsLeft = 0;
const int maxDistanceToPlayer = mSettings.get().mWaitUntilMinDistanceToPlayer;
const TilePosition playerPosition = *mPlayerTile.lockConst(); const TilePosition playerPosition = *mPlayerTile.lockConst();
const auto isDone = [&] const auto isDone = [&]
{ {

3
components/detournavigator/navigatorimpl.cpp
View File

@ -154,8 +154,7 @@ namespace DetourNavigator
void NavigatorImpl::wait(Loading::Listener& listener, WaitConditionType waitConditionType) void NavigatorImpl::wait(Loading::Listener& listener, WaitConditionType waitConditionType)
{ {
if (mSettings.mWaitUntilMinDistanceToPlayer > 0) mNavMeshManager.wait(listener, waitConditionType);
mNavMeshManager.wait(listener, waitConditionType);
} }
SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const AgentBounds& agentBounds) const SharedNavMeshCacheItem NavigatorImpl::getNavMesh(const AgentBounds& agentBounds) const