Base air absorption on the distance attenuation

1 files changed, 11 insertions, 11 deletions

diff --git a/Alc/ALu.c b/Alc/ALu.c
index c2ff4d57..16ad0d5a 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -628,20 +628,20 @@ static ALvoid CalcSourceParams(const ALCcontext *ALContext, ALsource *ALSource,
     }
 
     // Distance-based air absorption
-    if(ALSource->AirAbsorptionFactor > 0.0f && ALSource->DistanceModel != AL_NONE)
+    if(ALSource->AirAbsorptionFactor > 0.0f)
     {
-        ALfloat dist = Distance-MinDist;
+        ALfloat amount = AIRABSORBGAINDBHF * ALSource->AirAbsorptionFactor *
+                         MetersPerUnit;
         ALfloat absorb;
 
-        if(dist < 0.0f) dist = 0.0f;
-        // Absorption calculation is done in dB
-        absorb = (ALSource->AirAbsorptionFactor*AIRABSORBGAINDBHF) *
-                 (dist*MetersPerUnit);
-        // Convert dB to linear gain before applying
-        absorb = pow(10.0, absorb/20.0);
-        DryGainHF *= absorb;
-        for(i = 0;i < MAX_SENDS;i++)
-            WetGainHF[i] *= absorb;
+        // Convert a -6dB rolloff into a -0.05dB rolloff
+        absorb = pow(10.0f, log10(flAttenuation) * amount / -6.0f);
+        if(absorb < 1.0f)
+        {
+            DryGainHF *= absorb;
+            for(i = 0;i < MAX_SENDS;i++)
+                WetGainHF[i] *= absorb;
+        }
     }
 
     //3. Apply directional soundcones