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

CR Fix

Browse source
This commit is contained in:
Roxanne Skelly 2019-01-11 17:52:47 -08:00
parent fca15c1362
commit 69af0ea0ee
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
// to see if there is any new traits data for this avatar that we need to send // to see if there is any new traits data for this avatar that we need to send
auto timeOfLastTraitsSent = listeningNodeData->getLastOtherAvatarTraitsSendPoint(sendingNodeLocalID); auto timeOfLastTraitsSent = listeningNodeData->getLastOtherAvatarTraitsSendPoint(sendingNodeLocalID);
auto timeOfLastTraitsChange = sendingNodeData->getLastReceivedTraitsChange(); auto timeOfLastTraitsChange = sendingNodeData->getLastReceivedTraitsChange();
auto nextTimeOfLastTraitsSent = timeOfLastTraitsChange; bool allTraitsUpdated = true;
qint64 bytesWritten = 0; qint64 bytesWritten = 0;
@ -148,7 +148,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
pendingTraitVersions[traitType] = lastReceivedVersion; pendingTraitVersions[traitType] = lastReceivedVersion;
} }
} else { } else {
nextTimeOfLastTraitsSent = timeOfLastTraitsSent; allTraitsUpdated = false;
} }
++simpleReceivedIt; ++simpleReceivedIt;
@ -187,7 +187,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
// version to go on, otherwise we drop the received trait // version to go on, otherwise we drop the received trait
if (sentInstanceIt != sentIDValuePairs.end() && if (sentInstanceIt != sentIDValuePairs.end() &&
(ackedInstanceIt == ackIDValuePairs.end() || sentInstanceIt->value != ackedInstanceIt->value)) { (ackedInstanceIt == ackIDValuePairs.end() || sentInstanceIt->value != ackedInstanceIt->value)) {
nextTimeOfLastTraitsSent = timeOfLastTraitsSent; allTraitsUpdated = false;
continue; continue;
} }
if (!isDeleted && (sentInstanceIt == sentIDValuePairs.end() || receivedVersion > sentInstanceIt->value)) { if (!isDeleted && (sentInstanceIt == sentIDValuePairs.end() || receivedVersion > sentInstanceIt->value)) {
@ -231,7 +231,9 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
bytesWritten += traitsPacketList.writePrimitive(AvatarTraits::NullTrait); bytesWritten += traitsPacketList.writePrimitive(AvatarTraits::NullTrait);
// since we send all traits for this other avatar, update the time of last traits sent // since we send all traits for this other avatar, update the time of last traits sent
// to match the time of last traits change // to match the time of last traits change
listeningNodeData->setLastOtherAvatarTraitsSendPoint(sendingNodeLocalID, nextTimeOfLastTraitsSent); if (allTraitsUpdated) {
listeningNodeData->setLastOtherAvatarTraitsSendPoint(sendingNodeLocalID, timeOfLastTraitsChange);
}
} }
} }