diff options
Diffstat (limited to 'tracker-pt')
| -rw-r--r-- | tracker-pt/camera.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt_dialog.cpp | 6 | ||||
| -rw-r--r-- | tracker-pt/point_tracker.cpp | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tracker-pt/camera.cpp b/tracker-pt/camera.cpp index 263d6617..e2bcc4b9 100644 --- a/tracker-pt/camera.cpp +++ b/tracker-pt/camera.cpp @@ -53,7 +53,7 @@ DEFUN_WARN_UNUSED Camera::result Camera::get_frame(cv::Mat& frame) t.start(); // measure fps of valid frames - static constexpr double RC = .1; // seconds + constexpr double RC = .1; // seconds const double alpha = dt/(dt + RC); if (dt_mean < dt_eps) diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 7b573060..08ac9785 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -106,7 +106,7 @@ void Tracker_PT::run() vec3 p = X_GH.t; // head (center?) position in global space vec2 p_((p[0] * fx) / p[2], (p[1] * fx) / p[2]); // projected to screen - static constexpr int len = 9; + constexpr int len = 9; cv::Point p2(iround(p_[0] * preview_frame.cols + preview_frame.cols/2), iround(-p_[1] * preview_frame.cols + preview_frame.rows/2)); diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 9f0832ef..075b024d 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -154,9 +154,9 @@ void TrackerDialog_PT::startstop_trans_calib(bool start) s.t_MH_y = int(tmp[1]); s.t_MH_z = int(tmp[2]); - static constexpr int min_yaw_samples = 15; - static constexpr int min_pitch_samples = 15; - static constexpr int min_samples = min_yaw_samples+min_pitch_samples; + constexpr int min_yaw_samples = 15; + constexpr int min_pitch_samples = 15; + constexpr int min_samples = min_yaw_samples+min_pitch_samples; // Don't bother counting roll samples. Roll calibration is hard enough // that it's a hidden unsupported feature anyway. diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index b87c38d1..ed57235d 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -99,7 +99,7 @@ PointTracker::PointOrder PointTracker::find_correspondences_previous(const vec2* p[2] = project(model.M02, fx); const int diagonal = int(std::sqrt(f(info.res_x*info.res_x + info.res_y*info.res_y))); - static constexpr int div = 100; + constexpr int div = 100; const int max_dist = diagonal / div; // 8 pixels for 640x480 // set correspondences by minimum distance to projected model point @@ -140,7 +140,7 @@ PointTracker::PointOrder PointTracker::find_correspondences_previous(const vec2* bool PointTracker::maybe_use_old_point_order(const PointOrder& order, const CamInfo& info) { - static constexpr f std_width = 640, std_height = 480; + constexpr f std_width = 640, std_height = 480; PointOrder scaled_order; @@ -163,7 +163,7 @@ bool PointTracker::maybe_use_old_point_order(const PointOrder& order, const CamI } // CAVEAT don't increase too much, it visibly loses precision - static constexpr f max_dist = f(.13); + constexpr f max_dist = f(.13); const bool validp = sum < max_dist; @@ -278,7 +278,7 @@ int PointTracker::POSIT(const PointModel& model, const PointOrder& order, f foca mat33 R_1, R_2; mat33* R_current = &R_1; - static constexpr int max_iter = 100; + constexpr int max_iter = 100; int i=1; for (; i<max_iter; ++i) |