X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_main.c;h=540a7f9e7c8f140e0978eedc5aaf277b68f0c902;hb=cdc40956d38987591a9bdaf199fa0f9fcc6eb989;hp=0bd242cc0940090cdae61851fcb5ece2383b1993;hpb=17f6da9cec97eb38d3c256995833deb6d1a2f18a;p=xonotic%2Fdarkplaces.git

diff --git a/snd_main.c b/snd_main.c
index 0bd242cc..540a7f9e 100644
--- 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,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);
@@ -1357,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:
@@ -1370,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);
 			}
 		}