Merge branch 'development' of https://git.objectionable.solutions/Team-Immerse-Yourself/YouDunIt into development

modules/you_done_it/client_node.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <scene/main/node.h>
+#include "scene/main/node.h"
+#include "you_done_it/ydi_networking.h"
 
 class ClientNode : Node {
 	GDCLASS(ClientNode, Node);

modules/you_done_it/clue_data.cpp

@@ -1,10 +1,10 @@
 #include "clue_data.h"
 #include "you_done_it/macros.h"
 #include "you_done_it/ydi_client.h"
-#include <core/config/engine.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) {

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 <core/io/image.h>
-#include <core/io/resource.h>
 
 class ClueData : public Resource {
 	GDCLASS(ClueData, Resource);

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 <core/config/engine.h>
-#include <scene/main/node.h>
+#include "scene/main/node.h"
 
 ClueFinder *ClueFinder::singleton_instance{ nullptr };
 
@@ -33,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) {
@@ -73,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;
+}

modules/you_done_it/clue_finder.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "clue_marker.h"
-#include <core/templates/hash_set.h>
-#include <scene/3d/node_3d.h>
+#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);
@@ -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<ClueMarker *> clue_markers{};
 };

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() {

modules/you_done_it/clue_marker.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "clue_db.h"
-#include "ydi_networking.h"
-#include <scene/3d/marker_3d.h>
+#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);

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 <core/object/class_db.h>
 
 void initialize_you_done_it_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {

modules/you_done_it/server_node.cpp

@@ -1,6 +1,6 @@
 #include "server_node.h"
-#include "ydi_server.h"
-#include <core/config/engine.h>
+#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" };

modules/you_done_it/server_node.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <scene/main/node.h>
+#include "scene/main/node.h"
 
 class ServerNode : public Node {
 	GDCLASS(ServerNode, Node);

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 <atomic>
 #include <mutex>
 #include <optional>
 #include <thread>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 namespace ydi::client {
 struct Connection {

modules/you_done_it/ydi_client.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <core/string/ustring.h>
+#include "core/string/ustring.h"
+#include "you_done_it/ydi_networking.h"
 
 namespace ydi::client {
 void connect(String const &url);

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 <core/core_bind.h>
-#include <core/object/class_db.h>
 
 void NetworkData::_bind_methods() {
 	BIND_ENUM_CONSTANT(CLUE_FIRST);

modules/you_done_it/ydi_networking.h

@@ -1,13 +1,12 @@
 #pragma once
 
-#include "macros.h"
-#include <core/object/class_db.h>
-#include <core/object/object.h>
-#include <zmq.h>
+#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 <string>
 #include <string_view>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 class NetworkData : Object {
 	GDCLASS(NetworkData, Object);

modules/you_done_it/ydi_server.cpp

@@ -1,14 +1,14 @@
 #include "ydi_server.h"
-#include "ydi_networking.h"
-#include <core/os/time.h>
-#include <core/templates/vector.h>
+#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 <atomic>
 #include <mutex>
 #include <optional>
 #include <thread>
 #include <unordered_set>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 namespace ydi::server {
 struct Service {

modules/you_done_it/ydi_server.h

@@ -1,10 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <core/io/image.h>
-#include <core/object/ref_counted.h>
-#include <core/string/ustring.h>
-#include <core/templates/vector.h>
+#include "core/templates/vector.h"
+#include "you_done_it/ydi_networking.h"
 #include <cassert>
 
 namespace ydi::server {

modules/you_done_it/ydi_vr_origin.cpp

@@ -1,8 +1,8 @@
 #include "ydi_vr_origin.h"
-#include <core/config/engine.h>
-#include <scene/main/viewport.h>
-#include <servers/xr/xr_interface.h>
-#include <servers/xr_server.h>
+#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() {}
 

modules/you_done_it/ydi_vr_origin.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <scene/3d/xr/xr_nodes.h>
-#include <servers/xr/xr_interface.h>
+#include "scene/3d/xr/xr_nodes.h"
+#include "servers/xr/xr_interface.h"
 
 class VROrigin : public XROrigin3D {
 	GDCLASS(VROrigin, XROrigin3D);

vr-project/project.godot

@@ -19,14 +19,15 @@ 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]
 
-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=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)
+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
 

vr-project/scenes/game_scene.tscn

@@ -27,8 +27,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