From 448a522b7047c6a98fdb7efc8ab0cb00b35adb34 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 7 Jun 2018 13:29:33 -0700 Subject: [PATCH 1/4] 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)) { From f7de3cf218d50eb106179a7d7ee69c4626795731 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 7 Jun 2018 14:45:33 -0700 Subject: [PATCH 2/4] Try a value of 1.8 --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixerSlave.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 0ac28c5e70..08bbf5dc55 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -626,7 +626,7 @@ AudioMixerClientData::IgnoreZone& AudioMixerClientData::IgnoreZoneMemo::get(unsi // quadruple the scale (this is arbitrary number chosen for comfort) // For testing purposes, this number isn't 4.0f. - const float IGNORE_BOX_SCALE_FACTOR = 2.4f; + const float IGNORE_BOX_SCALE_FACTOR = 1.8f; 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 00465f9412..cadc65edb1 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(2.4f); + otherNodeBox.embiggen(1.8f); // Perform the collision check between the two bounding boxes if (nodeBox.touches(otherNodeBox)) { From 76b5dae72185bba0f44bf1899b79eb67ebd18356 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 8 Jun 2018 10:19:55 -0700 Subject: [PATCH 3/4] Let's try 20% --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixerSlave.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 08bbf5dc55..a552799933 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -626,7 +626,7 @@ AudioMixerClientData::IgnoreZone& AudioMixerClientData::IgnoreZoneMemo::get(unsi // quadruple the scale (this is arbitrary number chosen for comfort) // For testing purposes, this number isn't 4.0f. - const float IGNORE_BOX_SCALE_FACTOR = 1.8f; + const float IGNORE_BOX_SCALE_FACTOR = 0.8f; 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 cadc65edb1..fa81ceb546 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(1.8f); + otherNodeBox.embiggen(0.8f); // Perform the collision check between the two bounding boxes if (nodeBox.touches(otherNodeBox)) { From 688d82b286cebba8c00c5126f3cd8b15f149f746 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 11 Jun 2018 13:23:41 -0700 Subject: [PATCH 4/4] Go back to 60% --- assignment-client/src/audio/AudioMixerClientData.cpp | 5 ++--- assignment-client/src/avatars/AvatarMixerSlave.cpp | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index a552799933..bc08c6f24a 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -624,9 +624,8 @@ AudioMixerClientData::IgnoreZone& AudioMixerClientData::IgnoreZoneMemo::get(unsi scale = MIN_IGNORE_BOX_SCALE; } - // quadruple the scale (this is arbitrary number chosen for comfort) - // For testing purposes, this number isn't 4.0f. - const float IGNORE_BOX_SCALE_FACTOR = 0.8f; + // (this is arbitrary number determined empirically for comfort) + 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 fa81ceb546..b6fe765287 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -271,8 +271,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) if (glm::any(glm::lessThan(otherNodeBoxScale, minBubbleSize))) { otherNodeBox.setScaleStayCentered(minBubbleSize); } - // Quadruple the scale of both bounding boxes - otherNodeBox.embiggen(0.8f); + // Change the scale of both bounding boxes + // (This is an arbitrary number determined empirically) + otherNodeBox.embiggen(2.4f); // Perform the collision check between the two bounding boxes if (nodeBox.touches(otherNodeBox)) {