|
|
|
@ -2,8 +2,6 @@
|
|
|
|
|
|
|
|
|
|
#include <components/sceneutil/positionattitudetransform.hpp>
|
|
|
|
|
|
|
|
|
|
#include "../mwbase/world.hpp"
|
|
|
|
|
#include "../mwbase/environment.hpp"
|
|
|
|
|
#include "../mwworld/class.hpp"
|
|
|
|
|
#include "../mwworld/cellstore.hpp"
|
|
|
|
|
|
|
|
|
@ -125,17 +123,15 @@ namespace MWMechanics
|
|
|
|
|
*/
|
|
|
|
|
void ObstacleCheck::update(const MWWorld::Ptr& actor, float duration)
|
|
|
|
|
{
|
|
|
|
|
const ESM::Position pos = actor.getRefData().getPosition();
|
|
|
|
|
const MWWorld::Class& cls = actor.getClass();
|
|
|
|
|
ESM::Position pos = actor.getRefData().getPosition();
|
|
|
|
|
|
|
|
|
|
if (mDistSameSpot == -1)
|
|
|
|
|
{
|
|
|
|
|
const osg::Vec3f halfExtents = MWBase::Environment::get().getWorld()->getHalfExtents(actor);
|
|
|
|
|
mDistSameSpot = DIST_SAME_SPOT * actor.getClass().getSpeed(actor) + 1.2 * std::max(halfExtents.x(), halfExtents.y());
|
|
|
|
|
}
|
|
|
|
|
if(mDistSameSpot == -1)
|
|
|
|
|
mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor);
|
|
|
|
|
|
|
|
|
|
float distSameSpot = mDistSameSpot * duration;
|
|
|
|
|
|
|
|
|
|
const float distSameSpot = mDistSameSpot * duration;
|
|
|
|
|
const float squaredMovedDistance = (osg::Vec2f(pos.pos[0], pos.pos[1]) - osg::Vec2f(mPrevX, mPrevY)).length2();
|
|
|
|
|
const bool samePosition = squaredMovedDistance < distSameSpot * distSameSpot;
|
|
|
|
|
bool samePosition = (osg::Vec2f(pos.pos[0], pos.pos[1]) - osg::Vec2f(mPrevX, mPrevY)).length2() < distSameSpot * distSameSpot;
|
|
|
|
|
|
|
|
|
|
// update position
|
|
|
|
|
mPrevX = pos.pos[0];
|
|
|
|
|