Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-29 13:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 50

Merge branch 'fix_6296' into 'master'

Browse source 
Ignore time to destination when giving way (#6296)

See merge request OpenMW/openmw!1234
This commit is contained in:
elsid 2021-09-22 22:12:22 +00:00
commit 14516b9fd6
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmechanics/actors.cpp
View file

@ -1807,6 +1807,7 @@ namespace MWMechanics
// Standing NPCs give way to moving ones if they are not in combat (or pursue) mode and either // Standing NPCs give way to moving ones if they are not in combat (or pursue) mode and either
// follow player or have a AIWander package with non-empty wander area. // follow player or have a AIWander package with non-empty wander area.
bool shouldAvoidCollision = isMoving; bool shouldAvoidCollision = isMoving;
bool shouldGiveWay = false;
bool shouldTurnToApproachingActor = !isMoving; bool shouldTurnToApproachingActor = !isMoving;
MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets). MWWorld::Ptr currentTarget; // Combat or pursue target (NPCs should not avoid collision with their targets).
const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence(); const auto& aiSequence = ptr.getClass().getCreatureStats(ptr).getAiSequence();
@ -1817,7 +1818,7 @@ namespace MWMechanics
else if (package->getTypeId() == AiPackageTypeId::Wander && giveWayWhenIdle) else if (package->getTypeId() == AiPackageTypeId::Wander && giveWayWhenIdle)
{ {
if (!static_cast<const AiWander*>(package.get())->isStationary()) if (!static_cast<const AiWander*>(package.get())->isStationary())
shouldAvoidCollision = true; shouldGiveWay = true;
} }
else if (package->getTypeId() == AiPackageTypeId::Combat || package->getTypeId() == AiPackageTypeId::Pursue) else if (package->getTypeId() == AiPackageTypeId::Combat || package->getTypeId() == AiPackageTypeId::Pursue)
{ {
@ -1827,7 +1828,7 @@ namespace MWMechanics
break; break;
} }
} }
if (!shouldAvoidCollision) if (!shouldAvoidCollision && !shouldGiveWay)
continue; continue;
osg::Vec2f baseSpeed = origMovement * maxSpeed; osg::Vec2f baseSpeed = origMovement * maxSpeed;
@ -1836,14 +1837,14 @@ namespace MWMechanics
const osg::Vec3f halfExtents = world->getHalfExtents(ptr); const osg::Vec3f halfExtents = world->getHalfExtents(ptr);
float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding; float maxDistToCheck = isMoving ? maxDistForPartialAvoiding : maxDistForStrictAvoiding;
float timeToCollision = maxTimeToCheck; float timeToCheck = maxTimeToCheck;
if (!shouldGiveWay && !aiSequence.isEmpty())
timeToCheck = std::min(timeToCheck, getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents));
float timeToCollision = timeToCheck;
osg::Vec2f movementCorrection(0, 0); osg::Vec2f movementCorrection(0, 0);
float angleToApproachingActor = 0; float angleToApproachingActor = 0;
const float timeToDestination = aiSequence.isEmpty()
? std::numeric_limits<float>::max()
: getTimeToDestination(**aiSequence.begin(), basePos, maxSpeed, duration, halfExtents);
// Iterate through all other actors and predict collisions. // Iterate through all other actors and predict collisions.
for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter) for(PtrActorMap::iterator otherIter(mActors.begin()); otherIter != mActors.end(); ++otherIter)
{ {
@ -1880,7 +1881,7 @@ namespace MWMechanics
continue; // No solution; distance is always >= collisionDist. continue; // No solution; distance is always >= collisionDist.
float t = (-vr - std::sqrt(Dh)) / v2; float t = (-vr - std::sqrt(Dh)) / v2;
if (t < 0 || t > timeToCollision || t > timeToDestination) if (t < 0 || t > timeToCollision)
continue; continue;
// Check visibility and awareness last as it's expensive. // Check visibility and awareness last as it's expensive.
@ -1900,7 +1901,7 @@ namespace MWMechanics
movementCorrection.y() *= 0.5f; movementCorrection.y() *= 0.5f;
} }
if (timeToCollision < maxTimeToCheck) if (timeToCollision < timeToCheck)
{ {
// Try to evade the nearest collision. // Try to evade the nearest collision.
osg::Vec2f newMovement = origMovement + movementCorrection; osg::Vec2f newMovement = origMovement + movementCorrection;