mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 20:19:40 +00:00
Code Issues Releases Wiki Activity

Move AiWander path finder to temporary storage (Fixes #2082)

Browse source
This commit is contained in:
scrawl 2014-12-01 13:34:42 +01:00
parent b7cf114d5d
commit 61d1aa78ce
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/aipackage.hpp
View file

@ -69,6 +69,7 @@ namespace MWMechanics
/** \return If the actor has arrived at his destination **/ /** \return If the actor has arrived at his destination **/
bool pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Point dest, float duration); bool pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Point dest, float duration);
// TODO: all this does not belong here, move into temporary storage
PathFinder mPathFinder; PathFinder mPathFinder;
ObstacleCheck mObstacleCheck; ObstacleCheck mObstacleCheck;

42
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -58,6 +58,8 @@ namespace MWMechanics
unsigned short mPlayedIdle; unsigned short mPlayedIdle;
PathFinder mPathFinder;
AiWanderStorage(): AiWanderStorage():
mTargetAngle(0), mTargetAngle(0),
mRotate(false), mRotate(false),
@ -211,9 +213,9 @@ namespace MWMechanics
// Are we there yet? // Are we there yet?
bool& chooseAction = storage.mChooseAction; bool& chooseAction = storage.mChooseAction;
if(walking && if(walking &&
mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2])) storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
{ {
stopWalking(actor); stopWalking(actor, storage);
moveNow = false; moveNow = false;
walking = false; walking = false;
chooseAction = true; chooseAction = true;
@ -225,7 +227,7 @@ namespace MWMechanics
if(walking) // have not yet reached the destination if(walking) // have not yet reached the destination
{ {
// turn towards the next point in mPath // turn towards the next point in mPath
zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]))); zTurn(actor, Ogre::Degree(storage.mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1])));
actor.getClass().getMovementSettings(actor).mPosition[1] = 1; actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
// Returns true if evasive action needs to be taken // Returns true if evasive action needs to be taken
@ -236,9 +238,9 @@ namespace MWMechanics
{ {
// remove allowed points then select another random destination // remove allowed points then select another random destination
mTrimCurrentNode = true; mTrimCurrentNode = true;
trimAllowedNodes(mAllowedNodes, mPathFinder); trimAllowedNodes(mAllowedNodes, storage.mPathFinder);
mObstacleCheck.clear(); mObstacleCheck.clear();
mPathFinder.clearPath(); storage.mPathFinder.clearPath();
walking = false; walking = false;
moveNow = true; moveNow = true;
} }
@ -249,7 +251,7 @@ namespace MWMechanics
actor.getClass().getMovementSettings(actor).mPosition[0] = 1; actor.getClass().getMovementSettings(actor).mPosition[0] = 1;
actor.getClass().getMovementSettings(actor).mPosition[1] = 0.1f; actor.getClass().getMovementSettings(actor).mPosition[1] = 0.1f;
// change the angle a bit, too // change the angle a bit, too
zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1]))); zTurn(actor, Ogre::Degree(storage.mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1])));
} }
mStuckCount++; // TODO: maybe no longer needed mStuckCount++; // TODO: maybe no longer needed
} }
@ -260,7 +262,7 @@ namespace MWMechanics
//std::cout << "Reset \""<< cls.getName(actor) << "\"" << std::endl; //std::cout << "Reset \""<< cls.getName(actor) << "\"" << std::endl;
mObstacleCheck.clear(); mObstacleCheck.clear();
stopWalking(actor); stopWalking(actor, storage);
moveNow = false; moveNow = false;
walking = false; walking = false;
chooseAction = true; chooseAction = true;
@ -300,7 +302,7 @@ namespace MWMechanics
{ {
if(!mRepeat) if(!mRepeat)
{ {
stopWalking(actor); stopWalking(actor, storage);
return true; return true;
} }
else else
@ -310,7 +312,7 @@ namespace MWMechanics
{ {
if(!mRepeat) if(!mRepeat)
{ {
stopWalking(actor); stopWalking(actor, storage);
return true; return true;
} }
else else
@ -411,7 +413,7 @@ namespace MWMechanics
chooseAction = false; chooseAction = false;
idleNow = false; idleNow = false;
if (!mPathFinder.isPathConstructed()) if (!storage.mPathFinder.isPathConstructed())
{ {
Ogre::Vector3 destNodePos = mReturnPosition; Ogre::Vector3 destNodePos = mReturnPosition;
@ -427,9 +429,9 @@ namespace MWMechanics
start.mZ = pos.pos[2]; start.mZ = pos.pos[2];
// don't take shortcuts for wandering // don't take shortcuts for wandering
mPathFinder.buildPath(start, dest, actor.getCell(), false); storage.mPathFinder.buildPath(start, dest, actor.getCell(), false);
if(mPathFinder.isPathConstructed()) if(storage.mPathFinder.isPathConstructed())
{ {
moveNow = false; moveNow = false;
walking = true; walking = true;
@ -517,7 +519,7 @@ namespace MWMechanics
if(walking) if(walking)
{ {
stopWalking(actor); stopWalking(actor, storage);
moveNow = false; moveNow = false;
walking = false; walking = false;
mObstacleCheck.clear(); mObstacleCheck.clear();
@ -567,7 +569,7 @@ namespace MWMechanics
if(moveNow && mDistance) if(moveNow && mDistance)
{ {
// Construct a new path if there isn't one // Construct a new path if there isn't one
if(!mPathFinder.isPathConstructed()) if(!storage.mPathFinder.isPathConstructed())
{ {
assert(mAllowedNodes.size()); assert(mAllowedNodes.size());
unsigned int randNode = (int)(rand() / ((double)RAND_MAX + 1) * mAllowedNodes.size()); unsigned int randNode = (int)(rand() / ((double)RAND_MAX + 1) * mAllowedNodes.size());
@ -589,16 +591,16 @@ namespace MWMechanics
start.mZ = pos.pos[2]; start.mZ = pos.pos[2];
// don't take shortcuts for wandering // don't take shortcuts for wandering
mPathFinder.buildPath(start, dest, actor.getCell(), false); storage.mPathFinder.buildPath(start, dest, actor.getCell(), false);
if(mPathFinder.isPathConstructed()) if(storage.mPathFinder.isPathConstructed())
{ {
// buildPath inserts dest in case it is not a pathgraph point // buildPath inserts dest in case it is not a pathgraph point
// index which is a duplicate for AiWander. However below code // index which is a duplicate for AiWander. However below code
// does not work since getPath() returns a copy of path not a // does not work since getPath() returns a copy of path not a
// reference // reference
//if(mPathFinder.getPathSize() > 1) //if(storage.mPathFinder.getPathSize() > 1)
//mPathFinder.getPath().pop_back(); //storage.mPathFinder.getPath().pop_back();
// Remove this node as an option and add back the previously used node (stops NPC from picking the same node): // Remove this node as an option and add back the previously used node (stops NPC from picking the same node):
ESM::Pathgrid::Point temp = mAllowedNodes[randNode]; ESM::Pathgrid::Point temp = mAllowedNodes[randNode];
@ -653,9 +655,9 @@ namespace MWMechanics
return TypeIdWander; return TypeIdWander;
} }
void AiWander::stopWalking(const MWWorld::Ptr& actor) void AiWander::stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage)
{ {
mPathFinder.clearPath(); storage.mPathFinder.clearPath();
actor.getClass().getMovementSettings(actor).mPosition[1] = 0; actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
} }

5
apps/openmw/mwmechanics/aiwander.hpp
View file

@ -27,6 +27,8 @@ namespace MWMechanics
{ {
struct AiWanderStorage;
/// \brief Causes the Actor to wander within a specified range /// \brief Causes the Actor to wander within a specified range
class AiWander : public AiPackage class AiWander : public AiPackage
{ {
@ -65,7 +67,7 @@ namespace MWMechanics
// NOTE: mDistance and mDuration must be set already // NOTE: mDistance and mDuration must be set already
void init(); void init();
void stopWalking(const MWWorld::Ptr& actor); void stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage);
void playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect); void playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect); bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
void getRandomIdle(unsigned short& playedIdle); void getRandomIdle(unsigned short& playedIdle);
@ -101,7 +103,6 @@ namespace MWMechanics
void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
const PathFinder& pathfinder); const PathFinder& pathfinder);
// PathFinder mPathFinder;
// ObstacleCheck mObstacleCheck; // ObstacleCheck mObstacleCheck;
float mDoorCheckDuration; float mDoorCheckDuration;