From ac283ebb3348bd6ca42440ec9571efdbf9d059af Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 22 Oct 2025 16:10:58 +0200 Subject: [PATCH 1/5] chore: projects includes use ", added directories --- modules/you_done_it/client_node.h | 4 ++-- modules/you_done_it/clue_data.cpp | 2 +- modules/you_done_it/clue_data.h | 4 ++-- modules/you_done_it/clue_finder.cpp | 7 ++----- modules/you_done_it/clue_finder.h | 6 +++--- modules/you_done_it/clue_marker.cpp | 2 +- modules/you_done_it/clue_marker.h | 6 +++--- modules/you_done_it/register_types.cpp | 2 +- modules/you_done_it/server_node.cpp | 4 ++-- modules/you_done_it/server_node.h | 2 +- modules/you_done_it/ydi_client.cpp | 4 ++-- modules/you_done_it/ydi_client.h | 4 ++-- modules/you_done_it/ydi_networking.cpp | 4 ++-- modules/you_done_it/ydi_networking.h | 11 +++++------ modules/you_done_it/ydi_server.cpp | 10 +++++----- modules/you_done_it/ydi_server.h | 7 ++----- modules/you_done_it/ydi_vr_origin.cpp | 8 ++++---- modules/you_done_it/ydi_vr_origin.h | 4 ++-- 18 files changed, 42 insertions(+), 49 deletions(-) diff --git a/modules/you_done_it/client_node.h b/modules/you_done_it/client_node.h index 717a1362..649ea14a 100644 --- a/modules/you_done_it/client_node.h +++ b/modules/you_done_it/client_node.h @@ -1,7 +1,7 @@ #pragma once -#include "ydi_networking.h" -#include +#include "scene/main/node.h" +#include "you_done_it/ydi_networking.h" class ClientNode : Node { GDCLASS(ClientNode, Node); diff --git a/modules/you_done_it/clue_data.cpp b/modules/you_done_it/clue_data.cpp index 8be71c2b..45a53305 100644 --- a/modules/you_done_it/clue_data.cpp +++ b/modules/you_done_it/clue_data.cpp @@ -1,7 +1,7 @@ #include "clue_data.h" +#include "core/config/engine.h" #include "you_done_it/macros.h" #include "you_done_it/ydi_client.h" -#include void ClueData::_bind_methods() { BIND_HPROPERTY(Variant::INT, id, PROPERTY_HINT_ENUM, NetworkData::ClueID_hint()); diff --git a/modules/you_done_it/clue_data.h b/modules/you_done_it/clue_data.h index 62547959..8acd1f8b 100644 --- a/modules/you_done_it/clue_data.h +++ b/modules/you_done_it/clue_data.h @@ -1,8 +1,8 @@ #pragma once +#include "core/io/image.h" +#include "core/io/resource.h" #include "you_done_it/ydi_networking.h" -#include -#include class ClueData : public Resource { GDCLASS(ClueData, Resource); diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp index 62a30fc1..5a44bfb0 100644 --- a/modules/you_done_it/clue_finder.cpp +++ b/modules/you_done_it/clue_finder.cpp @@ -1,10 +1,7 @@ #include "clue_finder.h" +#include "core/config/engine.h" #include "scene/3d/xr/xr_nodes.h" -#include "ydi_client.h" -#include "you_done_it/client_node.h" -#include "you_done_it/clue_db.h" -#include -#include +#include "scene/main/node.h" ClueFinder *ClueFinder::singleton_instance{ nullptr }; diff --git a/modules/you_done_it/clue_finder.h b/modules/you_done_it/clue_finder.h index f0609bd0..34eeda27 100644 --- a/modules/you_done_it/clue_finder.h +++ b/modules/you_done_it/clue_finder.h @@ -1,8 +1,8 @@ #pragma once -#include "clue_marker.h" -#include -#include +#include "core/templates/hash_set.h" +#include "scene/3d/node_3d.h" +#include "you_done_it/clue_marker.h" class ClueFinder : public Node3D { GDCLASS(ClueFinder, Node3D); diff --git a/modules/you_done_it/clue_marker.cpp b/modules/you_done_it/clue_marker.cpp index 96dd26fa..a6c29e16 100644 --- a/modules/you_done_it/clue_marker.cpp +++ b/modules/you_done_it/clue_marker.cpp @@ -1,7 +1,7 @@ #include "clue_marker.h" #include "core/config/engine.h" -#include "macros.h" #include "you_done_it/clue_finder.h" +#include "you_done_it/macros.h" #include "you_done_it/ydi_networking.h" void ClueMarker::_bind_methods() { diff --git a/modules/you_done_it/clue_marker.h b/modules/you_done_it/clue_marker.h index 0a6493a1..22f9cb0e 100644 --- a/modules/you_done_it/clue_marker.h +++ b/modules/you_done_it/clue_marker.h @@ -1,8 +1,8 @@ #pragma once -#include "clue_db.h" -#include "ydi_networking.h" -#include +#include "scene/3d/marker_3d.h" +#include "you_done_it/clue_db.h" +#include "you_done_it/ydi_networking.h" class ClueMarker : public Marker3D { GDCLASS(ClueMarker, Marker3D); diff --git a/modules/you_done_it/register_types.cpp b/modules/you_done_it/register_types.cpp index 12e163c1..84e49e03 100644 --- a/modules/you_done_it/register_types.cpp +++ b/modules/you_done_it/register_types.cpp @@ -1,13 +1,13 @@ #include "register_types.h" #include "client_node.h" +#include "core/object/class_db.h" #include "you_done_it/clue_data.h" #include "you_done_it/clue_finder.h" #include "you_done_it/clue_marker.h" #include "you_done_it/server_node.h" #include "you_done_it/ydi_networking.h" #include "you_done_it/ydi_vr_origin.h" -#include void initialize_you_done_it_module(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { diff --git a/modules/you_done_it/server_node.cpp b/modules/you_done_it/server_node.cpp index 02a16de7..1db8473f 100644 --- a/modules/you_done_it/server_node.cpp +++ b/modules/you_done_it/server_node.cpp @@ -1,6 +1,6 @@ #include "server_node.h" -#include "ydi_server.h" -#include +#include "core/config/engine.h" +#include "you_done_it/ydi_server.h" ServerNode *ServerNode::singleton_instance{ nullptr }; String const ServerNode::sig_clue_revealed{ "clue_revealed" }; diff --git a/modules/you_done_it/server_node.h b/modules/you_done_it/server_node.h index c2b7ad63..8f1b31e9 100644 --- a/modules/you_done_it/server_node.h +++ b/modules/you_done_it/server_node.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "scene/main/node.h" class ServerNode : public Node { GDCLASS(ServerNode, Node); diff --git a/modules/you_done_it/ydi_client.cpp b/modules/you_done_it/ydi_client.cpp index d30652e1..d5b51cfc 100644 --- a/modules/you_done_it/ydi_client.cpp +++ b/modules/you_done_it/ydi_client.cpp @@ -1,12 +1,12 @@ #include "ydi_client.h" #include "core/string/print_string.h" #include "you_done_it/ydi_networking.h" +#include "zmq.hpp" +#include "zmq_addon.hpp" #include #include #include #include -#include -#include namespace ydi::client { struct Connection { diff --git a/modules/you_done_it/ydi_client.h b/modules/you_done_it/ydi_client.h index b8f48b72..e0eba9b7 100644 --- a/modules/you_done_it/ydi_client.h +++ b/modules/you_done_it/ydi_client.h @@ -1,7 +1,7 @@ #pragma once -#include "ydi_networking.h" -#include +#include "core/string/ustring.h" +#include "you_done_it/ydi_networking.h" namespace ydi::client { void connect(String const &url); diff --git a/modules/you_done_it/ydi_networking.cpp b/modules/you_done_it/ydi_networking.cpp index 901326b0..bba15f32 100644 --- a/modules/you_done_it/ydi_networking.cpp +++ b/modules/you_done_it/ydi_networking.cpp @@ -1,7 +1,7 @@ #include "ydi_networking.h" +#include "core/core_bind.h" +#include "core/object/class_db.h" #include "core/string/print_string.h" -#include -#include void NetworkData::_bind_methods() { BIND_ENUM_CONSTANT(CLUE_FIRST); diff --git a/modules/you_done_it/ydi_networking.h b/modules/you_done_it/ydi_networking.h index b3d9ab44..fc08d487 100644 --- a/modules/you_done_it/ydi_networking.h +++ b/modules/you_done_it/ydi_networking.h @@ -1,13 +1,12 @@ #pragma once -#include "macros.h" -#include -#include -#include +#include "core/object/class_db.h" +#include "core/object/object.h" +#include "you_done_it/macros.h" +#include "zmq.hpp" +#include "zmq_addon.hpp" #include #include -#include -#include class NetworkData : Object { GDCLASS(NetworkData, Object); diff --git a/modules/you_done_it/ydi_server.cpp b/modules/you_done_it/ydi_server.cpp index 1afdf451..160b2602 100644 --- a/modules/you_done_it/ydi_server.cpp +++ b/modules/you_done_it/ydi_server.cpp @@ -1,14 +1,14 @@ #include "ydi_server.h" -#include "ydi_networking.h" -#include -#include +#include "core/os/time.h" +#include "core/templates/vector.h" +#include "you_done_it/ydi_networking.h" +#include "zmq.hpp" +#include "zmq_addon.hpp" #include #include #include #include #include -#include -#include namespace ydi::server { struct Service { diff --git a/modules/you_done_it/ydi_server.h b/modules/you_done_it/ydi_server.h index 7e019e9a..56940f14 100644 --- a/modules/you_done_it/ydi_server.h +++ b/modules/you_done_it/ydi_server.h @@ -1,10 +1,7 @@ #pragma once -#include "ydi_networking.h" -#include -#include -#include -#include +#include "core/templates/vector.h" +#include "you_done_it/ydi_networking.h" #include namespace ydi::server { diff --git a/modules/you_done_it/ydi_vr_origin.cpp b/modules/you_done_it/ydi_vr_origin.cpp index 86d31561..4f7ae9ef 100644 --- a/modules/you_done_it/ydi_vr_origin.cpp +++ b/modules/you_done_it/ydi_vr_origin.cpp @@ -1,8 +1,8 @@ #include "ydi_vr_origin.h" -#include -#include -#include -#include +#include "core/config/engine.h" +#include "scene/main/viewport.h" +#include "servers/xr/xr_interface.h" +#include "servers/xr_server.h" void VROrigin::_bind_methods() {} diff --git a/modules/you_done_it/ydi_vr_origin.h b/modules/you_done_it/ydi_vr_origin.h index 75879f26..2480f7d3 100644 --- a/modules/you_done_it/ydi_vr_origin.h +++ b/modules/you_done_it/ydi_vr_origin.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "scene/3d/xr/xr_nodes.h" +#include "servers/xr/xr_interface.h" class VROrigin : public XROrigin3D { GDCLASS(VROrigin, XROrigin3D); From 7e6a7a8d8f321a396e9cc04dc6d699fd11e18f8c Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 22 Oct 2025 18:04:01 +0200 Subject: [PATCH 2/5] feat: updated render and game environment settings --- vr-project/project.godot | 7 ++++--- vr-project/scenes/game_scene.tscn | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vr-project/project.godot b/vr-project/project.godot index 26ad616d..9e6e90e5 100644 --- a/vr-project/project.godot +++ b/vr-project/project.godot @@ -23,10 +23,11 @@ window/vsync/vsync_mode=0 [rendering] -lights_and_shadows/directional_shadow/size=8192 -lights_and_shadows/directional_shadow/size.mobile=4096 -lights_and_shadows/directional_shadow/soft_shadow_filter_quality=4 +environment/ssao/quality=3 +environment/ssao/half_size=false +anti_aliasing/quality/msaa_3d=1 environment/defaults/default_clear_color=Color(0.21948597, 0.33354625, 0.5898078, 1) +anti_aliasing/quality/use_debanding=true lights_and_shadows/positional_shadow/atlas_quadrant_0_subdiv=1 lights_and_shadows/positional_shadow/atlas_quadrant_1_subdiv=3 diff --git a/vr-project/scenes/game_scene.tscn b/vr-project/scenes/game_scene.tscn index 824711d2..022eac7a 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -26,8 +26,6 @@ tonemap_mode = 2 tonemap_white = 1.34 ssr_fade_in = 0.4873501 ssao_enabled = true -ssao_detail = 5.0 -ssao_sharpness = 1.0 sdfgi_cascades = 2 sdfgi_min_cell_size = 0.1171875 glow_enabled = true From e04455ec9dbfb66142dabf63303e23fd01c4380e Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 22 Oct 2025 21:20:41 +0200 Subject: [PATCH 3/5] feat: adjusted rendering settings to improve fps --- vr-project/project.godot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vr-project/project.godot b/vr-project/project.godot index 9e6e90e5..af7a8f7d 100644 --- a/vr-project/project.godot +++ b/vr-project/project.godot @@ -19,11 +19,11 @@ config/icon="res://icon.svg" window/size/viewport_width=1440 window/size/viewport_height=1600 -window/vsync/vsync_mode=0 +window/ios/allow_high_refresh_rate=false [rendering] -environment/ssao/quality=3 +environment/ssao/quality=1 environment/ssao/half_size=false anti_aliasing/quality/msaa_3d=1 environment/defaults/default_clear_color=Color(0.21948597, 0.33354625, 0.5898078, 1) From 4e1fa51ecffb3fa8c83b6189046b9131a5ef01ed Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 22 Oct 2025 21:21:14 +0200 Subject: [PATCH 4/5] feat: implemented delete/send buttons cluefinder --- modules/you_done_it/clue_finder.cpp | 20 ++++++++++++++++---- modules/you_done_it/clue_finder.h | 3 +++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp index 5a44bfb0..678b2bf1 100644 --- a/modules/you_done_it/clue_finder.cpp +++ b/modules/you_done_it/clue_finder.cpp @@ -30,6 +30,12 @@ void ClueFinder::on_button_pressed(String button) { if (button == "trigger_click") { take_photo(); } + if (button == "ax_button") { + send_photo(); + } + if (button == "by_button") { + delete_photo(); + } } void ClueFinder::_notification(int what) { @@ -70,9 +76,15 @@ void ClueFinder::remove_clue_marker(ClueMarker *marker) { } void ClueFinder::take_photo() { - print_line("TAKING PHOTO"); - if (ClueMarker * found{ find_current_clue() }) { - found->reveal(); - print_line("FOUND MARKER: ", found->get_path()); + this->found_marker = find_current_clue(); +} + +void ClueFinder::send_photo() { + if (this->found_marker) { + this->found_marker->reveal(); } } + +void ClueFinder::delete_photo() { + this->found_marker = nullptr; +} diff --git a/modules/you_done_it/clue_finder.h b/modules/you_done_it/clue_finder.h index 34eeda27..d9f1e2c0 100644 --- a/modules/you_done_it/clue_finder.h +++ b/modules/you_done_it/clue_finder.h @@ -21,7 +21,10 @@ public: void register_clue_marker(ClueMarker *marker); void remove_clue_marker(ClueMarker *marker); void take_photo(); + void send_photo(); + void delete_photo(); private: + ClueMarker *found_marker{ nullptr }; HashSet clue_markers{}; }; From c2e6467637593a853dc80f65e743f91180dda5a0 Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 22 Oct 2025 21:21:30 +0200 Subject: [PATCH 5/5] feat: registered image property on ClueData --- modules/you_done_it/clue_data.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/you_done_it/clue_data.cpp b/modules/you_done_it/clue_data.cpp index 45a53305..83bfbf84 100644 --- a/modules/you_done_it/clue_data.cpp +++ b/modules/you_done_it/clue_data.cpp @@ -1,10 +1,10 @@ #include "clue_data.h" -#include "core/config/engine.h" #include "you_done_it/macros.h" #include "you_done_it/ydi_client.h" void ClueData::_bind_methods() { BIND_HPROPERTY(Variant::INT, id, PROPERTY_HINT_ENUM, NetworkData::ClueID_hint()); + BIND_HPROPERTY(Variant::OBJECT, image, PROPERTY_HINT_RESOURCE_TYPE, "Image"); } void ClueData::set_revealed(bool value) {