mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Store path points in deque

Browse Source
This commit is contained in:
elsid 2018-08-18 13:40:04 +03:00
parent 925d909fea
commit 9b3756f8bc
No known key found for this signature in database
GPG Key ID: B845CB9FEE18AB40
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/aipackage.cpp
View File

@ -148,8 +148,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
if (destInLOS && mPathFinder.getPath().size() > 1)
{
// get point just before dest
auto pPointBeforeDest = mPathFinder.getPath().rbegin();
++pPointBeforeDest;
auto pPointBeforeDest = mPathFinder.getPath().rbegin() + 1;
// if start point is closer to the target then last point of path (excluding target itself) then go straight on the target
if (distance(start, dest) <= distance(dest, *pPointBeforeDest))

3
apps/openmw/mwmechanics/pathfinding.cpp
View File

@ -298,8 +298,7 @@ namespace MWMechanics
{
// if 2nd waypoint of new path == 1st waypoint of old,
// delete 1st waypoint of new path.
const auto iter = ++mPath.begin();
if (*iter == oldStart)
if (mPath[1] == oldStart)
{
mPath.pop_front();
}

6
apps/openmw/mwmechanics/pathfinding.hpp
View File

@ -1,7 +1,7 @@
#ifndef GAME_MWMECHANICS_PATHFINDING_H
#define GAME_MWMECHANICS_PATHFINDING_H
#include <list>
#include <deque>
#include <cassert>
#include <components/esm/defs.hpp>
@ -95,7 +95,7 @@ namespace MWMechanics
return mPath.size();
}
const std::list<osg::Vec3f>& getPath() const
const std::deque<osg::Vec3f>& getPath() const
{
return mPath;
}
@ -172,7 +172,7 @@ namespace MWMechanics
}
private:
std::list<osg::Vec3f> mPath;
std::deque<osg::Vec3f> mPath;
const ESM::Pathgrid *mPathgrid;
const MWWorld::CellStore* mCell;