mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 07:45:36 +00:00
Code Issues Releases Wiki Activity

Increment NavMesh revision on remove or add tile

Browse source
This commit is contained in:
elsid 2018-04-16 22:57:35 +03:00
parent faaf50446d
commit dd5f4498f6
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
5 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -91,10 +91,7 @@ namespace DetourNavigator
const auto recastMesh = getRecastMesh();
updateNavMesh(job.mAgentHalfExtents, *recastMesh, job.mChangedTile, mSettings,
job.mNavMeshCacheItem->mValue);
++job.mNavMeshCacheItem->mNavMeshRevision;
updateNavMesh(job.mAgentHalfExtents, *recastMesh, job.mChangedTile, mSettings, *job.mNavMeshCacheItem);
const auto finish = std::chrono::steady_clock::now();

12
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -1,8 +1,8 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_ASYNCNAVMESHUPDATER_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_ASYNCNAVMESHUPDATER_H
#include "navmeshcacheitem.hpp"
#include "recastmesh.hpp"
#include "sharednavmesh.hpp"
#include "tileposition.hpp"
#include <osg/Vec3f>
@ -22,16 +22,6 @@ class dtNavMesh;
namespace DetourNavigator
{
struct NavMeshCacheItem
{
SharedNavMesh mValue;
std::size_t mRecastMeshRevision;
std::atomic_size_t mNavMeshRevision;
NavMeshCacheItem(const NavMeshPtr& value, std::size_t revision)
: mValue(value), mRecastMeshRevision(revision), mNavMeshRevision(0) {}
};
class AsyncNavMeshUpdater
{
public:

36
components/detournavigator/makenavmesh.cpp
View file

@ -214,6 +214,23 @@ namespace
return NavMeshData(navMeshData, navMeshDataSize);
}
struct AutoIncrementRevision
{
std::atomic_size_t& mNavMeshRevision;
bool mNavMeshChanged;
AutoIncrementRevision(std::atomic_size_t& navMeshRevision)
: mNavMeshRevision(navMeshRevision)
, mNavMeshChanged(false)
{}
~AutoIncrementRevision()
{
if (mNavMeshChanged)
++mNavMeshRevision;
}
};
}
namespace DetourNavigator
@ -241,7 +258,7 @@ namespace DetourNavigator
}
void updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
const TilePosition& changedTile, const Settings& settings, SharedNavMesh& navMesh)
const TilePosition& changedTile, const Settings& settings, NavMeshCacheItem& navMeshCacheItem)
{
log("update NavMesh with mutiple tiles:",
" agentHeight=", std::setprecision(std::numeric_limits<float>::max_exponent10),
@ -255,15 +272,19 @@ namespace DetourNavigator
const auto& boundsMin = recastMesh.getBoundsMin();
const auto& boundsMax = recastMesh.getBoundsMax();
auto& navMesh = navMeshCacheItem.mValue;
const auto& params = *navMesh.lock()->getParams();
const osg::Vec3f origin(params.orig[0], params.orig[1], params.orig[2]);
const auto x = changedTile.x();
const auto y = changedTile.y();
AutoIncrementRevision incRev(navMeshCacheItem.mNavMeshRevision);
{
const auto locked = navMesh.lock();
locked->removeTile(locked->getTileRefAt(x, y, 0), nullptr, nullptr);
incRev.mNavMeshChanged = dtStatusSucceed(locked->removeTile(locked->getTileRefAt(x, y, 0),
nullptr, nullptr));
}
const auto tileBounds = makeTileBounds(settings, changedTile);
@ -274,10 +295,17 @@ namespace DetourNavigator
tileBorderMin, tileBorderMax, settings);
if (!navMeshData.mValue)
{
log("ignore add tile: NavMeshData is null");
return;
}
OPENMW_CHECK_DT_STATUS(navMesh.lock()->addTile(navMeshData.mValue.get(), navMeshData.mSize,
DT_TILE_FREE_DATA, 0, 0));
const auto status = navMesh.lock()->addTile(navMeshData.mValue.get(), navMeshData.mSize,
DT_TILE_FREE_DATA, 0, 0);
if (dtStatusSucceed(status))
incRev.mNavMeshChanged = true;
else
log("failed to add tile with status=", WriteDtStatus {status});
navMeshData.mValue.release();
}
}

3
components/detournavigator/makenavmesh.hpp
View file

@ -2,6 +2,7 @@
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_MAKENAVMESH_H
#include "settings.hpp"
#include "navmeshcacheitem.hpp"
#include "tileposition.hpp"
#include <osg/Vec3f>
@ -22,7 +23,7 @@ namespace DetourNavigator
NavMeshPtr makeEmptyNavMesh(const Settings& settings);
void updateNavMesh(const osg::Vec3f& agentHalfExtents, const RecastMesh& recastMesh,
const TilePosition& changedTile, const Settings& settings, SharedNavMesh& navMesh);
const TilePosition& changedTile, const Settings& settings, NavMeshCacheItem& navMeshCacheItem);
}
#endif

21
components/detournavigator/navmeshcacheitem.hpp Normal file
View file

@ -0,0 +1,21 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHCACHEITEM_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_NAVMESHCACHEITEM_H
#include "sharednavmesh.hpp"
#include <atomic>
namespace DetourNavigator
{
struct NavMeshCacheItem
{
SharedNavMesh mValue;
std::size_t mRecastMeshRevision;
std::atomic_size_t mNavMeshRevision;
NavMeshCacheItem(const NavMeshPtr& value, std::size_t revision)
: mValue(value), mRecastMeshRevision(revision), mNavMeshRevision(0) {}
};
}
#endif