From 2ce0fad97d34449e780a22a1cf5bc9a5e6ce9703 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 18 Dec 2014 17:47:23 +0100
Subject: pt: use 2d coordinates only for d_order

Issue: #107
---
 ftnoir_tracker_pt/point_tracker.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'ftnoir_tracker_pt/point_tracker.cpp')

diff --git a/ftnoir_tracker_pt/point_tracker.cpp b/ftnoir_tracker_pt/point_tracker.cpp
index 3fdc60ef..7a9fe645 100644
--- a/ftnoir_tracker_pt/point_tracker.cpp
+++ b/ftnoir_tracker_pt/point_tracker.cpp
@@ -83,11 +83,14 @@ PointTracker::PointOrder PointTracker::find_correspondences(const std::vector<cv
     model.get_d_order(points, point_d_order,
                       cv::Vec2f(points[0][0]-points[1][0], points[0][1]-points[1][1]));
     // calculate d and d_order for simple freetrack-like point correspondence
-    model.get_d_order(std::vector<cv::Vec3f>{ Vec3f{0,0,0}, model.M01, model.M02 },
+    model.get_d_order(std::vector<cv::Vec2f>{
+                          Vec2f{0,0},
+                          Vec2f(model.M01[0], model.M01[1]),
+                          Vec2f(model.M02[0], model.M02[1])
+                      },
                       model_d_order,
-                      cv::Vec3f(model.M01[0]-model.M02[0],
-                                model.M01[1]-model.M02[1],
-                                model.M01[2]-model.M02[2]));
+                      cv::Vec2f(model.M01[0]-model.M02[0],
+                                model.M01[1]-model.M02[1]));
     // set correspondences
     PointOrder p;
     for (int i=0; i<PointModel::N_POINTS; ++i)
-- 
cgit v1.2.3