From 7b94183d83abb31ef6017f3886dc01e868f3f1b8 Mon Sep 17 00:00:00 2001 From: elsid Date: Sat, 17 Aug 2019 17:55:49 +0200 Subject: [PATCH] Revert "Take in account actor half extents for obstacle check" This reverts commit 5434e924375ae878124aaab1b3353a1781b4ed8a. --- apps/openmw/mwmechanics/obstacle.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp index 63167e302f..c8b548bad9 100644 --- a/apps/openmw/mwmechanics/obstacle.cpp +++ b/apps/openmw/mwmechanics/obstacle.cpp @@ -2,8 +2,6 @@ #include -#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); - 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; + float distSameSpot = mDistSameSpot * duration; + + bool samePosition = (osg::Vec2f(pos.pos[0], pos.pos[1]) - osg::Vec2f(mPrevX, mPrevY)).length2() < distSameSpot * distSameSpot; // update position mPrevX = pos.pos[0];