wire up bandwidth buget to sorting

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -213,11 +213,15 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
 
         });
         /*
-        qDebug() << "------------------------------";
         qDebug() << "avatarList.size:" << avatarList.size();
         qDebug() << "avatarDataToNodes.size:" << avatarDataToNodes.size();
         */
 
+        //qDebug() << "------------------------------";
+        AvatarSharedPointer thisAvatar = nodeData->getAvatarSharedPointer();
+
+        //qDebug() << "thisAvatar:" << thisAvatar.get();
+
         ViewFrustum cameraView = nodeData->getViewFrustom();
         std::priority_queue<AvatarPriority> sortedAvatars = AvatarData::sortAvatars(
                 avatarList, cameraView,
@@ -230,10 +234,10 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                     return 0; // ???
                 },
 
-                [this](AvatarSharedPointer avatar)->bool{
+                [thisAvatar](AvatarSharedPointer avatar)->bool{
-                    // FIXME -- when to ignore this node
+                    return (avatar == thisAvatar); // ignore ourselves...
-                    return false;
                 });
+        //qDebug() << "------------------------------";
 
 
         // this is an AGENT we have received head data from
@@ -269,6 +273,7 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                 || (otherNode->isIgnoringNodeWithID(node->getUUID()) && !getsAnyIgnored)) {
 
                 shouldConsider = false;
+                //qDebug() << "shouldConsider = false ... line:" << __LINE__;
 
             } else {
                 const AvatarMixerClientData* otherData = reinterpret_cast<AvatarMixerClientData*>(otherNode->getLinkedData());
@@ -304,6 +309,8 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                     if (nodeBox.touches(otherNodeBox)) {
                         nodeData->ignoreOther(node, otherNode);
                         shouldConsider = getsAnyIgnored;
+                        //qDebug() << "shouldConsider = getsAnyIgnored " << getsAnyIgnored << " ... line:" << __LINE__;
+
                     }
                 }
                 // Not close enough to ignore
@@ -352,12 +359,13 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                 //       are out of view, this also appears to disable this random distribution.
                 if (distanceToAvatar != 0.0f
                     && !getsOutOfView
-                    //  -- && distribution(generator) > (nodeData->getFullRateDistance() / distanceToAvatar) /// FIX ME... no longer doing random
+                    && distribution(generator) > (nodeData->getFullRateDistance() / distanceToAvatar) /// FIX ME... we don't want to do this random stuff
                 ) {
 
                     quint64 endAvatarDataPacking = usecTimestampNow();
                     _stats.avatarDataPackingElapsedTime += (endAvatarDataPacking - startAvatarDataPacking);
                     shouldConsider = false;
+                    //qDebug() << "shouldConsider = false ... line:" << __LINE__;
                 }
 
                 if (shouldConsider) {
@@ -380,7 +388,9 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                         quint64 endAvatarDataPacking = usecTimestampNow();
                         _stats.avatarDataPackingElapsedTime += (endAvatarDataPacking - startAvatarDataPacking);
                         shouldConsider = false;
-                    } else if (lastSeqFromSender - lastSeqToReceiver > 1) {
+                        //qDebug() << "shouldConsider = false ... line:" << __LINE__;
+                    }
+                    else if (lastSeqFromSender - lastSeqToReceiver > 1) {
                         // this is a skip - we still send the packet but capture the presence of the skip so we see it happening
                         ++numAvatarsWithSkippedFrames;
                     }
@@ -399,6 +409,7 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
 
                             _stats.avatarDataPackingElapsedTime += (endAvatarDataPacking - startAvatarDataPacking);
                             shouldConsider = false;
+                            //qDebug() << "shouldConsider = false ... line:" << __LINE__;
                         }
 
                         if (shouldConsider) {

libraries/avatars/src/AvatarData.cpp

@@ -2367,6 +2367,8 @@ std::priority_queue<AvatarPriority> AvatarData::sortAvatars(
                     priority += OUT_OF_VIEW_PENALTY;
                 }
             }
+
+            //qDebug() << "avatar:" << avatar.get() << "priority:" << priority << "apparentSize:" << apparentSize << "cosineAngle:" << cosineAngle << "age:" << age;
             sortedAvatars.push(AvatarPriority(avatar, priority));
         }
     }

scripts/developer/debugging/debugAvatarMixer.js

@@ -58,11 +58,14 @@ function updateOverlays() {
 
             // setup a position for the overlay that is just above this avatar's head
             var overlayPosition = avatar.getJointPosition("Head");
-            overlayPosition.y += 1.05;
+            overlayPosition.y += 1.15;
+
+            var rows = 8;
 
             var text = avatarID + "\n"
                        +"--- Data from Mixer ---\n"
                        +"All: " + AvatarManager.getAvatarDataRate(avatarID).toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID).toFixed(2) + "hz)" + "\n"
+                       /*
                        +" GP: " + AvatarManager.getAvatarDataRate(avatarID,"globalPosition").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"globalPosition").toFixed(2) + "hz)" + "\n"
                        +" LP: " + AvatarManager.getAvatarDataRate(avatarID,"localPosition").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"localPosition").toFixed(2) + "hz)" + "\n"
                        +" BB: " + AvatarManager.getAvatarDataRate(avatarID,"avatarBoundingBox").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"avatarBoundingBox").toFixed(2) + "hz)" + "\n"
@@ -74,11 +77,12 @@ function updateOverlays() {
                        +" AF: " + AvatarManager.getAvatarDataRate(avatarID,"additionalFlags").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"additionalFlags").toFixed(2) + "hz)" + "\n"
                        +" PI: " + AvatarManager.getAvatarDataRate(avatarID,"parentInfo").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"parentInfo").toFixed(2) + "hz)" + "\n"
                        +" FT: " + AvatarManager.getAvatarDataRate(avatarID,"faceTracker").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"faceTracker").toFixed(2) + "hz)" + "\n"
+                       */
                        +" JD: " + AvatarManager.getAvatarDataRate(avatarID,"jointData").toFixed(2) + "kbps (" + AvatarManager.getAvatarUpdateRate(avatarID,"jointData").toFixed(2) + "hz)" + "\n"
                        +"--- Simulation ---\n"
                        +"All: " + AvatarManager.getAvatarSimulationRate(avatarID,"avatar").toFixed(2) + "hz \n"
                        +" inView: " + AvatarManager.getAvatarSimulationRate(avatarID,"avatarInView").toFixed(2) + "hz \n"
-                       +" SM: " + AvatarManager.getAvatarSimulationRate(avatarID,"skeletonModel").toFixed(2) + "hz \n"
+                       //+" SM: " + AvatarManager.getAvatarSimulationRate(avatarID,"skeletonModel").toFixed(2) + "hz \n"
                        +" JD: " + AvatarManager.getAvatarSimulationRate(avatarID,"jointData").toFixed(2) + "hz \n"
 
             if (avatarID in debugOverlays) {
@@ -93,7 +97,7 @@ function updateOverlays() {
                     position: overlayPosition,
                     dimensions: {
                         x: 1.25,
-                        y: 19 * 0.13
+                        y: rows * 0.13
                     },
                     lineHeight: 0.1,
                     font:{size:0.1},