added GL_ARB_shader_objects, GL_ARB_shading_language_100, GL_ARB_vertex_shader, GL_AR...

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index 87ef8a5cf78f8e890db6dcaa9b148419bb92b1b5..e3db4c90ddf802d390c4c27e3d88ef479da763a9 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
 #include <windows.h>
 #include <dsound.h>
 extern DWORD gSndBufSize;
@@ -58,10 +58,8 @@ cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1"};
 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;
 
@@ -485,12 +483,12 @@ void SND_Spatialize(channel_t *ch, int isstatic)
                }
 
                // 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);
@@ -694,7 +692,7 @@ void S_ClearBuffer(void)
        else
                clear = 0;
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        if (pDSBuf)
        {
                DWORD   dwSize;
@@ -803,7 +801,7 @@ void S_UpdateAmbientSounds (void)
        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++)
@@ -845,7 +843,7 @@ S_Update
 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;
@@ -853,10 +851,8 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up)
        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 ();
@@ -959,7 +955,7 @@ void IN_Accumulate (void);
 void S_ExtraUpdate (void)
 {
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        IN_Accumulate ();
 #endif
 
@@ -989,7 +985,7 @@ void S_Update_(void)
        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;
@@ -1045,7 +1041,7 @@ static void S_Play_Common(float fvol, float attenuation)
                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;
        }
@@ -1107,7 +1103,7 @@ void S_LocalSound (const char *sound, qboolean stdpath)
                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;
 }