From 800389cf20be3f0a002c50cd1ff879d5f80caa2d Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 28 Dec 2016 14:37:19 -0800 Subject: [PATCH] Remove HRS logging --- assignment-client/src/avatars/AvatarMixer.cpp | 4 ---- interface/src/avatar/Avatar.cpp | 5 ----- libraries/avatars/src/AvatarHashMap.cpp | 1 - libraries/networking/src/NodeList.cpp | 1 - 4 files changed, 11 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 6285150070..1de1f093b7 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -347,7 +347,6 @@ void AvatarMixer::broadcastAvatarData() { && (forceSend || otherNodeData->getIdentityChangeTimestamp() > _lastFrameTimestamp || distribution(generator) < IDENTITY_SEND_PROBABILITY)) { - qDebug() << "FIXME HRS sending identity to" << node->getUUID() << "from" << otherNode->getUUID() << "gets mine/all/view:" << getsIgnoredByMe << getsAnyIgnored << getsOutOfView ; sendIdentityPacket(otherNodeData, node); } @@ -417,7 +416,6 @@ void AvatarMixer::broadcastAvatarData() { ? AvatarData::SendAllData : AvatarData::IncludeSmallData; nodeData->incrementAvatarInView(); } - //qDebug() << "FIXME HRS sending" << detail << "to" << node->getUUID() << "from" << otherNode->getUUID(); numAvatarDataBytes += avatarPacketList->write(otherNode->getUUID().toRfc4122()); numAvatarDataBytes += avatarPacketList->write(otherAvatar.toByteArray(detail)); @@ -552,14 +550,12 @@ void AvatarMixer::handleViewFrustumPacket(QSharedPointer messag void AvatarMixer::handleRequestsDomainListDataPacket(QSharedPointer message, SharedNodePointer senderNode) { auto nodeList = DependencyManager::get(); nodeList->getOrCreateLinkedData(senderNode); - qDebug() << "HRS FIXME received RequestsDomainListData packet from" << senderNode->getUUID(); if (senderNode->getLinkedData()) { AvatarMixerClientData* nodeData = dynamic_cast(senderNode->getLinkedData()); if (nodeData != nullptr) { bool isRequesting; message->readPrimitive(&isRequesting); - qDebug() << "HRS FIXME handling RequestsDomainListData packet" << isRequesting << "from" << nodeData->getNodeID(); nodeData->setRequestsDomainListData(isRequesting); } } diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index ed8433aade..1ade21930d 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -296,11 +296,6 @@ void Avatar::updateAvatarEntities() { void Avatar::setShouldDie() { // This will cause the avatar to be shrunk away and removed (the actual Avatar gets removed), but then it comes back. _owningAvatarMixer.clear(); - - // This removes the avatar from physics and makes it shrink away, but does not actualy remvoe Avatar from Avatar Manager. - // FIXME hrs remove, unless it can be made to work cleanly. - // (In which case, this could be on AvatarList/AvatarManager instead, and consider moving pal.js usage to Pal.qml, and removing (un)ignoredNode signalling.) - //DependencyManager::get()->handleRemovedAvatar(AvatarSharedPointer(this), AvatarIgnored); } void Avatar::simulate(float deltaTime) { diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index c0aafa7f2b..c708176da7 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -145,7 +145,6 @@ void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer identity.uuid = EMPTY; } } - qDebug() << "FIXME HRS processing identity packet regarding" << identity.uuid << "ignoring:" << nodeList->isIgnoringNode(identity.uuid) << "reqestsDomainList:" << nodeList->getRequestsDomainListData(); if (!nodeList->isIgnoringNode(identity.uuid) || nodeList->getRequestsDomainListData()) { // mesh URL for a UUID, find avatar in our list auto avatar = newOrExistingAvatar(identity.uuid, sendingNode); diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index b1d7f0b5fc..e745954d88 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -974,7 +974,6 @@ void NodeList::setRequestsDomainListData(bool isRequesting) { auto packet = NLPacket::create(PacketType::RequestsDomainListData, sizeof(bool), true); // reliable packet->writePrimitive(isRequesting); sendPacket(std::move(packet), *destinationNode); - qDebug() << "HRS FIXME sending RequestsDomainListData packet" << isRequesting; }); _requestsDomainListData = isRequesting; }