diff options
| -rw-r--r-- | Alc/panning.c | 6 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Alc/panning.c b/Alc/panning.c index 6691373e..9ad9d2a7 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -138,12 +138,12 @@ void CalcDirectionCoeffs(const ALfloat dir[3], ALfloat coeffs[MAX_AMBI_COEFFS]) coeffs[15] = 2.091650066f * x * (x*x - 3.0f*y*y); /* ACN 15 = sqrt(35/8) * X * (X*X - 3*Y*Y) */ } -void CalcAngleCoeffs(ALfloat angle, ALfloat elevation, ALfloat coeffs[MAX_AMBI_COEFFS]) +void CalcAngleCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat coeffs[MAX_AMBI_COEFFS]) { ALfloat dir[3] = { - sinf(angle) * cosf(elevation), + sinf(azimuth) * cosf(elevation), sinf(elevation), - -cosf(angle) * cosf(elevation) + -cosf(azimuth) * cosf(elevation) }; CalcDirectionCoeffs(dir, coeffs); } diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 8a0aa81e..8b11bdd4 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -300,7 +300,7 @@ void aluInitEffectPanning(struct ALeffectslot *slot); * CalcDirectionCoeffs * * Calculates ambisonic coefficients based on a direction vector. The vector - * must not be longer than 1 unit. + * must be normalized (unit length). */ void CalcDirectionCoeffs(const ALfloat dir[3], ALfloat coeffs[MAX_AMBI_COEFFS]); @@ -319,10 +319,11 @@ inline void CalcXYZCoeffs(ALfloat x, ALfloat y, ALfloat z, ALfloat coeffs[MAX_AM /** * CalcAngleCoeffs * - * Calculates ambisonic coefficients based on angle and elevation. The angle - * and elevation parameters are in radians, going right and up respectively. + * Calculates ambisonic coefficients based on azimuth and elevation. The + * azimuth and elevation parameters are in radians, going right and up + * respectively. */ -void CalcAngleCoeffs(ALfloat angle, ALfloat elevation, ALfloat coeffs[MAX_AMBI_COEFFS]); +void CalcAngleCoeffs(ALfloat azimuth, ALfloat elevation, ALfloat coeffs[MAX_AMBI_COEFFS]); /** * ComputeAmbientGains |