From 378f3deb1a920eee7a42847886601e08c209d3ed Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 5 Jun 2013 17:37:07 -0700 Subject: [PATCH] constantize some more of the effect mix calculations --- audio-mixer/src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 3fe11e2ee5..9b6d6032ef 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -243,15 +243,15 @@ int main(int argc, const char* argv[]) { const float MAX_EXPONENT = logf(MAX_REVERB_DISTANCE) / logf(WETNESS_DOUBLING_DISTANCE_FACTOR); const int MAX_EXPONENT_INT = floorf(MAX_EXPONENT); - float DISTANCE_REVERB_LOG_REMAINDER = fmodf(MAX_EXPONENT, MAX_EXPONENT_INT); - + const float DISTANCE_REVERB_LOG_REMAINDER = fmodf(MAX_EXPONENT, MAX_EXPONENT_INT); const float DISTANCE_REVERB_MAX_WETNESS = 1.0f; + const float EFFECT_MIX_RHS = DISTANCE_REVERB_MAX_WETNESS / powf(WETNESS_DOUBLING_DISTANCE_FACTOR, + MAX_EXPONENT_INT); float effectMix = powf(WETNESS_CALC_EXPONENT_BASE, (0.5f * logf(distanceSquareToSource) / logf(WETNESS_CALC_EXPONENT_BASE)) - DISTANCE_REVERB_LOG_REMAINDER); - effectMix *= DISTANCE_REVERB_MAX_WETNESS / (powf(WETNESS_DOUBLING_DISTANCE_FACTOR, - MAX_EXPONENT_INT)); + effectMix *= EFFECT_MIX_RHS; otherAgentFreeVerb->setEffectMix(effectMix); }