Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Force send ID even when 'overBudget'

Browse source
This commit is contained in:
Zach Fox 2017-02-24 14:28:29 -08:00
parent 81ce5cffcd
commit 4025601c2b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -311,15 +311,16 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
const AvatarMixerClientData* otherNodeData = reinterpret_cast<const AvatarMixerClientData*>(otherNode->getLinkedData()); const AvatarMixerClientData* otherNodeData = reinterpret_cast<const AvatarMixerClientData*>(otherNode->getLinkedData());
// make sure we send out identity packets to and from new arrivals. // make sure we send out identity packets to and from new arrivals.
// Also make sure we send identity packets if the PAL is open.
bool forceSend = !nodeData->checkAndSetHasReceivedFirstPacketsFrom(otherNode->getUUID()) || (PALIsOpen || getsAnyIgnored); bool forceSend = !nodeData->checkAndSetHasReceivedFirstPacketsFrom(otherNode->getUUID()) || (PALIsOpen || getsAnyIgnored);
// FIXME - this clause seems suspicious "... || otherNodeData->getIdentityChangeTimestamp() > _lastFrameTimestamp ..." // FIXME - this clause seems suspicious "... || otherNodeData->getIdentityChangeTimestamp() > _lastFrameTimestamp ..."
if (!overBudget if ((!overBudget
&& otherNodeData->getIdentityChangeTimestamp().time_since_epoch().count() > 0 && otherNodeData->getIdentityChangeTimestamp().time_since_epoch().count() > 0
&& (forceSend && (forceSend
|| otherNodeData->getIdentityChangeTimestamp() > _lastFrameTimestamp || otherNodeData->getIdentityChangeTimestamp() > _lastFrameTimestamp
|| distribution(generator) < IDENTITY_SEND_PROBABILITY)) { || distribution(generator) < IDENTITY_SEND_PROBABILITY)) ||
// Also make sure we send identity packets if the PAL is open.
(PALIsOpen || getsAnyIgnored)) {
identityBytesSent += sendIdentityPacket(otherNodeData, node); identityBytesSent += sendIdentityPacket(otherNodeData, node);
} }