From 8f83609ed94e1bbd4173f15221e69f92fcc492eb Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 1 Nov 2014 06:15:54 +0100 Subject: use simple-mat now opencv nixed from core --- opentrack/tracker.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'opentrack/tracker.h') diff --git a/opentrack/tracker.h b/opentrack/tracker.h index 1c2d12cd..23939576 100644 --- a/opentrack/tracker.h +++ b/opentrack/tracker.h @@ -3,16 +3,15 @@ #include #include -#include - -#include "./timer.hpp" -#include "./plugin-support.h" -#include "./mappings.hpp" -#include "./pose.hpp" +#include "timer.hpp" +#include "plugin-support.h" +#include "mappings.hpp" +#include "pose.hpp" +#include "simple-mat.hpp" #include "../qfunctionconfigurator/functionconfig.h" -#include "./main-settings.hpp" -#include "./options.hpp" +#include "main-settings.hpp" +#include "options.hpp" #include #include @@ -33,13 +32,13 @@ private: std::atomic should_quit; SelectedLibraries const& libs; - cv::Matx33d r_b; + dmat<3, 3> r_b; double t_b[3]; double map(double pos, bool invertp, Mapping& axis); void logic(); - void t_compensate(const cv::Matx33d& rmat, const double* ypr, double* output, bool rz); + void t_compensate(const dmat<3, 3>& rmat, const double* ypr, double* output, bool rz); void run() override; public: Tracker(main_settings& s, Mappings& m, SelectedLibraries& libs); -- cgit v1.2.3