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

Make Navigator::findPath independent from class fields

Browse source
This commit is contained in:
elsid 2019-02-16 15:14:05 +03:00
parent a0ed981a7c
commit d63881e054
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/detournavigator/navigator.cpp
View file

@ -122,12 +122,17 @@ namespace DetourNavigator
mNavMeshManager.wait();
}
SharedNavMeshCacheItem Navigator::getNavMesh(const osg::Vec3f& agentHalfExtents) const
{
return mNavMeshManager.getNavMesh(agentHalfExtents);
}
std::map<osg::Vec3f, SharedNavMeshCacheItem> Navigator::getNavMeshes() const
{
return mNavMeshManager.getNavMeshes();
}
const Settings& Navigator::getSettings() const
Settings Navigator::getSettings() const
{
return mSettings;
}

17
components/detournavigator/navigator.hpp
View file

@ -175,19 +175,26 @@ namespace DetourNavigator
>::value,
"out is not an OutputIterator"
);
const auto navMesh = mNavMeshManager.getNavMesh(agentHalfExtents);
return findSmoothPath(navMesh.lock()->getValue(), toNavMeshCoordinates(mSettings, agentHalfExtents),
toNavMeshCoordinates(mSettings, start), toNavMeshCoordinates(mSettings, end), includeFlags,
mSettings, out);
const auto navMesh = getNavMesh(agentHalfExtents);
const auto settings = getSettings();
return findSmoothPath(navMesh.lock()->getValue(), toNavMeshCoordinates(settings, agentHalfExtents),
toNavMeshCoordinates(settings, start), toNavMeshCoordinates(settings, end), includeFlags,
settings, out);
}
/**
* @brief getNavMesh returns navmesh for specific agent half extents
* @return navmesh
*/
SharedNavMeshCacheItem getNavMesh(const osg::Vec3f& agentHalfExtents) const;
/**
* @brief getNavMeshes returns all current navmeshes
* @return map of agent half extents to navmesh
*/
std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const;
const Settings& getSettings() const;
Settings getSettings() const;
private:
Settings mSettings;