Revert "fix crash due to mismatched float/double"

This reverts commit 9fc8e2da02f2e5c2295199826e408cc026d6eae6.

1 files changed, 4 insertions, 7 deletions

diff --git a/FTNoIR_Tracker_PT/point_tracker.cpp b/FTNoIR_Tracker_PT/point_tracker.cpp
index 9f0fb59e..263be43a 100644
--- a/FTNoIR_Tracker_PT/point_tracker.cpp
+++ b/FTNoIR_Tracker_PT/point_tracker.cpp
@@ -105,8 +105,8 @@ void PointTracker::reset()
 	dt_valid = 0;

 	reset_velocities();

     // assume identity rotation again

-    X_CM.R = cv::Matx33f::eye();

-    X_CM.t = cv::Vec3f(0, 0, 1);

+    X_CM.R = cv::Matx33d::eye();

+    X_CM.t = cv::Vec3f();

 }

 

 void PointTracker::reset_velocities()

@@ -168,7 +168,7 @@ bool PointTracker::track(const vector<Vec2f>& points, float fov, float dt, int w
 void PointTracker::predict(float dt)

 {

 	// predict with constant velocity

-    Matx33f R;

+    Matx33d R;

 	Rodrigues(dt*v_r, R);

 	X_CM.R = R*X_CM.R;

 	X_CM.t += dt * v_t;

@@ -273,10 +273,7 @@ void PointTracker::POSIT(float fov, int w, int h)
     cv::Rodrigues(rvec, rmat);

 

     // finally, find the closer solution

-    cv::Mat expected(3, 3, CV_64FC1);

-    for (int i = 0; i < 3; i++)

-        for (int j = 0; j < 3; j++)

-            expected.at<double>(i, j) = X_CM.R(i, j);

+    cv::Mat expected = cv::Mat(X_CM.R);

     cv::Mat eye = cv::Mat::eye(3, 3, CV_64FC1);

     double dev1 = norm(eye - expected * rmat.t());

     double dev2 = norm(eye - expected * rmat);