From b1667c68a1260a7b01bdfb13dcb64cf6a36d2977 Mon Sep 17 00:00:00 2001
From: Sara <sara@objectionable.solutions>
Date: Tue, 4 Nov 2025 21:19:05 +0100
Subject: [PATCH] fix: cluefinder now uses scores instead of first found

---
 modules/you_done_it/clue_finder.cpp | 10 +++++++---
 modules/you_done_it/clue_marker.cpp |  8 ++++++--
 modules/you_done_it/clue_marker.h   |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp
index 99d8fb09..f68e15b3 100644
--- a/modules/you_done_it/clue_finder.cpp
+++ b/modules/you_done_it/clue_finder.cpp
@@ -1,5 +1,6 @@
 #include "clue_finder.h"
 #include "core/config/engine.h"
+#include "core/math/math_defs.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "scene/main/node.h"
 
@@ -59,12 +60,15 @@ ClueFinder *ClueFinder::get_singleton() {
 }
 
 ClueMarker *ClueFinder::find_current_clue() {
+	float best_score{ Math::INF };
+	ClueMarker *best_marker{ nullptr };
 	for (ClueMarker *marker : this->clue_markers) {
-		if (marker->is_visible()) {
-			return marker;
+		if (marker->score_in_view() < best_score) {
+			print_line("found marker ", marker->get_path());
+			best_marker = marker;
 		}
 	}
-	return nullptr;
+	return best_marker;
 }
 
 void ClueFinder::register_clue_marker(ClueMarker *marker) {
diff --git a/modules/you_done_it/clue_marker.cpp b/modules/you_done_it/clue_marker.cpp
index a6c29e16..5ba81ee0 100644
--- a/modules/you_done_it/clue_marker.cpp
+++ b/modules/you_done_it/clue_marker.cpp
@@ -31,7 +31,7 @@ void ClueMarker::_notification(int what) {
 	}
 }
 
-bool ClueMarker::is_visible() const {
+float ClueMarker::score_in_view() const {
 	Transform3D const viewpoint{ ClueFinder::get_singleton()->get_global_transform() };
 	Basis const basis{ viewpoint.get_basis() };
 	Vector3 const pos_relative{ get_global_position() - viewpoint.get_origin() };
@@ -40,7 +40,11 @@ bool ClueMarker::is_visible() const {
 		return false;
 	}
 	Vector3 const transformed_dir{ pos_transformed.normalized() };
-	return Math::abs(transformed_dir.x) < 0.5 || Math::abs(transformed_dir.y) < 0.5;
+	float max{ pos_transformed.z / 5.f };
+	if (Math::abs(transformed_dir.x) < max && Math::abs(transformed_dir.y) < max) {
+		return Math::INF;
+	}
+	return pos_transformed.z * (Math::abs(transformed_dir.x) + Math::abs(transformed_dir.y));
 }
 
 void ClueMarker::reveal() {
diff --git a/modules/you_done_it/clue_marker.h b/modules/you_done_it/clue_marker.h
index 22f9cb0e..37210ba4 100644
--- a/modules/you_done_it/clue_marker.h
+++ b/modules/you_done_it/clue_marker.h
@@ -14,7 +14,7 @@ protected:
 	void _notification(int what);
 
 public:
-	bool is_visible() const;
+	float score_in_view() const;
 	void reveal();
 	void set_clue_id(NetworkData::ClueID id);
 	NetworkData::ClueID get_clue_id() const;