core: generic: Move inverting detected contacts into Application

Author: StollD

src/apps/daemon/touch.hpp

@@ -289,16 +289,6 @@ class TouchDevice {
 		const Vector2<f64> size = contact.size;
 
 		Vector2<f64> mean = contact.mean;
-		f64 orientation = contact.orientation;
-
-		if (m_config.invert_x)
-			mean.x() = 1.0 - mean.x();
-
-		if (m_config.invert_y)
-			mean.y() = 1.0 - mean.y();
-
-		if (m_config.invert_x != m_config.invert_y)
-			orientation = 1.0 - orientation;
 
 		mean.x() = std::clamp(mean.x(), 0.0, 1.0);
 		mean.y() = std::clamp(mean.y(), 0.0, 1.0);
@@ -308,7 +298,7 @@ class TouchDevice {
 		const i32 x = casts::to<i32>(std::round(mean.x() * MAX_X));
 		const i32 y = casts::to<i32>(std::round(mean.y() * MAX_Y));
 
-		const i32 angle = casts::to<i32>(std::round(orientation * 180));
+		const i32 angle = casts::to<i32>(std::round(contact.orientation * 180));
 		const i32 major = casts::to<i32>(std::round(size.maxCoeff() * DIAGONAL));
 		const i32 minor = casts::to<i32>(std::round(size.minCoeff() * DIAGONAL));
 
@@ -384,12 +374,6 @@ class TouchDevice {
 	{
 		Vector2<f64> mean = contact.mean;
 
-		if (m_config.invert_x)
-			mean.x() = 1.0 - mean.x();
-
-		if (m_config.invert_y)
-			mean.y() = 1.0 - mean.y();
-
 		mean.x() = std::clamp(mean.x(), 0.0, 1.0);
 		mean.y() = std::clamp(mean.y(), 0.0, 1.0);
 

src/apps/visualization/visualize.hpp

@@ -183,23 +183,11 @@ class Visualize : public core::Application {
 			Cairo::TextExtents extends {};
 			m_cairo->get_text_extents(index, extends);
 
-			Vector2<f64> mean = contact.mean;
-			f64 orientation = contact.orientation;
+			const Vector2<f64> mean = contact.mean.cwiseProduct(m_size.cast<f64>());
+			const f64 orientation = contact.orientation * M_PI;
 
 			const Vector2<f64> size = (contact.size.array() * diag).matrix();
 
-			if (m_config.invert_x)
-				mean.x() = 1.0 - mean.x();
-
-			if (m_config.invert_y)
-				mean.y() = 1.0 - mean.y();
-
-			if (m_config.invert_x != m_config.invert_y)
-				orientation = 1.0 - orientation;
-
-			mean = mean.cwiseProduct(m_size.cast<f64>());
-			orientation = orientation * M_PI;
-
 			// Center the text at the mean point of the contact
 			m_cairo->move_to(mean.x() - (extends.x_bearing + extends.width / 2),
 					 mean.y() - (extends.y_bearing + extends.height / 2));

src/core/generic/application.hpp

@@ -219,6 +219,18 @@ class Application {
 		// Search for contacts
 		m_finder.find(m_heatmap, m_contacts);
 
+		// Invert contact coordinates if neccessary
+		for (contacts::Contact<f64> &contact : m_contacts) {
+			if (m_config.invert_x)
+				contact.mean.x() = 1.0 - contact.mean.x();
+
+			if (m_config.invert_y)
+				contact.mean.y() = 1.0 - contact.mean.y();
+
+			if (m_config.invert_x != m_config.invert_y)
+				contact.orientation = 1.0 - contact.orientation;
+		}
+
 		// Update touch rejection cone
 		this->update_touch_cone();