Merge pull request #738 from cpuwolf/wii3-rebase

tracker/wii: relocation & fix fov & code clean-up

15 files changed, 4 insertions, 15 deletions

diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index e588e567..ae923d3d 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -6,5 +6,4 @@ if(OpenCV_FOUND)
     target_link_libraries(opentrack-tracker-pt-base opentrack-cv ${modules})
 endif()
 add_subdirectory(module)
-add_subdirectory(tracker-wii)
 
diff --git a/tracker-pt/tracker-wii/CMakeLists.txt b/tracker-wii/CMakeLists.txt
index cab5b6a1..cab5b6a1 100644
--- a/tracker-pt/tracker-wii/CMakeLists.txt
+++ b/tracker-wii/CMakeLists.txt
diff --git a/tracker-pt/tracker-wii/Resources/wii.ico b/tracker-wii/Resources/wii.ico
index 44204a68..44204a68 100644
--- a/tracker-pt/tracker-wii/Resources/wii.ico
+++ b/tracker-wii/Resources/wii.ico
diff --git a/tracker-pt/tracker-wii/Resources/wii.png b/tracker-wii/Resources/wii.png
index d83b6e77..d83b6e77 100644
--- a/tracker-pt/tracker-wii/Resources/wii.png
+++ b/tracker-wii/Resources/wii.png
diff --git a/tracker-pt/tracker-wii/lang/nl_NL.ts b/tracker-wii/lang/nl_NL.ts
index 9e739505..9e739505 100644
--- a/tracker-pt/tracker-wii/lang/nl_NL.ts
+++ b/tracker-wii/lang/nl_NL.ts
diff --git a/tracker-pt/tracker-wii/lang/ru_RU.ts b/tracker-wii/lang/ru_RU.ts
index f62cf2e1..f62cf2e1 100644
--- a/tracker-pt/tracker-wii/lang/ru_RU.ts
+++ b/tracker-wii/lang/ru_RU.ts
diff --git a/tracker-pt/tracker-wii/lang/stub.ts b/tracker-wii/lang/stub.ts
index 6401616d..6401616d 100644
--- a/tracker-pt/tracker-wii/lang/stub.ts
+++ b/tracker-wii/lang/stub.ts
diff --git a/tracker-pt/tracker-wii/tracker_wii.qrc b/tracker-wii/tracker_wii.qrc
index a7a50512..a7a50512 100644
--- a/tracker-pt/tracker-wii/tracker_wii.qrc
+++ b/tracker-wii/tracker_wii.qrc
diff --git a/tracker-pt/tracker-wii/wii_camera.cpp b/tracker-wii/wii_camera.cpp
index 514c71ae..75ce3950 100644
--- a/tracker-pt/tracker-wii/wii_camera.cpp
+++ b/tracker-wii/wii_camera.cpp
@@ -27,6 +27,7 @@ WIICamera::WIICamera(const QString& module_name) : s { module_name }
 	cam_info.res_x = 1024;
 	cam_info.res_y = 768;
 	cam_info.fov = 42.0f;
+	cam_info.idx = 0;
 }
 
 QString WIICamera::get_desired_name() const
@@ -77,11 +78,6 @@ WIICamera::result WIICamera::get_frame(pt_frame& frame_)
 pt_camera_open_status WIICamera::start(int idx, int fps, int res_x, int res_y)
 {
 	m_pDev = std::make_unique<wiimote>();
-	if (!m_pDev)
-	{
-		stop();
-		return cam_open_error;
-	}
 	m_pDev->ChangedCallback = on_state_change;
 	m_pDev->CallbackTriggerFlags = (state_change_flags)(CONNECTED |
 		EXTENSION_CHANGED |
diff --git a/tracker-pt/tracker-wii/wii_camera.h b/tracker-wii/wii_camera.h
index 6518de91..7bd4a7ae 100644
--- a/tracker-pt/tracker-wii/wii_camera.h
+++ b/tracker-wii/wii_camera.h
@@ -25,13 +25,7 @@
 #include "wii_frame.hpp"
 
 namespace pt_module {
-#if 0
-struct WIICameraInfo final : pt_camera_info
-{
-	WIICameraInfo() {}
-	double get_focal_length() const { return 42.; }
-};
-#endif
+
 struct WIICamera final : pt_camera
 {
     WIICamera(const QString& module_name);
@@ -48,7 +42,7 @@ struct WIICamera final : pt_camera
 
     operator bool() const override { return m_pDev && (!m_pDev->ConnectionLost()); }
 
-    void set_fov(double value) override { fov = value; }
+    void set_fov(double value) override {}
     void show_camera_settings() override;
 
 
@@ -64,7 +58,7 @@ private:
 	bool _get_points(struct wii_info&);
 	void _get_status(struct wii_info&);
 
-    double dt_mean = 0, fov = 42.;
+    double dt_mean = 0;
 
     Timer t;
 
diff --git a/tracker-pt/tracker-wii/wii_frame.cpp b/tracker-wii/wii_frame.cpp
index 9e367926..9e367926 100644
--- a/tracker-pt/tracker-wii/wii_frame.cpp
+++ b/tracker-wii/wii_frame.cpp
diff --git a/tracker-pt/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp
index 2bffa862..2bffa862 100644
--- a/tracker-pt/tracker-wii/wii_frame.hpp
+++ b/tracker-wii/wii_frame.hpp
diff --git a/tracker-pt/tracker-wii/wii_module.cpp b/tracker-wii/wii_module.cpp
index 40131f69..40131f69 100644
--- a/tracker-pt/tracker-wii/wii_module.cpp
+++ b/tracker-wii/wii_module.cpp
diff --git a/tracker-pt/tracker-wii/wii_point_extractor.cpp b/tracker-wii/wii_point_extractor.cpp
index f1fc013d..f1fc013d 100644
--- a/tracker-pt/tracker-wii/wii_point_extractor.cpp
+++ b/tracker-wii/wii_point_extractor.cpp
diff --git a/tracker-pt/tracker-wii/wii_point_extractor.h b/tracker-wii/wii_point_extractor.h
index be0e5f45..be0e5f45 100644
--- a/tracker-pt/tracker-wii/wii_point_extractor.h
+++ b/tracker-wii/wii_point_extractor.h