From 088cdae320533494a97db424d20892359a2d9c4f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 21 Apr 2017 11:14:47 -0700 Subject: [PATCH] CR feedback --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- libraries/avatars/src/AvatarData.cpp | 8 +++----- libraries/avatars/src/AvatarData.h | 6 +++--- libraries/avatars/src/AvatarHashMap.cpp | 2 +- libraries/networking/src/ReceivedMessage.h | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 6e163e6d0b..532452a12d 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -404,7 +404,7 @@ void AvatarMixer::handleAvatarIdentityPacket(QSharedPointer mes // parse the identity packet and update the change timestamp if appropriate AvatarData::Identity identity; - quint64 messageNumber; + udt::Packet::MessageNumber messageNumber; AvatarData::parseAvatarIdentityPacket(message, identity, messageNumber); bool identityChanged = false; bool displayNameChanged = false; diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index f541610ae9..4e9264829f 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1454,7 +1454,7 @@ QStringList AvatarData::getJointNames() const { return _jointNames; } -void AvatarData::parseAvatarIdentityPacket(const QSharedPointer& message, Identity& identityOut, quint64& messageNumberOut) { +void AvatarData::parseAvatarIdentityPacket(const QSharedPointer& message, Identity& identityOut, udt::Packet::MessageNumber& messageNumberOut) { const QByteArray& data = message->getMessage(); messageNumberOut = message->getMessageNumber(); QDataStream packetStream(data); @@ -1478,11 +1478,9 @@ QUrl AvatarData::cannonicalSkeletonModelURL(const QUrl& emptyURL) const { return _skeletonModelURL.scheme() == "file" ? emptyURL : _skeletonModelURL; } -void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, quint64 messageNumber) { - - if (messageNumber < _lastIdentityPacketMessageNumber && - _lastIdentityPacketMessageNumber < std::numeric_limits::max()) { +void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, udt::Packet::MessageNumber messageNumber) { + if (messageNumber < _lastIdentityPacketMessageNumber) { qCDebug(avatars) << "Ignoring late identity packet for avatar " << getSessionUUID() << "messageNumber:" << messageNumber << "_lastIdentityPacketMessageNumber:" << _lastIdentityPacketMessageNumber; return; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 2ffa3c020c..fdf3f0530c 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -532,11 +532,11 @@ public: AvatarEntityMap avatarEntityData; }; - static void parseAvatarIdentityPacket(const QSharedPointer& message, Identity& identityOut, quint64& messageNumberOut); + static void parseAvatarIdentityPacket(const QSharedPointer& message, Identity& identityOut, udt::Packet::MessageNumber& messageNumberOut); // identityChanged returns true if identity has changed, false otherwise. // displayNameChanged returns true if displayName has changed, false otherwise. - void processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, quint64 messageNumber); + void processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, udt::Packet::MessageNumber messageNumber); QByteArray identityByteArray() const; @@ -778,7 +778,7 @@ protected: quint64 _audioLoudnessChanged { 0 }; float _audioAverageLoudness { 0.0f }; - quint64 _lastIdentityPacketMessageNumber { 0 }; + udt::Packet::MessageNumber _lastIdentityPacketMessageNumber{ 0 }; private: friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar); diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index c4aa6c8479..c4cd303360 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -127,7 +127,7 @@ AvatarSharedPointer AvatarHashMap::parseAvatarData(QSharedPointer message, SharedNodePointer sendingNode) { AvatarData::Identity identity; - quint64 messageNumber; + udt::Packet::MessageNumber messageNumber; AvatarData::parseAvatarIdentityPacket(message, identity, messageNumber); // make sure this isn't for an ignored avatar diff --git a/libraries/networking/src/ReceivedMessage.h b/libraries/networking/src/ReceivedMessage.h index ba61ef7044..4787c849a2 100644 --- a/libraries/networking/src/ReceivedMessage.h +++ b/libraries/networking/src/ReceivedMessage.h @@ -50,7 +50,7 @@ public: qint64 getBytesLeftToRead() const { return _data.size() - _position; } - qint64 getMessageNumber() const { return _messageNumber; } + udt::Packet::MessageNumber getMessageNumber() const { return _messageNumber; } void seek(qint64 position) { _position = position; }