diff options
| author | Chris Robinson <[email protected]> | 2019-09-24 22:27:12 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-09-24 22:27:12 -0700 |
| commit | 5bb91b858f22bfda358635abe9d54841b7507bba (patch) | |
| tree | d15041ee203ba71a679322cecae0796c6c017287 /alc/panning.cpp | |
| parent | 16a715a2b51ca5563b21a6b694dd4a08728137b1 (diff) | |
Use blended HRIRs for the B-Format decode
Diffstat (limited to 'alc/panning.cpp')
| -rw-r--r-- | alc/panning.cpp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp index cdec7759..a2f1bed8 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -522,28 +522,27 @@ void InitCustomPanning(ALCdevice *device, bool hqdec, const AmbDecConf *conf, void InitHrtfPanning(ALCdevice *device) { - /* NOTE: In degrees, and azimuth goes clockwise. */ static constexpr AngularPoint AmbiPoints[]{ - { 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 }, + { 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) }, }; static constexpr ALfloat AmbiMatrix[][MAX_AMBI_CHANNELS]{ { 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 }, |