diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-29 09:21:41 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-29 09:41:23 +0100 |
commit | 33aa2b6bbbf6edbe2d0173a03a9869e7ed7a2660 (patch) | |
tree | 7deb1be34f9d7ecfca3bd22da6bf722ee19b5f4f /tracker-tobii-eyex | |
parent | 29bf7f94eab413e25914c3939d7ff19ef0cd4c48 (diff) |
static constexpr -> constexpr
Diffstat (limited to 'tracker-tobii-eyex')
-rw-r--r-- | tracker-tobii-eyex/tobii-eyex.cpp | 6 | ||||
-rw-r--r-- | tracker-tobii-eyex/tobii-settings.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tracker-tobii-eyex/tobii-eyex.cpp b/tracker-tobii-eyex/tobii-eyex.cpp index c0547c08..eb5aae42 100644 --- a/tracker-tobii-eyex/tobii-eyex.cpp +++ b/tracker-tobii-eyex/tobii-eyex.cpp @@ -279,9 +279,9 @@ void tobii_eyex_tracker::data(double* data) using std::fabs; - static constexpr double max_yaw = 45, max_pitch = 30; - static constexpr double c_yaw = 3; - static constexpr double c_pitch = c_yaw * max_pitch / max_yaw; + constexpr double max_yaw = 45, max_pitch = 30; + constexpr double c_yaw = 3; + constexpr double c_pitch = c_yaw * max_pitch / max_yaw; const double yaw_delta = gain(fabs(x_)) * signum(x_) * c_yaw * dt; const double pitch_delta = gain(fabs(y_)) * signum(y_) * c_pitch * dt; diff --git a/tracker-tobii-eyex/tobii-settings.cpp b/tracker-tobii-eyex/tobii-settings.cpp index c3129ec5..bc201be4 100644 --- a/tracker-tobii-eyex/tobii-settings.cpp +++ b/tracker-tobii-eyex/tobii-settings.cpp @@ -85,7 +85,7 @@ rel_settings::rel_settings() : } // there's an underflow in spline code, can't use 1e0 -static constexpr const double spline_max = 1e2; +constexpr double spline_max = 1e2; double rel_settings::gain(double value) { @@ -102,7 +102,7 @@ void rel_settings::make_spline_(part* functors, unsigned len) { part& fun = functors[k]; - static constexpr unsigned nparts = 7; + constexpr unsigned nparts = 7; for (unsigned i = 1; i <= nparts; i++) { |