mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 22:45:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'refactor/cache-target' into 'master'

Browse source 
Cache the target for ai packages instead of looking for it every frame

See merge request OpenMW/openmw!1772
This commit is contained in:
psi29a 2022-04-17 17:15:01 +00:00
commit c17b6de787
4 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -451,7 +451,11 @@ namespace MWMechanics
MWWorld::Ptr AiCombat::getTarget() const
{
return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
if (mCachedTarget.isEmpty() || mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
{
mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
}
return mCachedTarget;
}
void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const

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

@ -47,6 +47,7 @@ MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options
mReaction(MWBase::Environment::get().getWorld()->getPrng()),
mTargetActorRefId(""),
mTargetActorId(-1),
mCachedTarget(),
mRotateOnTheRunChecks(0),
mIsShortcutting(false),
mShortcutProhibited(false),
@ -56,6 +57,14 @@ MWMechanics::AiPackage::AiPackage(AiPackageTypeId typeId, const Options& options
MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
{
if (!mCachedTarget.isEmpty())
{
if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
mCachedTarget = MWWorld::Ptr();
else
return mCachedTarget;
}
if (mTargetActorId == -2)
return MWWorld::Ptr();
@ -66,20 +75,22 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
mTargetActorId = -2;
return MWWorld::Ptr();
}
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
if (target.isEmpty())
mCachedTarget = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
if (mCachedTarget.isEmpty())
{
mTargetActorId = -2;
return target;
return mCachedTarget;
}
else
mTargetActorId = target.getClass().getCreatureStats(target).getActorId();
mTargetActorId = mCachedTarget.getClass().getCreatureStats(mCachedTarget).getActorId();
}
if (mTargetActorId != -1)
return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
else
return MWWorld::Ptr();
return mCachedTarget;
}
void MWMechanics::AiPackage::reset()
@ -89,6 +100,7 @@ void MWMechanics::AiPackage::reset()
mIsShortcutting = false;
mShortcutProhibited = false;
mShortcutFailPos = osg::Vec3f();
mCachedTarget = MWWorld::Ptr();
mPathFinder.clearPath();
mObstacleCheck.clear();

9
apps/openmw/mwmechanics/aipackage.hpp
View file

@ -4,17 +4,13 @@
#include <memory>
#include <components/detournavigator/areatype.hpp>
#include "pathfinding.hpp"
#include "obstacle.hpp"
#include "aistate.hpp"
#include "aipackagetypeid.hpp"
#include "aitimer.hpp"
namespace MWWorld
{
class Ptr;
}
#include "../mwworld/ptr.hpp"
namespace ESM
{
@ -165,6 +161,7 @@ namespace MWMechanics
std::string mTargetActorRefId;
mutable int mTargetActorId;
mutable MWWorld::Ptr mCachedTarget;
short mRotateOnTheRunChecks; // attempts to check rotation to the pathpoint on the run possibility

10
apps/openmw/mwmechanics/aipursue.cpp
View file

@ -71,7 +71,15 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
MWWorld::Ptr AiPursue::getTarget() const
{
return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
if (!mCachedTarget.isEmpty())
{
if (mCachedTarget.getRefData().isDeleted() || !mCachedTarget.getRefData().isEnabled())
mCachedTarget = MWWorld::Ptr();
else
return mCachedTarget;
}
mCachedTarget = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
return mCachedTarget;
}
void AiPursue::writeState(ESM::AiSequence::AiSequence &sequence) const