summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-05-11 13:59:55 -0700
committerRichard Linden <none@none>2010-05-11 13:59:55 -0700
commit889fa5e55db250a9da3fc95f4ea816ad4cb655c9 (patch)
tree9428bab9676290671dc53f9eb6f3517e4e9ef3e8 /indra/newview
parent3d8eebdb912edf1fa75f8ebfbe3dd17c51d755a2 (diff)
converted media volume falloff to proper 1/x^2 function
reviewed by leyla
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 1f6687bd83..4db05e8a98 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1934,13 +1934,13 @@ void LLViewerMediaImpl::updateVolume()
}
else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin"))
{
- // attenuated_volume = v / ( 1 + (roll_off_rate * (d - min))^2
+ // attenuated_volume = 1 / (roll_off_rate * (d - min))^2
// the +1 is there so that for distance 0 the volume stays the same
F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin");
F64 attenuation = gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance;
- attenuation = attenuation * attenuation;
+ attenuation = 1.0 / (attenuation * attenuation);
// the attenuation multiplier should never be more than one since that would increase volume
- volume = volume * llmin(1.0, 1 /(attenuation + 1));
+ volume = volume * llmin(1.0, attenuation);
}
}