mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 07:56:40 +00:00
Code Issues Releases Wiki Activity

little improvement

Browse source
This commit is contained in:
gus 2013-03-06 21:17:33 +00:00
parent 5fc7103425
commit 01908dbcc2
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwmechanics/aitravel.cpp
View file

@ -22,6 +22,11 @@ MWMechanics::AiTravel * MWMechanics::AiTravel::clone() const
return new AiTravel(*this); return new AiTravel(*this);
} }
float distanceZCorrected(ESM::Pathgrid::Point point,float x,float y,float z)
{
return sqrt((point.mX - x)*(point.mX - x)+(point.mY - y)*(point.mY - y)+0.1*(point.mZ - z)*(point.mZ - z));
}
float distance(ESM::Pathgrid::Point point,float x,float y,float z) float distance(ESM::Pathgrid::Point point,float x,float y,float z)
{ {
return sqrt((point.mX - x)*(point.mX - x)+(point.mY - y)*(point.mY - y)+(point.mZ - z)*(point.mZ - z)); return sqrt((point.mX - x)*(point.mX - x)+(point.mY - y)*(point.mY - y)+(point.mZ - z)*(point.mZ - z));
@ -64,11 +69,6 @@ float getZAngle(float dX,float dY)
return Ogre::Radian(acos(dY/h)*sgn(asin(dX/h))).valueDegrees(); return Ogre::Radian(acos(dY/h)*sgn(asin(dX/h))).valueDegrees();
} }
struct Edge
{
float distance;
};
typedef boost::adjacency_list<boost::vecS,boost::vecS,boost::undirectedS, typedef boost::adjacency_list<boost::vecS,boost::vecS,boost::undirectedS,
boost::property<boost::vertex_index_t,int,ESM::Pathgrid::Point>,boost::property<boost::edge_weight_t,float> > PathGridGraph; boost::property<boost::vertex_index_t,int,ESM::Pathgrid::Point>,boost::property<boost::edge_weight_t,float> > PathGridGraph;
typedef boost::property_map<PathGridGraph, boost::edge_weight_t>::type WeightMap; typedef boost::property_map<PathGridGraph, boost::edge_weight_t>::type WeightMap;
@ -176,6 +176,11 @@ bool MWMechanics::AiTravel::execute (const MWWorld::Ptr& actor)
PathGridGraph graph = buildGraph(pathgrid); PathGridGraph graph = buildGraph(pathgrid);
mPath = getPath(start,end,graph); mPath = getPath(start,end,graph);
ESM::Pathgrid::Point dest;
dest.mX = mX;
dest.mY = mY;
dest.mZ = mZ;
mPath.push_back(dest);
isPathConstructed = true; isPathConstructed = true;
} }
if(mPath.empty()) if(mPath.empty())
@ -184,7 +189,7 @@ bool MWMechanics::AiTravel::execute (const MWWorld::Ptr& actor)
return true; return true;
} }
ESM::Pathgrid::Point nextPoint = *mPath.begin(); ESM::Pathgrid::Point nextPoint = *mPath.begin();
if(distance(nextPoint,pos.pos[0],pos.pos[1],pos.pos[2]) < 20) if(distanceZCorrected(nextPoint,pos.pos[0],pos.pos[1],pos.pos[2]) < 20)
{ {
mPath.pop_front(); mPath.pop_front();
if(mPath.empty()) if(mPath.empty())