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

CR feedback

Browse source
This commit is contained in:
ZappoMan 2017-04-21 11:14:47 -07:00
parent ff45ad53a3
commit 088cdae320
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,7 +404,7 @@ void AvatarMixer::handleAvatarIdentityPacket(QSharedPointer<ReceivedMessage> 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;

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

@ -1454,7 +1454,7 @@ QStringList AvatarData::getJointNames() const {
return _jointNames;
}
void AvatarData::parseAvatarIdentityPacket(const QSharedPointer<ReceivedMessage>& message, Identity& identityOut, quint64& messageNumberOut) {
void AvatarData::parseAvatarIdentityPacket(const QSharedPointer<ReceivedMessage>& 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<quint64>::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;

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

@ -532,11 +532,11 @@ public:
AvatarEntityMap avatarEntityData;
};
static void parseAvatarIdentityPacket(const QSharedPointer<ReceivedMessage>& message, Identity& identityOut, quint64& messageNumberOut);
static void parseAvatarIdentityPacket(const QSharedPointer<ReceivedMessage>& 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);

2
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -127,7 +127,7 @@ AvatarSharedPointer AvatarHashMap::parseAvatarData(QSharedPointer<ReceivedMessag
void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> 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

2
libraries/networking/src/ReceivedMessage.h
View file

@ -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; }