diff options
author | Stéphane Lenclud <github@lenclud.com> | 2019-03-28 20:54:35 +0100 |
---|---|---|
committer | Stéphane Lenclud <github@lenclud.com> | 2019-04-24 18:46:12 +0200 |
commit | 8141c4f07b1ddc4555d10a78ea5c3f482c8be04f (patch) | |
tree | d96a0c6d811501ae30c1ccaf45de34100bf283a4 /tracker-points/module | |
parent | b0e22e955d566b2a981cb43ae477f2646c0c978d (diff) |
Hacking my way through to cv::solveP3P usage.
Diffstat (limited to 'tracker-points/module')
-rw-r--r-- | tracker-points/module/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tracker-points/module/camera.cpp | 1 | ||||
-rw-r--r-- | tracker-points/module/camera.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tracker-points/module/CMakeLists.txt b/tracker-points/module/CMakeLists.txt index 1eec9616..33410f9b 100644 --- a/tracker-points/module/CMakeLists.txt +++ b/tracker-points/module/CMakeLists.txt @@ -2,5 +2,5 @@ find_package(OpenCV QUIET) if(OpenCV_FOUND) otr_module(tracker-points) target_link_libraries(${self} opentrack-tracker-points-base) - target_include_directories(${self} PUBLIC "${CMAKE_SOURCE_DIR}/tracker-pt") + target_include_directories(${self} PUBLIC "${CMAKE_SOURCE_DIR}/tracker-points") endif() diff --git a/tracker-points/module/camera.cpp b/tracker-points/module/camera.cpp index a70698de..25f1f8d5 100644 --- a/tracker-points/module/camera.cpp +++ b/tracker-points/module/camera.cpp @@ -96,7 +96,6 @@ bool Camera::start(const QString& name, int fps, int res_x, int res_y) if (!cap) goto fail; - camera::info info {}; info.fps = fps; info.width = res_x; info.height = res_y; diff --git a/tracker-points/module/camera.h b/tracker-points/module/camera.h index 02e2fe4d..65b0e552 100644 --- a/tracker-points/module/camera.h +++ b/tracker-points/module/camera.h @@ -35,6 +35,7 @@ struct Camera final : pt_camera void set_fov(f value) override { fov = value; } void show_camera_settings() override; + private: using camera = typename video::impl::camera; @@ -47,6 +48,7 @@ private: pt_camera_info cam_desired; std::unique_ptr<camera> cap; + pt_settings s; static constexpr f dt_eps = f{1}/256; |