From 3882d798cc93684fa3a64e25191953f68810ed3d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 7 Mar 2016 19:43:31 +0100 Subject: tracker/pt: fix mismerge --- tracker-pt/ftnoir_tracker_pt.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 8192a76d..3d8aded5 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -129,25 +129,6 @@ void Tracker_PT::run() Affine X_CM = pose(); - { - Affine X_MH(cv::Matx33f::eye(), cv::Vec3f(s.t_MH_x, s.t_MH_y, s.t_MH_z)); // just copy pasted these lines from below - if (X_MH.t[0] == 0 && X_MH.t[1] == 0 && X_MH.t[2] == 0) - { - int m = s.model_used; - switch (m) - { - default: - // cap - case 0: X_MH.t[0] = 0; X_MH.t[1] = 0; X_MH.t[2] = 0; break; - // clip - case 1: X_MH.t[0] = 135; X_MH.t[1] = 0; X_MH.t[2] = 0; break; - // left clip - case 2: X_MH.t[0] = -135; X_MH.t[1] = 0; X_MH.t[2] = 0; break; - } - } - } - - std::function fun = [&](const cv::Vec2f& p, const cv::Scalar color) { auto p2 = cv::Point(p[0] * frame_.cols + frame_.cols/2, -p[1] * frame_.cols + frame_.rows/2); -- cgit v1.2.3