Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename _sequenceNumber to _lastSequenceNumber

Browse source
This commit is contained in:
Stephen Birarda 2017-06-22 11:23:58 -07:00
parent 42cceb02a4
commit ccbae07170
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/avatars/src/AvatarData.cpp
View file

@ -1496,13 +1496,13 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
udt::SequenceNumber incomingSequenceNumber(incomingSequenceNumberType); udt::SequenceNumber incomingSequenceNumber(incomingSequenceNumberType);
if (!_hasProcessedFirstIdentity) { if (!_hasProcessedFirstIdentity) {
_sequenceNumber = incomingSequenceNumber - 1; _identitySequenceNumber = incomingSequenceNumber - 1;
_hasProcessedFirstIdentity = true; _hasProcessedFirstIdentity = true;
qCDebug(avatars) << "Processing first identity packet for" << avatarSessionID << "-" qCDebug(avatars) << "Processing first identity packet for" << avatarSessionID << "-"
<< (udt::SequenceNumber::Type) incomingSequenceNumber; << (udt::SequenceNumber::Type) incomingSequenceNumber;
} }
if (incomingSequenceNumber > _sequenceNumber) { if (incomingSequenceNumber > _identitySequenceNumber) {
Identity identity; Identity identity;
packetStream >> identity.skeletonModelURL packetStream >> identity.skeletonModelURL
@ -1512,7 +1512,7 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
>> identity.avatarEntityData; >> identity.avatarEntityData;
// set the store identity sequence number to match the incoming identity // set the store identity sequence number to match the incoming identity
_sequenceNumber = incomingSequenceNumber; _identitySequenceNumber = incomingSequenceNumber;
if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) { if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) {
setSkeletonModelURL(identity.skeletonModelURL); setSkeletonModelURL(identity.skeletonModelURL);
@ -1555,7 +1555,7 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
} else { } else {
qCDebug(avatars) << "Refusing to process identity for" << uuidStringWithoutCurlyBraces(avatarSessionID) << "since" qCDebug(avatars) << "Refusing to process identity for" << uuidStringWithoutCurlyBraces(avatarSessionID) << "since"
<< (udt::SequenceNumber::Type) _sequenceNumber << (udt::SequenceNumber::Type) _identitySequenceNumber
<< "is >=" << (udt::SequenceNumber::Type) incomingSequenceNumber; << "is >=" << (udt::SequenceNumber::Type) incomingSequenceNumber;
#endif #endif
} }
@ -1571,7 +1571,7 @@ QByteArray AvatarData::identityByteArray() const {
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
identityStream << getSessionUUID() identityStream << getSessionUUID()
<< (udt::SequenceNumber::Type) _sequenceNumber << (udt::SequenceNumber::Type) _identitySequenceNumber
<< urlToSend << urlToSend
<< _attachmentData << _attachmentData
<< _displayName << _displayName
@ -1755,7 +1755,7 @@ void AvatarData::sendIdentityPacket() {
if (_identityDataChanged) { if (_identityDataChanged) {
// if the identity data has changed, push the sequence number forwards // if the identity data has changed, push the sequence number forwards
++_sequenceNumber; ++_identitySequenceNumber;
} }
QByteArray identityData = identityByteArray(); QByteArray identityData = identityByteArray();

4
libraries/avatars/src/AvatarData.h
View file

@ -625,7 +625,7 @@ public:
bool getIdentityDataChanged() const { return _identityDataChanged; } // has the identity data changed since the last time sendIdentityPacket() was called bool getIdentityDataChanged() const { return _identityDataChanged; } // has the identity data changed since the last time sendIdentityPacket() was called
void markIdentityDataChanged() { _identityDataChanged = true; } void markIdentityDataChanged() { _identityDataChanged = true; }
void pushIdentitySequenceNumber() { ++_sequenceNumber; }; void pushIdentitySequenceNumber() { ++_identitySequenceNumber; };
float getDensity() const { return _density; } float getDensity() const { return _density; }
@ -783,7 +783,7 @@ protected:
float _audioAverageLoudness { 0.0f }; float _audioAverageLoudness { 0.0f };
bool _identityDataChanged { false }; bool _identityDataChanged { false };
udt::SequenceNumber _sequenceNumber { 0 }; udt::SequenceNumber _identitySequenceNumber { 0 };
bool _hasProcessedFirstIdentity { false }; bool _hasProcessedFirstIdentity { false };
float _density; float _density;