Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify some pi statements

Browse Source
This commit is contained in:
Chris Robinson
2019-11-16 14:33:09 -08:00
parent 6ad252efda
commit c86a28af5c
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alc/panning.cpp
+29 -26
View File
@@ -523,34 +523,37 @@ void InitCustomPanning(ALCdevice *device, bool hqdec, const AmbDecConf *conf,
void InitHrtfPanning(ALCdevice *device)
{
constexpr float PI{al::MathDefs<float>::Pi()};
constexpr float PI_2{al::MathDefs<float>::Pi() / 2.0f};
constexpr float PI_4{al::MathDefs<float>::Pi() / 4.0f};
constexpr float PI3_4{al::MathDefs<float>::Pi() * 3.0f / 4.0f};
const float CornerElev{static_cast<float>(std::atan2(1.0, std::sqrt(2.0)))};
static const AngularPoint AmbiPoints[]{
{ ElevRadius{ 0.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI} },
{ ElevRadius{ 0.0f}, AzimRadius{ -PI/2.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI/2.0f} },
{ ElevRadius{ PI/2.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ -PI/2.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ PI/4.0f}, AzimRadius{ -PI/2.0f} },
{ ElevRadius{ -PI/4.0f}, AzimRadius{ -PI/2.0f} },
{ ElevRadius{ PI/4.0f}, AzimRadius{ PI/2.0f} },
{ ElevRadius{ -PI/4.0f}, AzimRadius{ PI/2.0f} },
{ ElevRadius{ PI/4.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ -PI/4.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ PI/4.0f}, AzimRadius{ PI} },
{ ElevRadius{ -PI/4.0f}, AzimRadius{ PI} },
{ ElevRadius{ 0.0f}, AzimRadius{ -PI/4.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI/4.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{-PI*3.0f/4.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI*3.0f/4.0f} },
{ ElevRadius{ CornerElev}, AzimRadius{ -PI/4.0f} },
{ ElevRadius{-CornerElev}, AzimRadius{ -PI/4.0f} },
{ ElevRadius{ CornerElev}, AzimRadius{ PI/4.0f} },
{ ElevRadius{-CornerElev}, AzimRadius{ PI/4.0f} },
{ ElevRadius{ CornerElev}, AzimRadius{-PI*3.0f/4.0f} },
{ ElevRadius{-CornerElev}, AzimRadius{-PI*3.0f/4.0f} },
{ ElevRadius{ CornerElev}, AzimRadius{ PI*3.0f/4.0f} },
{ ElevRadius{-CornerElev}, AzimRadius{ PI*3.0f/4.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ 0.0f} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI} },
{ ElevRadius{ 0.0f}, AzimRadius{ -PI_2} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI_2} },
{ ElevRadius{ PI_2}, AzimRadius{ 0.0f} },
{ ElevRadius{ -PI_2}, AzimRadius{ 0.0f} },
{ ElevRadius{ PI_4}, AzimRadius{ -PI_2} },
{ ElevRadius{ -PI_4}, AzimRadius{ -PI_2} },
{ ElevRadius{ PI_4}, AzimRadius{ PI_2} },
{ ElevRadius{ -PI_4}, AzimRadius{ PI_2} },
{ ElevRadius{ PI_4}, AzimRadius{ 0.0f} },
{ ElevRadius{ -PI_4}, AzimRadius{ 0.0f} },
{ ElevRadius{ PI_4}, AzimRadius{ PI} },
{ ElevRadius{ -PI_4}, AzimRadius{ PI} },
{ ElevRadius{ 0.0f}, AzimRadius{ -PI_4} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI_4} },
{ ElevRadius{ 0.0f}, AzimRadius{-PI3_4} },
{ ElevRadius{ 0.0f}, AzimRadius{ PI3_4} },
{ ElevRadius{ CornerElev}, AzimRadius{ -PI_4} },
{ ElevRadius{-CornerElev}, AzimRadius{ -PI_4} },
{ ElevRadius{ CornerElev}, AzimRadius{ PI_4} },
{ ElevRadius{-CornerElev}, AzimRadius{ PI_4} },
{ ElevRadius{ CornerElev}, AzimRadius{-PI3_4} },
{ ElevRadius{-CornerElev}, AzimRadius{-PI3_4} },
{ ElevRadius{ CornerElev}, AzimRadius{ PI3_4} },
{ ElevRadius{-CornerElev}, AzimRadius{ PI3_4} },
};
static const float AmbiMatrix[][MAX_AMBI_CHANNELS]{
{ 3.846153846e-02f, 0.000000000e+00f, 0.000000000e+00f, 6.661733875e-02f, 0.000000000e+00f, 0.000000000e+00f, -4.969039950e-02f, 0.000000000e+00f, 8.606629658e-02f },