Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-27 00:55:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup sent trait versions for removed avatars on mixer

Browse source
This commit is contained in:
Stephen Birarda 2018-08-10 15:09:35 -07:00
parent 1158ec8d50
commit fc5b72e9b9
3 changed files with 10 additions and 5 deletions

3
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -470,7 +470,8 @@ void AvatarMixer::handleAvatarKilled(SharedNodePointer avatarNode) {
QMetaObject::invokeMethod(node->getLinkedData(),
"cleanupKilledNode",
Qt::AutoConnection,
Q_ARG(const QUuid&, QUuid(avatarNode->getUUID())));
Q_ARG(const QUuid&, QUuid(avatarNode->getUUID())),
Q_ARG(Node::LocalID, avatarNode->getLocalID()));
}
);
}

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

@ -285,3 +285,10 @@ AvatarMixerClientData::TraitsCheckTimestamp AvatarMixerClientData::getLastOtherA
return TraitsCheckTimestamp();
}
}
void AvatarMixerClientData::cleanupKilledNode(const QUuid& nodeUUID, Node::LocalID nodeLocalID) {
removeLastBroadcastSequenceNumber(nodeUUID);
removeLastBroadcastTime(nodeUUID);
_lastSentTraitsTimestamps.erase(nodeLocalID);
_sentTraitVersions.erase(nodeLocalID);
}

5
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -57,10 +57,7 @@ public:
void setLastBroadcastTime(const QUuid& nodeUUID, uint64_t broadcastTime) { _lastBroadcastTimes[nodeUUID] = broadcastTime; }
Q_INVOKABLE void removeLastBroadcastTime(const QUuid& nodeUUID) { _lastBroadcastTimes.erase(nodeUUID); }
Q_INVOKABLE void cleanupKilledNode(const QUuid& nodeUUID) {
removeLastBroadcastSequenceNumber(nodeUUID);
removeLastBroadcastTime(nodeUUID);
}
Q_INVOKABLE void cleanupKilledNode(const QUuid& nodeUUID, Node::LocalID nodeLocalID);
uint16_t getLastReceivedSequenceNumber() const { return _lastReceivedSequenceNumber; }