use -developer automatically in debug builds

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index c327675ac686bf8ef96bd404ae633629af0dac63..83b05959d1a020a2348c32fce4dd02391f9cb5b7 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -166,6 +166,7 @@ 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.11", "how much sound to mix ahead of time"};
@@ -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);
@@ -1370,6 +1372,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);
                        }
                }
@@ -1480,7 +1493,7 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
        // thread is currently mixing this channel
        // the SndSys_LockRenderBuffer function uses such a mutex in
        // threaded sound backends
-       if (lockmutex)
+       if (lockmutex && !simsound)
                SndSys_LockRenderBuffer();
        
        ch = &channels[channel_ind];
@@ -1501,7 +1514,7 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
                ch->fetcher_data = NULL;
                ch->sfx = NULL;
        }
-       if (lockmutex)
+       if (lockmutex && !simsound)
                SndSys_UnlockRenderBuffer();
 }
 
@@ -1549,18 +1562,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);