From 3553ce1f67d46573e338ff6e53a31d60a722d5c6 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 21 Dec 2018 08:55:22 -0800 Subject: Don't convert the HRTF decoder virtual speaker positions to radians --- Alc/panning.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'Alc/panning.cpp') diff --git a/Alc/panning.cpp b/Alc/panning.cpp index 9c3be106..e4a9d787 100644 --- a/Alc/panning.cpp +++ b/Alc/panning.cpp @@ -617,28 +617,28 @@ void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALsizei (&sp void InitHrtfPanning(ALCdevice *device) { - /* NOTE: azimuth goes clockwise. */ + /* NOTE: In degrees, and azimuth goes clockwise. */ static constexpr AngularPoint AmbiPoints[]{ - { DEG2RAD( 35.264390f), DEG2RAD( -45.000000f) }, - { DEG2RAD( 35.264390f), DEG2RAD( 45.000000f) }, - { DEG2RAD( 35.264390f), DEG2RAD( 135.000000f) }, - { DEG2RAD( 35.264390f), DEG2RAD(-135.000000f) }, - { DEG2RAD(-35.264390f), DEG2RAD( -45.000000f) }, - { DEG2RAD(-35.264390f), DEG2RAD( 45.000000f) }, - { DEG2RAD(-35.264390f), DEG2RAD( 135.000000f) }, - { DEG2RAD(-35.264390f), DEG2RAD(-135.000000f) }, - { DEG2RAD( 0.000000f), DEG2RAD( -20.905157f) }, - { DEG2RAD( 0.000000f), DEG2RAD( 20.905157f) }, - { DEG2RAD( 0.000000f), DEG2RAD( 159.094843f) }, - { DEG2RAD( 0.000000f), DEG2RAD(-159.094843f) }, - { DEG2RAD( 20.905157f), DEG2RAD( -90.000000f) }, - { DEG2RAD(-20.905157f), DEG2RAD( -90.000000f) }, - { DEG2RAD(-20.905157f), DEG2RAD( 90.000000f) }, - { DEG2RAD( 20.905157f), DEG2RAD( 90.000000f) }, - { DEG2RAD( 69.094843f), DEG2RAD( 0.000000f) }, - { DEG2RAD(-69.094843f), DEG2RAD( 0.000000f) }, - { DEG2RAD(-69.094843f), DEG2RAD( 180.000000f) }, - { DEG2RAD( 69.094843f), DEG2RAD( 180.000000f) }, + { 35.264390f, -45.000000f }, + { 35.264390f, 45.000000f }, + { 35.264390f, 135.000000f }, + { 35.264390f, -135.000000f }, + { -35.264390f, -45.000000f }, + { -35.264390f, 45.000000f }, + { -35.264390f, 135.000000f }, + { -35.264390f, -135.000000f }, + { 0.000000f, -20.905157f }, + { 0.000000f, 20.905157f }, + { 0.000000f, 159.094843f }, + { 0.000000f, -159.094843f }, + { 20.905157f, -90.000000f }, + { -20.905157f, -90.000000f }, + { -20.905157f, 90.000000f }, + { 20.905157f, 90.000000f }, + { 69.094843f, 0.000000f }, + { -69.094843f, 0.000000f }, + { -69.094843f, 180.000000f }, + { 69.094843f, 180.000000f }, }; static constexpr ALfloat AmbiMatrix[][MAX_AMBI_COEFFS]{ { 5.00000000e-02f, 5.00000000e-02f, 5.00000000e-02f, 5.00000000e-02f, 6.45497224e-02f, 6.45497224e-02f, 0.00000000e+00f, 6.45497224e-02f, 0.00000000e+00f, 1.48264644e-02f, 6.33865691e-02f, 1.01126676e-01f, -7.36485380e-02f, -1.09260065e-02f, 7.08683387e-02f, -1.01622099e-01f }, -- cgit v1.2.3