cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-04-24 18:49:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert to linear falloff

Browse source
This commit is contained in:
arQon 2016-12-19 08:20:25 -08:00
parent f327428475
commit 047f312ea7
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/client/snd_dma.cpp
View file

@ -36,7 +36,6 @@ static char s_backgroundLoop[MAX_QPATH];
static const float SOUND_MAX_DIST = 1250; static const float SOUND_MAX_DIST = 1250;
static const float SOUND_FALLOFF = 1.414f;
static const int MASTER_VOL = 127; static const int MASTER_VOL = 127;
@ -262,7 +261,7 @@ static void S_SpatializeOrigin( const vec3_t origin, int master_vol, int* left_v
{ {
vec_t dot; vec_t dot;
vec_t dist; vec_t dist;
vec_t lscale, rscale, scale; vec_t lscale, rscale;
vec3_t source_vec; vec3_t source_vec;
vec3_t vec; vec3_t vec;
@ -276,10 +275,11 @@ static void S_SpatializeOrigin( const vec3_t origin, int master_vol, int* left_v
} }
dist *= (1.0f / SOUND_MAX_DIST); dist *= (1.0f / SOUND_MAX_DIST);
vec_t scale = master_vol * (1.0f - dist);
// attenuate correctly even if we can't spatialise // attenuate correctly even if we can't spatialise
if (dma.channels == 1) { if (dma.channels == 1) {
*left_vol = *right_vol = master_vol * pow(1.0f - dist, SOUND_FALLOFF); *left_vol = *right_vol = scale;
return; return;
} }
@ -295,8 +295,6 @@ static void S_SpatializeOrigin( const vec3_t origin, int master_vol, int* left_v
lscale = 0; lscale = 0;
} }
scale = master_vol * pow(1.0f - dist, SOUND_FALLOFF);
*right_vol = scale * rscale; *right_vol = scale * rscale;
if (*right_vol < 0) if (*right_vol < 0)
*right_vol = 0; *right_vol = 0;