mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:26:43 +00:00
Code Issues Releases Wiki Activity

Update path following checks each frame in AiCombat.

Browse source
This commit is contained in:
dteviot 2015-08-04 18:20:05 +12:00
parent ad9bab0b68
commit 58f732ebc9
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -429,6 +429,7 @@ namespace MWMechanics
// (within attack dist) || (not quite attack dist while following)
if(inLOS && (distToTarget < rangeAttack || (distToTarget <= rangeFollow && followTarget && !isStuck)))
{
mPathFinder.clearPath();
//Melee and Close-up combat
// getXAngleToDir determines vertical angle to target:
@ -528,9 +529,7 @@ namespace MWMechanics
buildNewPath(actor, target); //may fail to build a path, check before use
//delete visited path node
mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1]);
// if current actor pos is closer to target then last point of path (excluding target itself) then go straight on target
// This works on the borders between the path grid and areas with no waypoints.
if(inLOS && mPathFinder.getPath().size() > 1)
{
@ -539,21 +538,16 @@ namespace MWMechanics
--pntIter;
osg::Vec3f vBeforeTarget(PathFinder::MakeOsgVec3(*pntIter));
// if current actor pos is closer to target then last point of path (excluding target itself) then go straight on target
if(distToTarget <= (vTargetPos - vBeforeTarget).length())
{
movement.mRotation[2] = getZAngleToDir(vDirToTarget);
preferShortcut = true;
mPathFinder.clearPath();
}
}
// if there is no new path, then go straight on target
if(!preferShortcut)
if (!mPathFinder.isPathConstructed())
{
if(!mPathFinder.getPath().empty())
movement.mRotation[2] = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
else
movement.mRotation[2] = getZAngleToDir(vDirToTarget);
movement.mRotation[2] = getZAngleToDir(vDirToTarget);
}
}
@ -573,9 +567,25 @@ namespace MWMechanics
void AiCombat::UpdateActorsMovement(const MWWorld::Ptr& actor, MWMechanics::Movement& desiredMovement)
{
MWMechanics::Movement& actorMovementSettings = actor.getClass().getMovementSettings(actor);
actorMovementSettings = desiredMovement;
RotateActorOnAxis(actor, 2, actorMovementSettings, desiredMovement);
RotateActorOnAxis(actor, 0, actorMovementSettings, desiredMovement);
if (mPathFinder.isPathConstructed())
{
const ESM::Position& pos = actor.getRefData().getPosition();
if (mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1]))
{
actorMovementSettings.mPosition[1] = 0;
}
else
{
zTurn(actor, mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]));
actorMovementSettings.mPosition[1] = 1;
}
}
else
{
actorMovementSettings = desiredMovement;
RotateActorOnAxis(actor, 2, actorMovementSettings, desiredMovement);
RotateActorOnAxis(actor, 0, actorMovementSettings, desiredMovement);
}
}
void AiCombat::RotateActorOnAxis(const MWWorld::Ptr& actor, int axis,