mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-06-20 10:11:35 +00:00
Code Issues Releases Wiki Activity

[Client] Limiting updates to ~64 per second

Browse source
This commit is contained in:
Koncord 2017-06-02 21:20:35 +08:00
parent c2600bac8e
commit ad873e16b8
2 changed files with 73 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -71,17 +71,24 @@ MWWorld::Ptr LocalPlayer::getPlayerPtr()
void LocalPlayer::update() void LocalPlayer::update()
{ {
updateCell(); static float updateTimer = 0;
updatePosition(); const float timeoutSec = 0.015;
updateAnimFlags();
updateAttack(); if ((updateTimer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec)
updateDeadState(); {
updateEquipment(); updateTimer = 0;
updateStatsDynamic(); updateCell();
updateAttributes(); updatePosition();
updateSkills(); updateAnimFlags();
updateLevel(); updateAttack();
updateBounty(); updateDeadState();
updateEquipment();
updateStatsDynamic();
updateAttributes();
updateSkills();
updateLevel();
updateBounty();
}
} }
void LocalPlayer::charGen(int stageFirst, int stageEnd) void LocalPlayer::charGen(int stageFirst, int stageEnd)
@ -182,36 +189,30 @@ void LocalPlayer::updateStatsDynamic(bool forceUpdate)
static MWMechanics::DynamicStat<float> oldMagicka(ptrCreatureStats->getMagicka()); static MWMechanics::DynamicStat<float> oldMagicka(ptrCreatureStats->getMagicka());
static MWMechanics::DynamicStat<float> oldFatigue(ptrCreatureStats->getFatigue()); static MWMechanics::DynamicStat<float> oldFatigue(ptrCreatureStats->getFatigue());
static float statTimer = 0;
const float timeoutSec = 0.5;
if (forceUpdate || (statTimer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec) // Update stats when they become 0 or they have changed enough
bool shouldUpdateHealth = oldHealth != health && (health.getCurrent() == 0 || abs(oldHealth.getCurrent() - health.getCurrent()) > 3);
bool shouldUpdateMagicka = false;
bool shouldUpdateFatigue = false;
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 (forceUpdate || shouldUpdateHealth || shouldUpdateMagicka || shouldUpdateFatigue)
{ {
statTimer = 0; oldHealth = health;
// Update stats when they become 0 or they have changed enough oldMagicka = magicka;
bool shouldUpdateHealth = oldHealth != health && (health.getCurrent() == 0 || abs(oldHealth.getCurrent() - health.getCurrent()) > 3); oldFatigue = fatigue;
bool shouldUpdateMagicka = false;
bool shouldUpdateFatigue = false;
if (!shouldUpdateHealth) health.writeState(creatureStats.mDynamic[0]);
shouldUpdateMagicka = oldMagicka != magicka && (magicka.getCurrent() == 0 || abs(oldMagicka.getCurrent() - magicka.getCurrent()) > 10); magicka.writeState(creatureStats.mDynamic[1]);
fatigue.writeState(creatureStats.mDynamic[2]);
if (!shouldUpdateMagicka) getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(this);
shouldUpdateFatigue = oldFatigue != fatigue && (fatigue.getCurrent() == 0 || abs(oldFatigue.getCurrent() - fatigue.getCurrent()) > 10); getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->Send();
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]);
getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->Send();
}
} }
} }
@ -309,52 +310,45 @@ void LocalPlayer::updateBounty(bool forceUpdate)
void LocalPlayer::updatePosition(bool forceUpdate) void LocalPlayer::updatePosition(bool forceUpdate)
{ {
static float positionTimer = 0; MWBase::World *world = MWBase::Environment::get().getWorld();
const float timeoutSec = 0.015; MWWorld::Ptr player = world->getPlayerPtr();
if (forceUpdate || (positionTimer += MWBase::Environment::get().getFrameDuration()) >= timeoutSec) static bool posWasChanged = false;
static bool isJumping = false;
static bool sentJumpEnd = true;
static float oldRot[2] = {0};
position = player.getRefData().getPosition();
bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 ||
position.rot[0] != oldRot[0] || position.rot[2] != oldRot[1]);
if (forceUpdate || posIsChanging || posWasChanged)
{ {
positionTimer = 0;
MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Ptr player = world->getPlayerPtr();
static bool posWasChanged = false; oldRot[0] = position.rot[0];
static bool isJumping = false; oldRot[1] = position.rot[2];
static bool sentJumpEnd = true;
static float oldRot[2] = {0};
posWasChanged = posIsChanging;
if (!isJumping && !world->isOnGround(player) && !world->isFlying(player))
isJumping = true;
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
}
else if (isJumping && world->isOnGround(player))
{
isJumping = false;
sentJumpEnd = false;
}
// Packet with jump end position has to be sent one tick after above check
else if (!sentJumpEnd)
{
sentJumpEnd = true;
position = player.getRefData().getPosition(); position = player.getRefData().getPosition();
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 || getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
position.rot[0] != oldRot[0] || position.rot[2] != oldRot[1]);
if (forceUpdate || posIsChanging || posWasChanged)
{
oldRot[0] = position.rot[0];
oldRot[1] = position.rot[2];
posWasChanged = posIsChanging;
if (!isJumping && !world->isOnGround(player) && !world->isFlying(player))
isJumping = true;
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
}
else if (isJumping && world->isOnGround(player))
{
isJumping = false;
sentJumpEnd = false;
}
// Packet with jump end position has to be sent one tick after above check
else if (!sentJumpEnd)
{
sentJumpEnd = true;
position = player.getRefData().getPosition();
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
}
} }
} }

4
components/openmw-mp/Packets/Player/PacketPlayerStatsDynamic.cpp
View file

@ -15,7 +15,5 @@ PacketPlayerStatsDynamic::PacketPlayerStatsDynamic(RakNet::RakPeerInterface *pee
void PacketPlayerStatsDynamic::Packet(RakNet::BitStream *bs, bool send) void PacketPlayerStatsDynamic::Packet(RakNet::BitStream *bs, bool send)
{ {
PlayerPacket::Packet(bs, send); PlayerPacket::Packet(bs, send);
RW(player->creatureStats.mDynamic[0], send); // health RW(player->creatureStats.mDynamic, send);
RW(player->creatureStats.mDynamic[1], send); // magic
RW(player->creatureStats.mDynamic[2], send); // fatigue
} }