From 38a3ee410455020e17bc8da695758c4742ac475c Mon Sep 17 00:00:00 2001 From: David Kelly Date: Fri, 23 Dec 2016 14:14:45 -0800 Subject: [PATCH] Some code review feedback more to come --- assignment-client/src/avatars/AvatarMixer.cpp | 8 ++++++-- libraries/networking/src/NodeList.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index fdb6b10cab..27be882c6e 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -207,9 +207,13 @@ void AvatarMixer::broadcastAvatarData() { // use the data rate specifically for avatar data for FRD adjustment checks float avatarDataRateLastSecond = nodeData->getOutboundAvatarDataKbps(); - // send extra data that is otherwise surpressed + // When this is true, the AvatarMixer will send Avatar data to a client about avatars that are not in the view frustrum bool getsOutOfView = nodeData->getRequestsDomainListData(); - bool getsIgnoredByMe = nodeData->getRequestsDomainListData(); + + // When this is true, the AvatarMixer will send Avatar data to a client about avatars that they've ignored + bool getsIgnoredByMe = getsOutOfView; + + // When this is true, the AvatarMixer will send Avatar data to a client about avatars that have ignored them bool getsAnyIgnored = getsIgnoredByMe && node->getCanKick(); // Check if it is time to adjust what we send this client based on the observed diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 6905feb370..b1d7f0b5fc 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -812,7 +812,7 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID) { } void NodeList::unignoreNodeBySessionID(const QUuid& nodeID) { - // enumerate the nodes to send a reliable ignore packet to each that can leverage it + // enumerate the nodes to send a reliable unignore packet to each that can leverage it if (!nodeID.isNull() && _sessionUUID != nodeID) { eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool { if (node->getType() == NodeType::AudioMixer || node->getType() == NodeType::AvatarMixer) { @@ -821,7 +821,7 @@ void NodeList::unignoreNodeBySessionID(const QUuid& nodeID) { return false; } }, [&nodeID, this](const SharedNodePointer& destinationNode) { - // create a reliable NLPacket with space for the ignore UUID + // create a reliable NLPacket with space for the unignore UUID auto ignorePacket = NLPacket::create(PacketType::NodeUnignoreRequest, NUM_BYTES_RFC4122_UUID, true); // write the node ID to the packet @@ -829,7 +829,7 @@ void NodeList::unignoreNodeBySessionID(const QUuid& nodeID) { qCDebug(networking) << "Sending packet to unignore node" << uuidStringWithoutCurlyBraces(nodeID); - // send off this ignore packet reliably to the matching node + // send off this unignore packet reliably to the matching node sendPacket(std::move(ignorePacket), *destinationNode); }); @@ -977,4 +977,4 @@ void NodeList::setRequestsDomainListData(bool isRequesting) { qDebug() << "HRS FIXME sending RequestsDomainListData packet" << isRequesting; }); _requestsDomainListData = isRequesting; -} \ No newline at end of file +}