experimental support for springs:

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 943dc5d19fc73ccbebf69711483aaf9106eac4e8..540a7f9e7c8f140e0978eedc5aaf277b68f0c902 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -150,7 +150,7 @@ static int current_swapstereo = false;
 static int current_channellayout = SND_CHANNELLAYOUT_AUTO;
 static int current_channellayout_used = SND_CHANNELLAYOUT_AUTO;
 
-static double spatialpower, spatialmin, spatialdiff, spatialoffset, spatialfactor;
+static float spatialpower, spatialmin, spatialdiff, spatialoffset, spatialfactor;
 typedef enum { SPATIAL_NONE, SPATIAL_LOG, SPATIAL_POW, SPATIAL_THRESH } spatialmethod_t;
 spatialmethod_t spatialmethod;
 
@@ -166,9 +166,10 @@ cvar_t snd_spatialization_min = {CVAR_SAVE, "snd_spatialization_min", "0.70", "m
 cvar_t snd_spatialization_max = {CVAR_SAVE, "snd_spatialization_max", "0.95", "maximum spatialization of sounds"};
 cvar_t snd_spatialization_power = {CVAR_SAVE, "snd_spatialization_power", "0", "exponent of the spatialization falloff curve (0: logarithmic)"};
 cvar_t snd_spatialization_control = {CVAR_SAVE, "snd_spatialization_control", "0", "enable spatialization control (headphone friendly mode)"};
+cvar_t snd_spatialization_occlusion = {CVAR_SAVE, "snd_spatialization_occlusion", "1", "enable occlusion testing on spatialized sounds, which simply quiets sounds that are blocked by the world"};
 
 // Cvars declared in snd_main.h (shared with other snd_*.c files)
-cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1", "how much sound to mix ahead of time"};
+cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.11", "how much sound to mix ahead of time"};
 cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
 cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
 extern cvar_t v_flipped;
@@ -809,6 +810,7 @@ void S_Init(void)
        Cvar_RegisterVariable(&snd_spatialization_max);
        Cvar_RegisterVariable(&snd_spatialization_power);
        Cvar_RegisterVariable(&snd_spatialization_control);
+       Cvar_RegisterVariable(&snd_spatialization_occlusion);
 
        Cvar_RegisterVariable(&snd_speed);
        Cvar_RegisterVariable(&snd_width);
@@ -1191,7 +1193,7 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
                {
                        // no sound on this channel
                        first_to_die = ch_idx;
-                       break;
+                       goto emptychan_found;
                }
 
                // don't let monster sounds override player sounds
@@ -1212,7 +1214,10 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
 
        if (first_to_die == -1)
                return NULL;
+       
+       S_StopChannel (first_to_die, true);
 
+emptychan_found:
        return &channels[first_to_die];
 }
 
@@ -1354,7 +1359,8 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                                                VectorScale(source_vec, f, source_vec);
                                                break;
                                        case SPATIAL_POW:
-                                               f = spatialmin + spatialdiff * bound(0, (pow(dist, spatialpower) - spatialoffset) * spatialfactor, 1);
+                                               f = (pow(dist, spatialpower) - spatialoffset) * spatialfactor;
+                                               f = spatialmin + spatialdiff * bound(0, f, 1);
                                                VectorScale(source_vec, f, source_vec);
                                                break;
                                        case SPATIAL_THRESH:
@@ -1367,6 +1373,17 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                                }
 
                                vol = intensity * max(0, source_vec[0] * snd_speakerlayout.listeners[i].dotscale + snd_speakerlayout.listeners[i].dotbias);
+
+                               if (snd_spatialization_occlusion.integer)
+                               {
+                                       if (cl.worldmodel
+                                       && cl.worldmodel->brush.TraceLineOfSight
+                                       && !cl.worldmodel->brush.TraceLineOfSight(cl.worldmodel, listener_origin, ch->origin))
+                                       {
+                                               vol *= 0.5f;
+                                       }
+                               }
+
                                ch->listener_volume[i] = (int)bound(0, vol, 255);
                        }
                }
@@ -1473,17 +1490,18 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
        if (channel_ind >= total_channels)
                return;
 
+       // we have to lock an audio mutex to prevent crashes if an audio mixer
+       // thread is currently mixing this channel
+       // the SndSys_LockRenderBuffer function uses such a mutex in
+       // threaded sound backends
+       if (lockmutex && !simsound)
+               SndSys_LockRenderBuffer();
+       
        ch = &channels[channel_ind];
        if (ch->sfx != NULL)
        {
                sfx_t *sfx = ch->sfx;
 
-               // we have to lock an audio mutex to prevent crashes if an audio mixer
-               // thread is currently mixing this channel
-               // the SndSys_LockRenderBuffer function uses such a mutex in
-               // threaded sound backends
-               if (lockmutex)
-                       SndSys_LockRenderBuffer();
                if (sfx->fetcher != NULL)
                {
                        snd_fetcher_endsb_t fetcher_endsb = sfx->fetcher->endsb;
@@ -1496,9 +1514,9 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
 
                ch->fetcher_data = NULL;
                ch->sfx = NULL;
-               if (lockmutex)
-                       SndSys_UnlockRenderBuffer();
        }
+       if (lockmutex && !simsound)
+               SndSys_UnlockRenderBuffer();
 }
 
 
@@ -1545,18 +1563,18 @@ void S_StopAllSounds (void)
        // stop CD audio because it may be using a faketrack
        CDAudio_Stop();
 
-       for (i = 0; i < total_channels; i++)
-               S_StopChannel (i, true);
-
-       total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
-       memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
-
-       // Mute the contents of the submittion buffer
        if (simsound || SndSys_LockRenderBuffer ())
        {
                int clear;
                size_t memsize;
 
+               for (i = 0; i < total_channels; i++)
+                       S_StopChannel (i, false);
+
+               total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
+               memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
+
+               // Mute the contents of the submittion buffer
                clear = (snd_renderbuffer->format.width == 1) ? 0x80 : 0;
                memsize = snd_renderbuffer->maxframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
                memset(snd_renderbuffer->ring, clear, memsize);
@@ -1595,6 +1613,22 @@ void S_SetChannelVolume (unsigned int ch_ind, float fvol)
        channels[ch_ind].master_vol = (int)(fvol * 255.0f);
 }
 
+float S_GetChannelPosition (unsigned int ch_ind)
+{
+       // note: this is NOT accurate yet
+       int s;
+       channel_t *ch = &channels[ch_ind];
+       sfx_t *sfx = ch->sfx;
+
+       s = ch->pos;
+       /*
+       if(!snd_usethreadedmixing)
+               s += _snd_mixahead.value * S_GetSoundRate();
+       */
+       return (s % sfx->total_length) / (float) S_GetSoundRate();
+}
+
+
 
 /*
 =================