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

Shuffle tile positions before adding to queue for processing

Browse Source
This commit is contained in:
elsid 2021-12-18 00:05:50 +01:00
parent 12ce82980c
commit d1d29a2452
No known key found for this signature in database
GPG Key ID: B845CB9FEE18AB40
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/navmeshtool/navmesh.cpp
View File

@ -35,6 +35,7 @@
#include <string_view>
#include <utility>
#include <vector>
#include <random>
namespace NavMeshTool
{
@ -180,26 +181,31 @@ namespace NavMeshTool
SceneUtil::WorkQueue workQueue(threadsNumber);
auto navMeshTileConsumer = std::make_shared<NavMeshTileConsumer>(std::move(db));
std::size_t tiles = 0;
std::mt19937_64 random;
for (const std::unique_ptr<WorldspaceNavMeshInput>& input : data.mNavMeshInputs)
{
std::vector<TilePosition> worldspaceTiles;
DetourNavigator::getTilesPositions(
Misc::Convert::toOsg(input->mAabb.m_min), Misc::Convert::toOsg(input->mAabb.m_max), settings.mRecast,
[&] (const TilePosition& tilePosition)
{
workQueue.addWorkItem(new GenerateNavMeshTile(
input->mWorldspace,
tilePosition,
RecastMeshProvider(input->mTileCachedRecastMeshManager),
agentHalfExtents,
settings,
navMeshTileConsumer
));
[&] (const TilePosition& tilePosition) { worldspaceTiles.push_back(tilePosition); });
++tiles;
});
tiles += worldspaceTiles.size();
navMeshTileConsumer->mExpected = tiles;
std::shuffle(worldspaceTiles.begin(), worldspaceTiles.end(), random);
for (const TilePosition& tilePosition : worldspaceTiles)
workQueue.addWorkItem(new GenerateNavMeshTile(
input->mWorldspace,
tilePosition,
RecastMeshProvider(input->mTileCachedRecastMeshManager),
agentHalfExtents,
settings,
navMeshTileConsumer
));
}
navMeshTileConsumer->wait();