Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-29 22:00:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update AvatarData packet processing to work with NLPacket

Browse source
This commit is contained in:
Ryan Huffman 2015-07-13 12:07:01 -07:00
parent 591c5d4b60
commit 6a7cd7417c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -867,9 +867,8 @@ void AvatarData::clearJointsData() {
} }
} }
bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) { bool AvatarData::hasIdentityChangedAfterParsing(NLPacket& packet) {
QDataStream packetStream(packet); QDataStream packetStream(&packet);
packetStream.skipRawData(numBytesForPacketHeader(packet));
QUuid avatarUUID; QUuid avatarUUID;
QUrl faceModelURL, skeletonModelURL; QUrl faceModelURL, skeletonModelURL;
@ -911,8 +910,8 @@ QByteArray AvatarData::identityByteArray() {
return identityData; return identityData;
} }
bool AvatarData::hasBillboardChangedAfterParsing(const QByteArray& packet) { bool AvatarData::hasBillboardChangedAfterParsing(NLPacket& packet) {
QByteArray newBillboard = packet.mid(numBytesForPacketHeader(packet)); QByteArray newBillboard = QByteArray(packet.getPayload());
if (newBillboard == _billboard) { if (newBillboard == _billboard) {
return false; return false;
} }

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

@ -47,6 +47,7 @@ typedef unsigned long long quint64;
#include <QReadWriteLock> #include <QReadWriteLock>
#include <CollisionInfo.h> #include <CollisionInfo.h>
#include <NLPacket.h>
#include <Node.h> #include <Node.h>
#include <RegisteredMetaTypes.h> #include <RegisteredMetaTypes.h>
#include <SimpleMovingAverage.h> #include <SimpleMovingAverage.h>
@ -260,10 +261,10 @@ public:
return false; return false;
} }
bool hasIdentityChangedAfterParsing(const QByteArray& packet); bool hasIdentityChangedAfterParsing(NLPacket& packet);
QByteArray identityByteArray(); QByteArray identityByteArray();
bool hasBillboardChangedAfterParsing(const QByteArray& packet); bool hasBillboardChangedAfterParsing(NLPacket& packet);
const QUrl& getFaceModelURL() const { return _faceModelURL; } const QUrl& getFaceModelURL() const { return _faceModelURL; }
QString getFaceModelURLString() const { return _faceModelURL.toString(); } QString getFaceModelURLString() const { return _faceModelURL.toString(); }