diff options
| -rw-r--r-- | Alc/ALu.c | 23 | ||||
| -rw-r--r-- | OpenAL32/Include/alSource.h | 6 |
2 files changed, 23 insertions, 6 deletions
@@ -378,6 +378,14 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource, break; } + switch(ALSource->Send[0].WetFilter.filter) + { + case AL_FILTER_LOWPASS: + WetMix *= ALSource->Send[0].WetFilter.Gain; + WetGainHF *= ALSource->Send[0].WetFilter.GainHF; + break; + } + if(ALSource->AirAbsorptionFactor > 0.0f) DryGainHF *= pow(ALSource->AirAbsorptionFactor * AIRABSORBGAINHF, Distance * MetersPerUnit); @@ -576,12 +584,15 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma DryBuffer[j][2] += value*DrySend[2]; DryBuffer[j][3] += value*DrySend[3]; - //Room path final mix buffer and panning - value = aluComputeWetSample(ALSource, WetGainHF, sample); - WetBuffer[j][0] += value*WetSend[0]; - WetBuffer[j][1] += value*WetSend[1]; - WetBuffer[j][2] += value*WetSend[2]; - WetBuffer[j][3] += value*WetSend[3]; + if(ALSource->Send[0].Slot.effectslot) + { + //Room path final mix buffer and panning + value = aluComputeWetSample(ALSource, WetGainHF, sample); + WetBuffer[j][0] += value*WetSend[0]; + WetBuffer[j][1] += value*WetSend[1]; + WetBuffer[j][2] += value*WetSend[2]; + WetBuffer[j][3] += value*WetSend[3]; + } } else { diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 38b0094d..1ada61df 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -4,6 +4,7 @@ #define AL_NUM_SOURCE_PARAMS 128 #include "alFilter.h" +#include "alAuxEffectSlot.h" #include "AL/al.h" #define AL_DIRECT_FILTER 0x20005 @@ -62,6 +63,11 @@ typedef struct ALsource_struct ALfilter DirectFilter; + struct { + ALeffectslot Slot; + ALfilter WetFilter; + } Send[1]; + ALfloat LastDrySample; ALfloat LastWetSample; |