Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove debugging code

Browse source
This commit is contained in:
Roxanne Skelly 2019-01-05 14:04:26 -08:00
parent 9e887585fa
commit 0a76554d57
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,25 +330,19 @@ void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage>
void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) { void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {
AvatarTraits::TraitMessageSequence seq; AvatarTraits::TraitMessageSequence seq;
if (message->getBytesLeftToRead() > sizeof(AvatarTraits::TraitMessageSequence)) { message->readPrimitive(&seq);
message->readPrimitive(&seq);
auto traitsAckPacket = NLPacket::create(PacketType::BulkAvatarTraitsAck, sizeof(AvatarTraits::TraitMessageSequence), true); auto traitsAckPacket = NLPacket::create(PacketType::BulkAvatarTraitsAck, sizeof(AvatarTraits::TraitMessageSequence), true);
traitsAckPacket->writePrimitive(seq); traitsAckPacket->writePrimitive(seq);
auto nodeList = DependencyManager::get<LimitedNodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();
SharedNodePointer avatarMixer = nodeList->soloNodeOfType(NodeType::AvatarMixer); SharedNodePointer avatarMixer = nodeList->soloNodeOfType(NodeType::AvatarMixer);
if (!avatarMixer.isNull()) { if (!avatarMixer.isNull()) {
// we have a mixer to send to, acknowledge that we received these // we have a mixer to send to, acknowledge that we received these
// traits. // traits.
nodeList->sendPacket(std::move(traitsAckPacket), *avatarMixer); nodeList->sendPacket(std::move(traitsAckPacket), *avatarMixer);
}
}
else {
qWarning() << "No BulkAvatarTraits packet sequence number.";
return;
} }
while (message->getBytesLeftToRead() >= NUM_BYTES_RFC4122_UUID + sizeof(AvatarTraits::TraitType)) { while (message->getBytesLeftToRead()) {
// read the avatar ID to figure out which avatar this is for // read the avatar ID to figure out which avatar this is for
auto avatarID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); auto avatarID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
@ -413,9 +407,6 @@ void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> mess
message->readPrimitive(&traitType); message->readPrimitive(&traitType);
} }
} }
if (message->getBytesLeftToRead() > 0) {
qWarning() << "Leftover bytes in BulkAvatarTraits message";
}
} }
void AvatarHashMap::processKillAvatar(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) { void AvatarHashMap::processKillAvatar(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {