#include "quakedef.h"
-#ifdef _WIN32
+#ifdef USE_DSOUND
#include <windows.h>
#include <dsound.h>
extern DWORD gSndBufSize;
volatile dma_t *shm = 0;
volatile dma_t sn;
-vec3_t listener_vieworigin;
-vec3_t listener_viewforward;
-vec3_t listener_viewleft;
-vec3_t listener_viewup;
+vec3_t listener_origin;
+matrix4x4_t listener_matrix;
vec_t sound_nominal_clip_dist=1000.0;
mempool_t *snd_mempool;
Cvar_RegisterVariable(&bgmvolume);
Cvar_RegisterVariable(&snd_staticvolume);
+// COMMANDLINEOPTION: Sound: -nosound disables sound (including CD audio)
if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
return;
- snd_mempool = Mem_AllocPool("sound");
+ snd_mempool = Mem_AllocPool("sound", 0, NULL);
+// COMMANDLINEOPTION: Sound: -simsound runs sound mixing but with no output
if (COM_CheckParm("-simsound"))
fakedma = true;
}
// calculate stereo seperation and distance attenuation
- VectorSubtract(ch->origin, listener_vieworigin, source_vec);
+ Matrix4x4_Transform(&listener_matrix, ch->origin, source_vec);
dist = VectorNormalizeLength(source_vec);
// distance
scale = ch->master_vol * (1.0 - (dist * ch->dist_mult));
// panning
- pan = scale * DotProduct(listener_viewleft, source_vec);
+ pan = scale * source_vec[1];
// calculate the volumes
ch->leftvol = (int) (scale + pan);
ch->rightvol = (int) (scale - pan);
else
clear = 0;
-#ifdef _WIN32
+#ifdef USE_DSOUND
if (pDSBuf)
{
DWORD dwSize;
if (ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint)
return;
- cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_vieworigin, ambientlevels, sizeof(ambientlevels));
+ cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_origin, ambientlevels, sizeof(ambientlevels));
// calc ambient sound levels
for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
Called once each time through the main loop
============
*/
-void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up)
+void S_Update(const matrix4x4_t *listenermatrix)
{
unsigned int i, j, total;
channel_t *ch, *combine;
if (!snd_initialized.integer || (snd_blocked > 0))
return;
- VectorCopy(origin, listener_vieworigin);
- VectorCopy(forward, listener_viewforward);
- VectorCopy(left, listener_viewleft);
- VectorCopy(up, listener_viewup);
+ Matrix4x4_Invert_Simple(&listener_matrix, listenermatrix);
+ Matrix4x4_OriginFromMatrix(listenermatrix, listener_origin);
// update general area ambient sound sources
S_UpdateAmbientSounds ();
void S_ExtraUpdate (void)
{
-#ifdef _WIN32
+#ifdef USE_DSOUND
IN_Accumulate ();
#endif
if (endtime > (unsigned int)(soundtime + samps))
endtime = soundtime + samps;
-#ifdef _WIN32
+#ifdef USE_DSOUND
// if the buffer was lost or stopped, restore it and/or restart it
{
DWORD dwStatus;
else
i++;
- ch_ind = S_StartSound(-1, 0, sfx, listener_vieworigin, fvol, attenuation);
+ ch_ind = S_StartSound(-1, 0, sfx, listener_origin, fvol, attenuation);
if (ch_ind >= 0)
channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
}
return;
}
- ch_ind = S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
+ ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 1);
if (ch_ind >= 0)
channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
}