aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/panning.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-12-21 08:55:22 -0800
committerChris Robinson <[email protected]>2018-12-21 08:55:22 -0800
commit3553ce1f67d46573e338ff6e53a31d60a722d5c6 (patch)
treeb574ab621a47ee6163ef73e6c93af8f9a2e760dc /Alc/panning.cpp
parentb785d805263c9517c1523785b2da39f9a47b6002 (diff)
Don't convert the HRTF decoder virtual speaker positions to radians
Diffstat (limited to 'Alc/panning.cpp')
-rw-r--r--Alc/panning.cpp42
1 files changed, 21 insertions, 21 deletions
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 },