From 2c120f462fd914500e10cf80a5a167732ed297ae Mon Sep 17 00:00:00 2001
From: CrispyPin <crispin@tasa.se>
Date: Fri, 7 Apr 2023 20:49:09 +0200
Subject: [PATCH] make grabbable area a box instead of sphere, colour grabbed
 panels

---
 src/panel.cpp | 34 +++++++++++++++++++++++-----------
 src/panel.h   |  1 +
 src/util.h    |  5 +++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/panel.cpp b/src/panel.cpp
index c38e59c..0eb07bc 100644
--- a/src/panel.cpp
+++ b/src/panel.cpp
@@ -15,6 +15,7 @@ Panel::Panel(App *app, vr::HmdMatrix34_t start_pose, int index, int x, int y, in
 {
 	_name = "screen_view_" + std::to_string(index);
 	_alpha = 1.0f;
+	_meters = 1.0f;
 	_active_hand = -1;
 	glGenTextures(1, &_gl_texture);
 	glBindTexture(GL_TEXTURE_2D, _gl_texture);
@@ -53,18 +54,25 @@ void Panel::Update()
 	{
 		for (auto controller : _app->GetControllers())
 		{
-			vr::HmdMatrix34_t overlay_pose;
-			vr::ETrackingUniverseOrigin tracking_universe;
-			_app->vr_overlay->GetOverlayTransformAbsolute(_id, &tracking_universe, &overlay_pose);
-
-			auto controller_pos = GetPos(_app->GetTrackerPose(controller));
-			auto overlay_pos = GetPos(ConvertMat(overlay_pose));
-
-			bool close_enough = glm::length(overlay_pos - controller_pos) < 1.0f;
-
-			if (close_enough && _app->IsGrabActive(controller))
+			if (_app->IsGrabActive(controller))
 			{
-				ControllerGrab(controller);
+				vr::HmdMatrix34_t overlay_pose;
+				vr::ETrackingUniverseOrigin tracking_universe;
+				_app->vr_overlay->GetOverlayTransformAbsolute(_id, &tracking_universe, &overlay_pose);
+
+				auto controller_pos = GetPos(_app->GetTrackerPose(controller));
+
+				auto local_pos = glm::inverse(ConvertMat(overlay_pose)) * glm::vec4(controller_pos - GetPos(overlay_pose), 0);
+
+				float grab_area_thickness = 0.3f;
+				bool close_enough = glm::abs(local_pos.z) < grab_area_thickness;
+				close_enough &= glm::abs(local_pos.x) < _meters / 2.0f;
+				close_enough &= glm::abs(local_pos.y) < _meters / 2.0f;
+
+				if (close_enough)
+				{
+					ControllerGrab(controller);
+				}
 			}
 		}
 	}
@@ -116,6 +124,8 @@ void Panel::ControllerGrab(TrackerID controller)
 	_is_held = true;
 	_active_hand = controller;
 
+	_app->vr_overlay->SetOverlayColor(_id, 0.6f, 1.0f, 1.0f);
+
 	vr::HmdMatrix34_t abs_pose;
 	vr::ETrackingUniverseOrigin tracking_universe;
 
@@ -134,6 +144,8 @@ void Panel::ControllerRelease()
 	printf("Released panel %d\n", _index);
 	_is_held = false;
 
+	_app->vr_overlay->SetOverlayColor(_id, 1.0f, 1.0f, 1.0f);
+
 	vr::HmdMatrix34_t relative_pose;
 	_app->vr_overlay->GetOverlayTransformTrackedDeviceRelative(_id, &_active_hand, &relative_pose);
 	auto relative_mat = ConvertMat(relative_pose);
diff --git a/src/panel.h b/src/panel.h
index e0abf82..4b3a3e2 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -30,6 +30,7 @@ class Panel
 
 	int _x, _y;
 	int _width, _height;
+	float _meters;
 	float _alpha;
 
 	vr::Texture_t _texture;
diff --git a/src/util.h b/src/util.h
index 1ddd58b..4b52b6a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -46,3 +46,8 @@ inline glm::vec3 GetPos(glm::mat4x4 mat)
 {
 	return glm::vec3(mat[3][0], mat[3][1], mat[3][2]);
 }
+
+inline glm::vec3 GetPos(vr::HmdMatrix34_t mat)
+{
+	return glm::vec3(mat.m[0][3], mat.m[1][3], mat.m[2][3]);
+}