krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Use update timer in mwmp::Cell instead of LocalActor

Browse source
This commit is contained in:
David Cernat 2017-06-10 03:29:51 +03:00
parent 18bf79e08b
commit 312fc84a6f
4 changed files with 39 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmp/Cell.cpp
View file

@ -23,11 +23,21 @@ mwmp::Cell::Cell(MWWorld::CellStore* cellStore)
std::map<std::string, LocalActor *> localActors;
std::map<std::string, DedicatedActor *> dedicatedActors;
updateTimer = 0;
}
void Cell::updateLocal(bool forceUpdate)
{
if (localActors.empty()) return;
if (localActors.empty())
return;
const float timeoutSec = 0.025;
if (!forceUpdate && (updateTimer += MWBase::Environment::get().getFrameDuration()) < timeoutSec)
return;
else
updateTimer = 0;
CellController *cellController = Main::get().getCellController();
ActorList *actorList = mwmp::Main::get().getNetworking()->getActorList();

2
apps/openmw/mwmp/Cell.hpp
View file

@ -52,6 +52,8 @@ namespace mwmp
std::map<std::string, LocalActor *> localActors;
std::map<std::string, DedicatedActor *> dedicatedActors;
float updateTimer;
};
}

69
apps/openmw/mwmp/LocalActor.cpp
View file

@ -31,9 +31,6 @@ LocalActor::LocalActor()
wasForceMoveJumping = false;
wasFlying = false;
positionTimer = 0;
statTimer = 0;
attack.type = Attack::MELEE;
attack.shouldSend = false;
@ -75,23 +72,16 @@ void LocalActor::updateCell()
void LocalActor::updatePosition(bool forceUpdate)
{
const float timeoutSec = 0.03;
bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 || direction.pos[2] != 0 ||
direction.rot[0] != 0 || direction.rot[1] != 0 || direction.rot[2] != 0);
if (forceUpdate || (positionTimer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec)
if (forceUpdate || posIsChanging || posWasChanged)
{
bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 || direction.pos[2] != 0 ||
direction.rot[0] != 0 || direction.rot[1] != 0 || direction.rot[2] != 0);
posWasChanged = posIsChanging;
if (forceUpdate || posIsChanging || posWasChanged)
{
posWasChanged = posIsChanging;
position = ptr.getRefData().getPosition();
position = ptr.getRefData().getPosition();
positionTimer = 0;
mwmp::Main::get().getNetworking()->getActorList()->addPositionActor(*this);
}
mwmp::Main::get().getNetworking()->getActorList()->addPositionActor(*this);
}
}
@ -167,39 +157,32 @@ void LocalActor::updateStatsDynamic(bool forceUpdate)
MWMechanics::DynamicStat<float> magicka(ptrCreatureStats->getMagicka());
MWMechanics::DynamicStat<float> fatigue(ptrCreatureStats->getFatigue());
const float timeoutSec = 0.5;
// Update stats when they become 0 or they have changed enough
//
// Also check for an oldHealth of 0 changing to something else for resurrected NPCs
bool shouldUpdateHealth = oldHealth != health && (health.getCurrent() == 0 || oldHealth.getCurrent() == 0 || abs(oldHealth.getCurrent() - health.getCurrent()) > 5);
bool shouldUpdateMagicka = false;
bool shouldUpdateFatigue = false;
if (forceUpdate || (statTimer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec)
{
// Update stats when they become 0 or they have changed enough
//
// Also check for an oldHealth of 0 changing to something else for resurrected NPCs
bool shouldUpdateHealth = oldHealth != health && (health.getCurrent() == 0 || oldHealth.getCurrent() == 0 || abs(oldHealth.getCurrent() - health.getCurrent()) > 5);
bool shouldUpdateMagicka = false;
bool shouldUpdateFatigue = false;
if (!shouldUpdateHealth)
shouldUpdateMagicka = oldMagicka != magicka && (magicka.getCurrent() == 0 || abs(oldMagicka.getCurrent() - magicka.getCurrent()) > 10);
if (!shouldUpdateHealth)
shouldUpdateMagicka = oldMagicka != magicka && (magicka.getCurrent() == 0 || abs(oldMagicka.getCurrent() - magicka.getCurrent()) > 10);
if (!shouldUpdateMagicka)
shouldUpdateFatigue = oldFatigue != fatigue && (fatigue.getCurrent() == 0 || abs(oldFatigue.getCurrent() - fatigue.getCurrent()) > 10);
if (!shouldUpdateMagicka)
shouldUpdateFatigue = oldFatigue != fatigue && (fatigue.getCurrent() == 0 || abs(oldFatigue.getCurrent() - fatigue.getCurrent()) > 10);
if (forceUpdate || shouldUpdateHealth || shouldUpdateMagicka || shouldUpdateFatigue)
{
oldHealth = health;
oldMagicka = magicka;
oldFatigue = fatigue;
if (forceUpdate || shouldUpdateHealth || shouldUpdateMagicka || shouldUpdateFatigue)
{
oldHealth = health;
oldMagicka = magicka;
oldFatigue = fatigue;
health.writeState(creatureStats.mDynamic[0]);
magicka.writeState(creatureStats.mDynamic[1]);
fatigue.writeState(creatureStats.mDynamic[2]);
health.writeState(creatureStats.mDynamic[0]);
magicka.writeState(creatureStats.mDynamic[1]);
fatigue.writeState(creatureStats.mDynamic[2]);
creatureStats.mDead = ptrCreatureStats->isDead();
creatureStats.mDead = ptrCreatureStats->isDead();
statTimer = 0;
mwmp::Main::get().getNetworking()->getActorList()->addStatsDynamicActor(*this);
}
mwmp::Main::get().getNetworking()->getActorList()->addStatsDynamicActor(*this);
}
}

3
apps/openmw/mwmp/LocalActor.hpp
View file

@ -47,9 +47,6 @@ namespace mwmp
MWMechanics::DynamicStat<float> oldHealth;
MWMechanics::DynamicStat<float> oldMagicka;
MWMechanics::DynamicStat<float> oldFatigue;
float positionTimer;
float statTimer;
};
}