1 files changed, 51 insertions, 39 deletions

diff --git a/tracker-wii/wii_point_extractor.cpp b/tracker-wii/wii_point_extractor.cpp
index 215d50b8..4f1f92b9 100644
--- a/tracker-wii/wii_point_extractor.cpp
+++ b/tracker-wii/wii_point_extractor.cpp
@@ -14,15 +14,6 @@
 #include "cv/numeric.hpp"
 #include "compat/math.hpp"
 
-#include <opencv2/videoio.hpp>
-
-#undef PREVIEW
-//#define PREVIEW
-
-#if defined PREVIEW
-#   include <opencv2/highgui.hpp>
-#endif
-
 #include <cmath>
 #include <algorithm>
 #include <cinttypes>
@@ -30,45 +21,41 @@
 
 #include <QDebug>
 
-using namespace types;
+using namespace numeric_types;
 using namespace pt_module;
 
 
 WIIPointExtractor::WIIPointExtractor(const QString& module_name) : s(module_name)
 {
-
 }
 
 //define a temp draw function
-void WIIPointExtractor::_draw_point(cv::Mat& preview_frame, const vec2& p, const cv::Scalar& color, int thinkness)
+void WIIPointExtractor::draw_point(cv::Mat& preview_frame, const vec2& p, const cv::Scalar& color, int thickness)
 {
 	static constexpr int len = 9;
 
-	cv::Point p2(iround(p[0] * preview_frame.cols + preview_frame.cols / 2),
-		iround(-p[1] * preview_frame.cols + preview_frame.rows / 2));
+	cv::Point p2(iround(p[0] * preview_frame.cols + preview_frame.cols / 2.f),
+		 iround(-p[1] * preview_frame.cols + preview_frame.rows / 2.f));
 
 	cv::line(preview_frame,
 		cv::Point(p2.x - len, p2.y),
 		cv::Point(p2.x + len, p2.y),
 		color,
-		thinkness);
+		thickness);
 	cv::line(preview_frame,
 		cv::Point(p2.x, p2.y - len),
 		cv::Point(p2.x, p2.y + len),
 		color,
-		thinkness);
-};
+		thickness);
+}
 
-bool WIIPointExtractor::_draw_points(cv::Mat& preview_frame, const struct wii_info &wii, std::vector<vec2>& points)
+void WIIPointExtractor::draw_points(cv::Mat& preview_frame, const struct wii_info& wii)
 {
-	const float W = 1024.0f;
-	const float H = 768.0f;
-	points.reserve(4);
-	points.clear();
+	constexpr int W = 1024;
+	constexpr int H = 768;
 
-	for (unsigned index = 0; index < 4; index++)
+	for (const wii_info_points& dot : wii.Points)
 	{
-		const struct wii_info_points &dot = wii.Points[index];
 		if (dot.bvis) {
 			//qDebug() << "wii:" << dot.RawX << "+" << dot.RawY;
 			//anti-clockwise rotate the 2D point
@@ -79,17 +66,12 @@ bool WIIPointExtractor::_draw_points(cv::Mat& preview_frame, const struct wii_in
 			//vec2 dt((2.0f*RX - W) / W, -(2.0f*RY - H ) / W);
 			vec2 dt;
 			std::tie(dt[0], dt[1]) = to_screen_pos(RX, RY, W, H);
-
-			points.push_back(dt);
-			_draw_point(preview_frame, dt, cv::Scalar(0, 255, 0), dot.isize);
+            draw_point(preview_frame, dt, cv::Scalar(0, 255, 0), std::clamp(dot.isize, 1, 32));
 		}
 	}
-	const bool success = points.size() >= PointModel::N_POINTS;
-
-	return success;
 }
 
-void WIIPointExtractor::_draw_bg(cv::Mat& preview_frame, const struct wii_info &wii)
+void WIIPointExtractor::draw_bg(cv::Mat& preview_frame, const struct wii_info& wii)
 {
 	//draw battery status
 	cv::line(preview_frame,
@@ -99,8 +81,8 @@ void WIIPointExtractor::_draw_bg(cv::Mat& preview_frame, const struct wii_info &
 		2);
 
 	//draw horizon
-	int pdelta = iround((preview_frame.rows / 4) * tan((wii.Pitch)* M_PI / 180.0f));
-	int rdelta = iround((preview_frame.cols / 4) * tan((wii.Roll)* M_PI / 180.0f));
+	int pdelta = iround(preview_frame.rows / 4.f * tan(wii.Pitch * pi / 180.f));
+	int rdelta = iround(preview_frame.cols / 4.f * tan(wii.Roll* pi / 180.f));
 
 	cv::line(preview_frame,
 		cv::Point(0, preview_frame.rows / 2 + rdelta - pdelta),
@@ -109,16 +91,46 @@ void WIIPointExtractor::_draw_bg(cv::Mat& preview_frame, const struct wii_info &
 		1);
 }
 
-void WIIPointExtractor::extract_points(const pt_frame& frame_, pt_preview& preview_frame_, std::vector<vec2>& points)
+void WIIPointExtractor::extract_points(const pt_frame& frame_,
+                                       pt_preview& preview_frame_,
+                                       bool preview_visible,
+                                       std::vector<vec2>& points)
 {
 	const struct wii_info& wii = frame_.as_const<WIIFrame>()->wii;
 	cv::Mat& preview_frame = *preview_frame_.as<WIIPreview>();
 
-	switch (wii.status) {
-	case wii_cam_data_change:
-		_draw_bg(preview_frame, wii);
-		_draw_points(preview_frame, wii, points);
-		break;
+	map_points(wii, points);
+	if (preview_visible && wii.status == wii_cam_data_change)
+	{
+		draw_bg(preview_frame, wii);
+		draw_points(preview_frame, wii);
 	}
 }
 
+bool WIIPointExtractor::map_points(const struct wii_info& wii, std::vector<vec2>& points)
+{
+	constexpr int W = 1024;
+	constexpr int H = 768;
+	points.reserve(4);
+	points.clear();
+
+	for (unsigned index = 0; index < 4; index++) // NOLINT(modernize-loop-convert)
+	{
+		const struct wii_info_points &dot = wii.Points[index];
+		if (dot.bvis) {
+			//qDebug() << "wii:" << dot.RawX << "+" << dot.RawY;
+			//anti-clockwise rotate the 2D point
+			const float RX = W - dot.ux;
+			const float RY = H - dot.uy;
+			//vec2 dt((dot.RawX - W / 2.0f) / W, -(dot.RawY - H / 2.0f) / W);
+			//vec2 dt((RX - W / 2.0f) / W, -(RY - H / 2.0f) / W);
+			//vec2 dt((2.0f*RX - W) / W, -(2.0f*RY - H ) / W);
+			vec2 dt;
+			std::tie(dt[0], dt[1]) = to_screen_pos(RX, RY, W, H);
+
+			points.push_back(dt);
+		}
+	}
+
+	return points.size() >= PointModel::N_POINTS;
+}