AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the voice's last position and gain out of the Hrtf container

Browse Source
This commit is contained in:
Chris Robinson 2014-11-24 01:31:38 -08:00
parent c37a971947
commit 13608d4d61
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Alc/ALu.c
View File

@ -998,8 +998,8 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
if(voice->Direct.Moving)
{
/* Calculate the normalized HRTF transition factor (delta). */
delta = CalcHrtfDelta(voice->Direct.Hrtf.Gain, DryGain,
voice->Direct.Hrtf.Dir, Position);
delta = CalcHrtfDelta(voice->Direct.LastGain, DryGain,
voice->Direct.LastDir, Position);
/* If the delta is large enough, get the moving HRIR target
* coefficients, target delays, steppping values, and counter. */
if(delta > 0.001f)
@ -1010,10 +1010,10 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
voice->Direct.Hrtf.Params[0].CoeffStep, voice->Direct.Hrtf.Params[0].DelayStep
);
voice->Direct.Counter = counter;
voice->Direct.Hrtf.Gain = DryGain;
voice->Direct.Hrtf.Dir[0] = Position[0];
voice->Direct.Hrtf.Dir[1] = Position[1];
voice->Direct.Hrtf.Dir[2] = Position[2];
voice->Direct.LastGain = DryGain;
voice->Direct.LastDir[0] = Position[0];
voice->Direct.LastDir[1] = Position[1];
voice->Direct.LastDir[2] = Position[2];
}
}
else
@ -1024,10 +1024,10 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
voice->Direct.Hrtf.Params[0].Delay);
voice->Direct.Counter = 0;
voice->Direct.Moving = AL_TRUE;
voice->Direct.Hrtf.Gain = DryGain;
voice->Direct.Hrtf.Dir[0] = Position[0];
voice->Direct.Hrtf.Dir[1] = Position[1];
voice->Direct.Hrtf.Dir[2] = Position[2];
voice->Direct.LastGain = DryGain;
voice->Direct.LastDir[0] = Position[0];
voice->Direct.LastDir[1] = Position[1];
voice->Direct.LastDir[2] = Position[2];
}
voice->Direct.Hrtf.IrSize = GetHrtfIrSize(Device->Hrtf);

5
OpenAL32/Include/alu.h
View File

@ -64,6 +64,9 @@ typedef struct DirectParams {
ALboolean Moving;
/* Stepping counter for gain/coefficient fading. */
ALuint Counter;
/* Last direction (relative to listener) and gain of a moving source. */
ALfloat LastDir[3];
ALfloat LastGain;
struct {
enum ActiveFilters ActiveType;
@ -75,8 +78,6 @@ typedef struct DirectParams {
HrtfParams Params[MAX_INPUT_CHANNELS];
HrtfState State[MAX_INPUT_CHANNELS];
ALuint IrSize;
ALfloat Gain;
ALfloat Dir[3];
} Hrtf;
MixGains Gains[MAX_INPUT_CHANNELS][MAX_OUTPUT_CHANNELS];
} DirectParams;