Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:12:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More code review changes

Browse source
This commit is contained in:
Roxanne Skelly 2019-01-11 16:49:04 -08:00
parent d3528ba289
commit cd6495286d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,11 +106,11 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
// in that packet_ are ignored. Updates to traits not in that packet will // in that packet_ are ignored. Updates to traits not in that packet will
// be sent. // be sent.
auto otherNodeLocalID = sendingNodeData->getNodeLocalID(); auto sendingNodeLocalID = sendingNodeData->getNodeLocalID();
// Perform a simple check with two server clock time points // Perform a simple check with two server clock time points
// 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(otherNodeLocalID); auto timeOfLastTraitsSent = listeningNodeData->getLastOtherAvatarTraitsSendPoint(sendingNodeLocalID);
auto timeOfLastTraitsChange = sendingNodeData->getLastReceivedTraitsChange(); auto timeOfLastTraitsChange = sendingNodeData->getLastReceivedTraitsChange();
auto nextTimeOfLastTraitsSent = timeOfLastTraitsChange; auto nextTimeOfLastTraitsSent = timeOfLastTraitsChange;
@ -122,8 +122,8 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
auto sendingAvatar = sendingNodeData->getAvatarSharedPointer(); auto sendingAvatar = sendingNodeData->getAvatarSharedPointer();
// compare trait versions so we can see what exactly needs to go out // compare trait versions so we can see what exactly needs to go out
auto& lastSentVersions = listeningNodeData->getLastSentTraitVersions(otherNodeLocalID); auto& lastSentVersions = listeningNodeData->getLastSentTraitVersions(sendingNodeLocalID);
auto& lastAckedVersions = listeningNodeData->getLastAckedTraitVersions(otherNodeLocalID); auto& lastAckedVersions = listeningNodeData->getLastAckedTraitVersions(sendingNodeLocalID);
const auto& lastReceivedVersions = sendingNodeData->getLastReceivedTraitVersions(); const auto& lastReceivedVersions = sendingNodeData->getLastReceivedTraitVersions();
auto simpleReceivedIt = lastReceivedVersions.simpleCBegin(); auto simpleReceivedIt = lastReceivedVersions.simpleCBegin();
@ -144,7 +144,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
lastSentVersionRef = lastReceivedVersion; lastSentVersionRef = lastReceivedVersion;
// Remember which versions we sent in this particular packet // Remember which versions we sent in this particular packet
// so we can verify when it's acked. // so we can verify when it's acked.
auto& pendingTraitVersions = listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(), otherNodeLocalID); auto& pendingTraitVersions = listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(), sendingNodeLocalID);
pendingTraitVersions[traitType] = lastReceivedVersion; pendingTraitVersions[traitType] = lastReceivedVersion;
} }
} else { } else {
@ -204,7 +204,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
auto& pendingTraitVersions = auto& pendingTraitVersions =
listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(), listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(),
otherNodeLocalID); sendingNodeLocalID);
pendingTraitVersions.instanceInsert(traitType, instanceID, receivedVersion); pendingTraitVersions.instanceInsert(traitType, instanceID, receivedVersion);
} else if (isDeleted && sentInstanceIt != sentIDValuePairs.end() && absoluteReceivedVersion > sentInstanceIt->value) { } else if (isDeleted && sentInstanceIt != sentIDValuePairs.end() && absoluteReceivedVersion > sentInstanceIt->value) {
@ -218,7 +218,7 @@ qint64 AvatarMixerSlave::addChangedTraitsToBulkPacket(AvatarMixerClientData* lis
auto& pendingTraitVersions = auto& pendingTraitVersions =
listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(), listeningNodeData->getPendingTraitVersions(listeningNodeData->getTraitsMessageSequence(),
otherNodeLocalID); sendingNodeLocalID);
pendingTraitVersions.instanceInsert(traitType, instanceID, absoluteReceivedVersion); pendingTraitVersions.instanceInsert(traitType, instanceID, absoluteReceivedVersion);
} }