diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-04 09:19:39 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-04 09:29:28 +0200 |
| commit | f58efb5c2c51e5866d4640036865792b822641f6 (patch) | |
| tree | 4316d898c27c3adb1c332544876445ba73bd1eb0 /ftnoir_tracker_pt/point_tracker.h | |
| parent | 27bbb01ff3d49bd37daa9649f5c2320663c46aa4 (diff) | |
| parent | 0bf534ff329cabaa61a0dddb8671827577407aba (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/point_tracker.h')
| -rw-r--r-- | ftnoir_tracker_pt/point_tracker.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h index 344a05c0..1340a11d 100644 --- a/ftnoir_tracker_pt/point_tracker.h +++ b/ftnoir_tracker_pt/point_tracker.h @@ -15,7 +15,7 @@ # include <memory> #endif #include <vector> - +#include "opentrack/timer.hpp" #include "ftnoir_tracker_pt_settings.h" #include <QObject> @@ -116,7 +116,7 @@ public: // track the pose using the set of normalized point coordinates (x pos in range -0.5:0.5) // f : (focal length)/(sensor width) // dt : time since last call - void track(const std::vector<cv::Vec2f>& projected_points, const PointModel& model, float f, bool dynamic_pose); + void track(const std::vector<cv::Vec2f>& projected_points, const PointModel& model, float f, bool dynamic_pose, int init_phase_timeout); Affine pose() const { return X_CM; } cv::Vec2f project(const cv::Vec3f& v_M, float f); private: @@ -136,6 +136,9 @@ private: int POSIT(const PointModel& point_model, const PointOrder& order, float focal_length); // The POSIT algorithm, returns the number of iterations Affine X_CM; // trafo from model to camera + + Timer t; + bool init_phase; }; #endif //POINTTRACKER_H |