Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-29 05:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Remove redundant getPolyHeight wrapper

Browse source
This commit is contained in:
elsid 2021-06-30 20:04:16 +02:00
parent cc08a45c31
commit 7e1630a7ad
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/detournavigator/findsmoothpath.hpp
View file

@ -142,15 +142,6 @@ namespace DetourNavigator
return {std::move(result)}; return {std::move(result)};
} }
inline std::optional<float> getPolyHeight(const dtNavMeshQuery& navMeshQuery, const dtPolyRef ref, const osg::Vec3f& pos)
{
float result = 0.0f;
const auto status = navMeshQuery.getPolyHeight(ref, pos.ptr(), &result);
if (!dtStatusSucceed(status))
return {};
return result;
}
template <class OutputIterator> template <class OutputIterator>
Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery, Status makeSmoothPath(const dtNavMesh& navMesh, const dtNavMeshQuery& navMeshQuery,
const dtQueryFilter& filter, const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize, const dtQueryFilter& filter, const osg::Vec3f& start, const osg::Vec3f& end, const float stepSize,
@ -243,11 +234,10 @@ namespace DetourNavigator
} }
// Move position at the other side of the off-mesh link. // Move position at the other side of the off-mesh link.
iterPos = endPos; if (dtStatusFailed(navMeshQuery.getPolyHeight(polygonPath.front(), endPos.ptr(), &iterPos.y())))
const auto height = getPolyHeight(navMeshQuery, polygonPath.front(), iterPos);
if (!height)
return Status::GetPolyHeightFailed; return Status::GetPolyHeightFailed;
iterPos.y() = *height; iterPos.x() = endPos.x();
iterPos.z() = endPos.z();
} }
} }