mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-30 08:06:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2213 from elsid/min_path_point_tolerance

Browse source 
Use min point tolerance to prevent face wrong direction (bug #4814)
This commit is contained in:
Bret Curtis 2019-03-06 21:36:43 +01:00 committed by GitHub
commit 41d1521f1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/aipackage.cpp
View file

@ -167,7 +167,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
mTimer = 0; mTimer = 0;
} }
const float pointTolerance = std::min(actor.getClass().getSpeed(actor), DEFAULT_TOLERANCE); const float pointTolerance = std::max(MIN_TOLERANCE, std::min(actor.getClass().getSpeed(actor), DEFAULT_TOLERANCE));
mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE); mPathFinder.update(position, pointTolerance, DEFAULT_TOLERANCE);

2
apps/openmw/mwmechanics/pathfinding.hpp
View file

@ -46,10 +46,10 @@ namespace MWMechanics
} }
const float PATHFIND_Z_REACH = 50.0f; const float PATHFIND_Z_REACH = 50.0f;
//static const float sMaxSlope = 49.0f; // duplicate as in physicssystem
// distance after which actor (failed previously to shortcut) will try again // distance after which actor (failed previously to shortcut) will try again
const float PATHFIND_SHORTCUT_RETRY_DIST = 300.0f; const float PATHFIND_SHORTCUT_RETRY_DIST = 300.0f;
const float MIN_TOLERANCE = 1.0f;
const float DEFAULT_TOLERANCE = 32.0f; const float DEFAULT_TOLERANCE = 32.0f;
// cast up-down ray with some offset from actor position to check for pits/obstacles on the way to target; // cast up-down ray with some offset from actor position to check for pits/obstacles on the way to target;