diff options
| author | Chris Robinson <[email protected]> | 2018-05-17 03:52:40 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-05-17 03:52:40 -0700 |
| commit | 0cd375f03c2ab9cc9033dd03481badaa26cc390f (patch) | |
| tree | 2a8e5c7ea883af4a49e1d5f83f1ea526a911ae39 /Alc/panning.c | |
| parent | 588a6bcb4f79e4be1cae651dbbc14356d039c91b (diff) | |
Add a function to calculate coefficients from X, Y, Z components
Diffstat (limited to 'Alc/panning.c')
| -rw-r--r-- | Alc/panning.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Alc/panning.c b/Alc/panning.c index aaf3f2ca..4a7c592b 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -38,6 +38,7 @@ #include "bs2b.h" +extern inline void CalcDirectionCoeffs(const ALfloat dir[3], ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS]); extern inline void CalcAngleCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS]); extern inline void ComputeDryPanGains(const DryMixParams *dry, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]); extern inline void ComputeFirstOrderGains(const BFMixParams *foa, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]); @@ -67,13 +68,9 @@ static const ALsizei ACN2ACN[MAX_AMBI_COEFFS] = { }; -void CalcDirectionCoeffs(const ALfloat dir[3], ALfloat spread, ALfloat coeffs[MAX_AMBI_COEFFS]) +void CalcAmbiCoeffs(const ALfloat y, const ALfloat z, const ALfloat x, const ALfloat spread, + ALfloat coeffs[MAX_AMBI_COEFFS]) { - /* Convert from OpenAL coords to Ambisonics. */ - ALfloat x = -dir[2]; - ALfloat y = -dir[0]; - ALfloat z = dir[1]; - /* Zeroth-order */ coeffs[0] = 1.0f; /* ACN 0 = 1 */ /* First-order */ |