qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2024-11-21 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

almost there. phase lerping is a bit borked (somehow does it completely wrong),

Browse source 
but I'll get that sorted :) BTW, should be effectively disabled if
snd_phasesep is 0
This commit is contained in:
Bill Currie 2000-10-11 23:14:27 +00:00
parent 7f1c1bb241
commit 998b736326
2 changed files with 65 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/snd_dma.c
View file

@ -781,6 +781,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
{
if (!ch->sfx)
continue;
ch->oldphase = ch->phase; // prepare to lerp from prev to next phase
SND_Spatialize(ch); // respatialize channel
if (!ch->leftvol && !ch->rightvol)
continue;

87
source/snd_mix.c
View file

@ -31,6 +31,7 @@
#endif
#include "sound.h"
#include "compat.h"
#ifdef _WIN32
#include "winquake.h"
@ -392,37 +393,77 @@ void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
{
int data;
int left, right;
int leftvol, rightvol;
signed short *sfx;
int i;
int left_phase, right_phase;
int i = 0;
unsigned int left_phase, right_phase; // never allowed < 0 anyway
int oldphase = ch->oldphase * 2;
int phase = ch->phase * 2;
int dir = (phase - oldphase) > 0 ? 1 : -1;
int ldir;
int rdir;
leftvol = ch->leftvol;
rightvol = ch->rightvol;
if (ch->phase >= 0) {
left_phase = ch->phase;
right_phase = 0;
if (ch->phase > max_overpaint)
max_overpaint = ch->phase;
} else {
left_phase = 0;
right_phase = -ch->phase;
if (-ch->phase > max_overpaint)
max_overpaint = -ch->phase;
}
max_overpaint = max (abs (ch->phase),
max (abs (ch->oldphase), max_overpaint));
sfx = (signed short *)sc->data + ch->pos;
ch->pos += count;
for (i=0 ; i<count ; i++)
{
data = sfx[i];
left = (data * leftvol) >> 8;
right = (data * rightvol) >> 8;
paintbuffer[i+left_phase].left += left;
paintbuffer[i+right_phase].right += right;
if (oldphase >= 0) {
ldir = dir;
rdir = 0;
left_phase = oldphase;
right_phase = 0;
} else {
ldir = 0;
rdir = dir;
left_phase = 0;
right_phase = -oldphase;
}
ch->pos += count;
#define PAINT_CHANNELS do { \
int data = sfx[i]; \
int left = (data * leftvol) >> 8; \
int right = (data * rightvol) >> 8; \
paintbuffer[i + left_phase / 2].left += left; \
paintbuffer[i + right_phase / 2].right += right;\
} while (0)
if (oldphase != phase) {
int c;
if ((oldphase ^ phase) & ~((~0u)>>1)) {
// phase change crosses 0
int t;
c = min (count, abs(oldphase));
count -= c;
for ( ; c; c--, i++) {
PAINT_CHANNELS;
left_phase += ldir;
right_phase += rdir;
}
t = ldir;
ldir = rdir & 1;
rdir = t & 1;
oldphase = 0;
}
// oldphase and phase [now] on same size of 0
c = min (count, abs (phase - oldphase));
count -= c;
for ( ; c; c--, i++) {
PAINT_CHANNELS;
left_phase += ldir;
right_phase += rdir;
}
}
for (; count ; count--, i++) {
PAINT_CHANNELS;
}
#undef PAINT_CHANNELS
}