diff options
Diffstat (limited to 'tracker-test')
| -rw-r--r-- | tracker-test/test.cpp | 7 | ||||
| -rw-r--r-- | tracker-test/test.h | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tracker-test/test.cpp b/tracker-test/test.cpp index 3e0db547..9ffdd366 100644 --- a/tracker-test/test.cpp +++ b/tracker-test/test.cpp @@ -56,17 +56,16 @@ void FTNoIR_Tracker::data(double *data) #endif for (int i = 0; i < 6; i++) { - double x = fmod(last_x[i] + incr[i] * d2r * dt, - 2 * pi); + double x = fmod(last_x[i] + incr[i] * d2r * dt, 2 * M_PI); last_x[i] = x; if (i >= 3) { #ifdef DISCONTINUITY if (x > pi + pi/2) - x -= pi; + x -= M_PI; else if (x > pi/2 && x < pi) - x += pi; + x += M_PI; #endif data[i] = sin(x) * 180; diff --git a/tracker-test/test.h b/tracker-test/test.h index 786d7705..acaee67d 100644 --- a/tracker-test/test.h +++ b/tracker-test/test.h @@ -2,7 +2,8 @@ #include "ui_test.h" #include "api/plugin-api.hpp" #include "compat/timer.hpp" -#include "compat/pi-constant.hpp" + +#include <cmath> class FTNoIR_Tracker : public ITracker { @@ -13,9 +14,8 @@ public: void data(double *data) override; private: - static constexpr double pi = OPENTRACK_PI; - static constexpr double r2d = 180 / pi; - static constexpr double d2r = pi / 180; + static constexpr double r2d = 180 / M_PI; + static constexpr double d2r = M_PI / 180; static const double incr[6]; double last_x[6]; |