mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 17:39:40 +00:00
Code Issues Releases Wiki Activity

Use one recast mesh for all jobs

Browse source
This commit is contained in:
elsid 2018-04-04 03:20:48 +03:00
parent 794cfc4aa3
commit 1caa18bb4f
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -45,12 +45,16 @@ namespace DetourNavigator
const std::shared_ptr<NavMeshCacheItem>& navMeshCacheItem, const TilePosition& playerTile, const std::shared_ptr<NavMeshCacheItem>& navMeshCacheItem, const TilePosition& playerTile,
const std::set<TilePosition>& changedTiles) const std::set<TilePosition>& changedTiles)
{ {
setRecastMesh(recastMesh);
if (changedTiles.empty())
return;
const std::lock_guard<std::mutex> lock(mMutex); const std::lock_guard<std::mutex> lock(mMutex);
for (const auto& changedTile : changedTiles) for (const auto& changedTile : changedTiles)
{ mJobs.push(Job {agentHalfExtents, navMeshCacheItem, changedTile, makePriority(changedTile, playerTile)});
mJobs.push(Job {agentHalfExtents, recastMesh, navMeshCacheItem, changedTile,
makePriority(changedTile, playerTile)});
}
mHasJob.notify_all(); mHasJob.notify_all();
} }
@ -85,12 +89,14 @@ namespace DetourNavigator
const auto start = std::chrono::steady_clock::now(); const auto start = std::chrono::steady_clock::now();
updateNavMesh(job.mAgentHalfExtents, *job.mRecastMesh, job.mChangedTile, mSettings, const auto recastMesh = getRecastMesh();
updateNavMesh(job.mAgentHalfExtents, *recastMesh, job.mChangedTile, mSettings,
job.mNavMeshCacheItem->mValue); job.mNavMeshCacheItem->mValue);
const auto finish = std::chrono::steady_clock::now(); const auto finish = std::chrono::steady_clock::now();
writeDebugFiles(job); writeDebugFiles(job, *recastMesh);
using FloatMs = std::chrono::duration<float, std::milli>; using FloatMs = std::chrono::duration<float, std::milli>;
@ -114,7 +120,7 @@ namespace DetourNavigator
return job; return job;
} }
void AsyncNavMeshUpdater::writeDebugFiles(const Job& job) const void AsyncNavMeshUpdater::writeDebugFiles(const Job& job, const RecastMesh& recastMesh) const
{ {
std::string revision; std::string revision;
std::string recastMeshRevision; std::string recastMeshRevision;
@ -130,8 +136,20 @@ namespace DetourNavigator
navMeshRevision = revision; navMeshRevision = revision;
} }
if (mSettings.get().mEnableWriteRecastMeshToFile) if (mSettings.get().mEnableWriteRecastMeshToFile)
writeToFile(*job.mRecastMesh, mSettings.get().mRecastMeshPathPrefix, recastMeshRevision); writeToFile(recastMesh, mSettings.get().mRecastMeshPathPrefix, recastMeshRevision);
if (mSettings.get().mEnableWriteNavMeshToFile) if (mSettings.get().mEnableWriteNavMeshToFile)
writeToFile(*job.mNavMeshCacheItem->mValue.lock(), mSettings.get().mNavMeshPathPrefix, navMeshRevision); writeToFile(*job.mNavMeshCacheItem->mValue.lock(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
} }
std::shared_ptr<RecastMesh> AsyncNavMeshUpdater::getRecastMesh()
{
const std::lock_guard<std::mutex> lock(mRecastMeshMutex);
return mRecastMesh;
}
void AsyncNavMeshUpdater::setRecastMesh(const std::shared_ptr<RecastMesh>& value)
{
const std::lock_guard<std::mutex> lock(mRecastMeshMutex);
mRecastMesh = value;
}
} }

9
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -44,7 +44,6 @@ namespace DetourNavigator
struct Job struct Job
{ {
osg::Vec3f mAgentHalfExtents; osg::Vec3f mAgentHalfExtents;
std::shared_ptr<RecastMesh> mRecastMesh;
std::shared_ptr<NavMeshCacheItem> mNavMeshCacheItem; std::shared_ptr<NavMeshCacheItem> mNavMeshCacheItem;
TilePosition mChangedTile; TilePosition mChangedTile;
std::pair<int, int> mPriority; std::pair<int, int> mPriority;
@ -63,6 +62,8 @@ namespace DetourNavigator
std::condition_variable mHasJob; std::condition_variable mHasJob;
std::condition_variable mDone; std::condition_variable mDone;
Jobs mJobs; Jobs mJobs;
std::mutex mRecastMeshMutex;
std::shared_ptr<RecastMesh> mRecastMesh;
std::thread mThread; std::thread mThread;
void process() throw(); void process() throw();
@ -73,7 +74,11 @@ namespace DetourNavigator
void notifyHasJob(); void notifyHasJob();
void writeDebugFiles(const Job& job) const; void writeDebugFiles(const Job& job, const RecastMesh& recastMesh) const;
std::shared_ptr<RecastMesh> getRecastMesh();
void setRecastMesh(const std::shared_ptr<RecastMesh>& value);
}; };
} }