mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-28 13:39:40 +00:00
Merge pull request #2494 from elsid/ai_open_door
[WIP] Open door when it is on the way to a next path point (fix bug #5073)
This commit is contained in:
commit
ea04fcbd09
5 changed files with 49 additions and 2 deletions
|
@ -614,6 +614,8 @@ namespace MWBase
|
|||
|
||||
/// Return physical half extents of the given actor to be used in pathfinding
|
||||
virtual osg::Vec3f getPathfindingHalfExtents(const MWWorld::ConstPtr& actor) const = 0;
|
||||
|
||||
virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
#include "../mwworld/cellstore.hpp"
|
||||
#include "../mwworld/inventorystore.hpp"
|
||||
|
||||
#include "../mwphysics/collisiontype.hpp"
|
||||
|
||||
#include "pathgrid.hpp"
|
||||
#include "creaturestats.hpp"
|
||||
#include "movement.hpp"
|
||||
|
@ -224,6 +226,13 @@ void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor)
|
|||
|
||||
void MWMechanics::AiPackage::openDoors(const MWWorld::Ptr& actor)
|
||||
{
|
||||
// note: AiWander currently does not open doors
|
||||
if (getTypeId() == TypeIdWander)
|
||||
return;
|
||||
|
||||
if (mPathFinder.getPathSize() == 0)
|
||||
return;
|
||||
|
||||
MWBase::World* world = MWBase::Environment::get().getWorld();
|
||||
static float distance = world->getMaxActivationDistance();
|
||||
|
||||
|
@ -231,9 +240,11 @@ void MWMechanics::AiPackage::openDoors(const MWWorld::Ptr& actor)
|
|||
if (door == MWWorld::Ptr())
|
||||
return;
|
||||
|
||||
// note: AiWander currently does not open doors
|
||||
if (getTypeId() != TypeIdWander && !door.getCellRef().getTeleport() && door.getClass().getDoorState(door) == MWWorld::DoorState::Idle)
|
||||
if (!door.getCellRef().getTeleport() && door.getClass().getDoorState(door) == MWWorld::DoorState::Idle)
|
||||
{
|
||||
if (!isDoorOnTheWay(actor, door))
|
||||
return;
|
||||
|
||||
if ((door.getCellRef().getTrap().empty() && door.getCellRef().getLockLevel() <= 0 ))
|
||||
{
|
||||
world->activate(door, actor);
|
||||
|
@ -402,3 +413,13 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool MWMechanics::AiPackage::isDoorOnTheWay(const MWWorld::Ptr& actor, const MWWorld::Ptr& door) const
|
||||
{
|
||||
const auto world = MWBase::Environment::get().getWorld();
|
||||
const auto halfExtents = world->getHalfExtents(actor);
|
||||
const auto position = actor.getRefData().getPosition().asVec3() + osg::Vec3f(0, 0, halfExtents.z());
|
||||
const auto destination = mPathFinder.getPath().front() + osg::Vec3f(0, 0, halfExtents.z());
|
||||
|
||||
return world->hasCollisionWithDoor(door, position, destination);
|
||||
}
|
||||
|
|
|
@ -147,6 +147,8 @@ namespace MWMechanics
|
|||
|
||||
private:
|
||||
bool isNearInactiveCell(osg::Vec3f position);
|
||||
|
||||
bool isDoorOnTheWay(const MWWorld::Ptr& actor, const MWWorld::Ptr& door) const;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include <components/misc/constants.hpp>
|
||||
#include <components/misc/resourcehelpers.hpp>
|
||||
#include <components/misc/rng.hpp>
|
||||
#include <components/misc/convert.hpp>
|
||||
|
||||
#include <components/files/collections.hpp>
|
||||
|
||||
|
@ -3829,4 +3830,23 @@ namespace MWWorld
|
|||
return getHalfExtents(actor);
|
||||
}
|
||||
|
||||
bool World::hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const
|
||||
{
|
||||
const auto object = mPhysics->getObject(door);
|
||||
|
||||
if (!object)
|
||||
return false;
|
||||
|
||||
btVector3 aabbMin;
|
||||
btVector3 aabbMax;
|
||||
object->getShapeInstance()->getCollisionShape()->getAabb(btTransform::getIdentity(), aabbMin, aabbMax);
|
||||
|
||||
const auto toLocal = object->getCollisionObject()->getWorldTransform().inverse();
|
||||
const auto localFrom = toLocal(Misc::Convert::toBullet(position));
|
||||
const auto localTo = toLocal(Misc::Convert::toBullet(destination));
|
||||
|
||||
btScalar hitDistance = 1;
|
||||
btVector3 hitNormal;
|
||||
return btRayAabb(localFrom, localTo, aabbMin, aabbMax, hitDistance, hitNormal);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -719,6 +719,8 @@ namespace MWWorld
|
|||
|
||||
/// Return physical half extents of the given actor to be used in pathfinding
|
||||
osg::Vec3f getPathfindingHalfExtents(const MWWorld::ConstPtr& actor) const override;
|
||||
|
||||
bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue