From 448a522b7047c6a98fdb7efc8ab0cb00b35adb34 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 7 Jun 2018 13:29:33 -0700 Subject: [PATCH] MS15673: Do some experiments on bubble size --- assignment-client/src/audio/AudioMixerClientData.cpp | 3 ++- assignment-client/src/avatars/AvatarMixerSlave.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index d4d4f847ee..0ac28c5e70 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -625,7 +625,8 @@ AudioMixerClientData::IgnoreZone& AudioMixerClientData::IgnoreZoneMemo::get(unsi } // quadruple the scale (this is arbitrary number chosen for comfort) - const float IGNORE_BOX_SCALE_FACTOR = 4.0f; + // For testing purposes, this number isn't 4.0f. + const float IGNORE_BOX_SCALE_FACTOR = 2.4f; scale *= IGNORE_BOX_SCALE_FACTOR; // create the box (we use a box for the zone for convenience) diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index 984884adb2..00465f9412 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -272,7 +272,7 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) otherNodeBox.setScaleStayCentered(minBubbleSize); } // Quadruple the scale of both bounding boxes - otherNodeBox.embiggen(4.0f); + otherNodeBox.embiggen(2.4f); // Perform the collision check between the two bounding boxes if (nodeBox.touches(otherNodeBox)) {