mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-03 01:11:32 +00:00
Code Issues Releases Wiki Activity

Use z coordinate for path distance when diff by z is greater then actor height

Browse source
This commit is contained in:
elsid 2019-10-19 22:01:32 +02:00
parent 81832f8e17
commit e4d0af6a6d
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmechanics/pathfinding.cpp
View file

@ -81,13 +81,20 @@ namespace
const auto realHalfExtents = world->getHalfExtents(actor); const auto realHalfExtents = world->getHalfExtents(actor);
return 2 * std::max(realHalfExtents.x(), realHalfExtents.y()); return 2 * std::max(realHalfExtents.x(), realHalfExtents.y());
} }
float getHeight(const MWWorld::ConstPtr& actor)
{
const auto world = MWBase::Environment::get().getWorld();
const auto halfExtents = world->getHalfExtents(actor);
return 2.0 * halfExtents.z();
}
} }
namespace MWMechanics namespace MWMechanics
{ {
float getPathDistance(const MWWorld::Ptr& actor, const osg::Vec3f& lhs, const osg::Vec3f& rhs) float getPathDistance(const MWWorld::Ptr& actor, const osg::Vec3f& lhs, const osg::Vec3f& rhs)
{ {
if (canActorMoveByZAxis(actor)) if (std::abs(lhs.z() - rhs.z()) > getHeight(actor) || canActorMoveByZAxis(actor))
return distance(lhs, rhs); return distance(lhs, rhs);
return distanceIgnoreZ(lhs, rhs); return distanceIgnoreZ(lhs, rhs);
} }