Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Go back to 60%

Browse source
This commit is contained in:
Zach Fox 2018-06-11 13:23:41 -07:00
parent dbd10cc2f0
commit 688d82b286
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -624,9 +624,8 @@ AudioMixerClientData::IgnoreZone& AudioMixerClientData::IgnoreZoneMemo::get(unsi
scale = MIN_IGNORE_BOX_SCALE; scale = MIN_IGNORE_BOX_SCALE;
} }
// quadruple the scale (this is arbitrary number chosen for comfort) // (this is arbitrary number determined empirically 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 = 0.8f;
scale *= IGNORE_BOX_SCALE_FACTOR; scale *= IGNORE_BOX_SCALE_FACTOR;
// create the box (we use a box for the zone for convenience) // create the box (we use a box for the zone for convenience)

5
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -271,8 +271,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
if (glm::any(glm::lessThan(otherNodeBoxScale, minBubbleSize))) { if (glm::any(glm::lessThan(otherNodeBoxScale, minBubbleSize))) {
otherNodeBox.setScaleStayCentered(minBubbleSize); otherNodeBox.setScaleStayCentered(minBubbleSize);
} }
// Quadruple the scale of both bounding boxes // Change the scale of both bounding boxes
otherNodeBox.embiggen(0.8f); // (This is an arbitrary number determined empirically)
otherNodeBox.embiggen(2.4f);
// Perform the collision check between the two bounding boxes // Perform the collision check between the two bounding boxes
if (nodeBox.touches(otherNodeBox)) { if (nodeBox.touches(otherNodeBox)) {