Team-Immerse-Yourself/YouDunIt
6
0
Fork 0
Code Issues Pull requests Projects 2 Releases Packages Wiki Activity Actions

Merge branch 'development' into Fix_development

Browse source
This commit is contained in:
Sara Gerretsen 2025-11-04 12:36:45 +01:00
commit 7232429bd3
3 changed files with 63 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/you_done_it/SCsub
View file

@ -15,4 +15,4 @@ if env["platform"] == "linuxbsd":
env.Append(LIBS=['libzmq'])
if env["platform"] == "windows":
env.Append(LIBPATH=[Dir('libzmq/build/lib/Debug/')])
env.Append(LIBS=['libzmq-v143-mt-sgd-4_3_6.lib'])
env.Append(LIBS=['libzmq-v143-mt-sgd-4_3_6'])

9
modules/you_done_it/ydi_client.cpp
View file

@ -15,7 +15,7 @@ struct Connection {
std::optional<zmq::context_t> context{ std::nullopt };
std::optional<zmq::socket_t> socket{ std::nullopt };
std::recursive_mutex mtx;
std::optional<FixedVector<NetworkData::ClueID, 3>> conclusion{ std::nullopt };
FixedVector<NetworkData::ClueID, 3> conclusion{};
std::atomic<NetworkData::ConnectionStatus> status;
std::atomic<bool> stop_threads{ false };
};
@ -44,6 +44,13 @@ void handle_message(zmq::multipart_t const &message) {
case NetworkData::MSG_HEART:
multipart(NetworkData::MSG_BEAT).send(*connection->socket);
return;
case NetworkData::MSG_CONCLUSION:
print_line("Client: received conclusion:");
for (int i{ 1 }; i < 4; ++i) {
connection->conclusion.push_back(to_clue_id(message[i]));
print_line(" - ", connection->conclusion[i - 1]);
}
return;
default:
print_line("Client: Message not handled:");
print_message_contents(message);

82
vr-project/scenes/game_scene.tscn
View file

@ -112,43 +112,23 @@ shadow_blur = 1.054
[node name="Block Out VR" parent="." instance=ExtResource("1_w5aja")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.38688594, -0.0103544, 1.4647582)
[node name="ClueMarker" type="ClueMarker" parent="."]
_import_path = NodePath("")
unique_name_in_owner = false
process_mode = 0
process_priority = 0
process_physics_priority = 0
process_thread_group = 0
physics_interpolation_mode = 0
auto_translate_mode = 0
editor_description = ""
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2472578, 0.96516895, 2.9078503)
clue_id = 0
script = null
[node name="ClueMarker2" type="ClueMarker" parent="."]
_import_path = NodePath("")
unique_name_in_owner = false
process_mode = 0
process_priority = 0
process_physics_priority = 0
process_thread_group = 0
physics_interpolation_mode = 0
auto_translate_mode = 0
editor_description = ""
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.1681437, 0.93944424, 2.9801283)
clue_id = 1
script = null
[node name="Stapler" parent="." instance=ExtResource("3_ycayy")]
transform = Transform3D(-1.8868132, 0, -1.8585076, 0, 2.6484175, 0, 1.8585076, 0, -1.8868132, -1.2748423, 0.9004388, 2.876501)
[node name="ClueMarker" type="ClueMarker" parent="Stapler"]
transform = Transform3D(-0.26900235, 0, 0.26496682, 0, 0.37758398, 0, -0.26496682, 0, -0.26900235, 0.00088620186, 0.024441063, -0.015742004)
clue_id = 0
[node name="Filing Cabinets" parent="." instance=ExtResource("4_bw6k5")]
transform = Transform3D(-5.1816137e-08, 0, -1.185415, 0, 1.185415, 0, 1.185415, 0, -5.1816137e-08, -1.5581112, 5.8381664e-07, -1.7577046)
[node name="Knife" parent="." instance=ExtResource("5_y3j0m")]
transform = Transform3D(-0.437768, 0.39613712, 0.80711496, 0.6709704, 0.74148417, 0, -0.59846294, 0.5415502, -0.59039426, 0.12756646, 0.923417, 3.030509)
[node name="ClueMarker" type="ClueMarker" parent="Knife"]
transform = Transform3D(-0.43776804, 0.67097044, -0.598463, 0.39613712, 0.74148417, 0.5415503, 0.8071151, -1.4901163e-08, -0.5903944, 0.023141384, 0.00067448616, 0.062494874)
clue_id = 3
[node name="Lamp" parent="." instance=ExtResource("6_kk2rg")]
transform = Transform3D(1.0885172, 0, 0, 0, 1.0577642, 0, 0, 0, 1.0371894, -3.014063, 0, -0.5029955)
@ -236,6 +216,10 @@ transform = Transform3D(-1.4768354, 0, 1.2910905e-07, 0, 1.4768354, 0, -1.291090
[node name="Apple" parent="." instance=ExtResource("9_utbpp")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.22358268, 0.9, 2.8458138)
[node name="ClueMarker" type="ClueMarker" parent="Apple"]
transform = Transform3D(-0.26900235, 0, 0.26496682, 0, 0.37758398, 0, -0.26496682, 0, -0.26900235, 0.00088620186, 0.07528615, -0.015742064)
clue_id = 4
[node name="Rug" parent="." instance=ExtResource("10_mw25s")]
transform = Transform3D(0.8833835, 0, 0, 0, 0.97992885, 0, 0, 0, 0.94528943, -0.1365559, 0.022262793, 1.6618729)
@ -258,6 +242,10 @@ texture_albedo = ExtResource("15_liy57")
upper_fade = 1e-05
lower_fade = 1e-05
[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.13192797, -0.012815356, 0.10820985)
clue_id = 1
[node name="Footprint R" type="Decal" parent="."]
transform = Transform3D(0.9589733, 0, 0.2834965, 0, 1, 0, -0.2834965, 0, 0.9589733, -0.32598627, 0.95479137, 2.6602883)
size = Vector3(0.18164063, 0.13964844, 0.28027344)
@ -265,6 +253,9 @@ texture_albedo = ExtResource("16_mwyo0")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Footprint R"]
clue_id = 6
[node name="Footprint L" type="Decal" parent="."]
transform = Transform3D(0.9589733, 0, 0.2834965, 0, 1, 0, -0.2834965, 0, 0.9589733, -0.513774, 0.9548867, 2.685413)
size = Vector3(0.19921875, 0.12917823, 0.29516602)
@ -272,6 +263,9 @@ texture_albedo = ExtResource("17_rw4oa")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Footprint L"]
clue_id = 6
[node name="Footprint2 R" type="Decal" parent="."]
transform = Transform3D(0.9589733, 0, 0.2834965, 0, 1, 0, -0.2834965, 0, 0.9589733, -0.7626537, 0.94024795, 2.8040764)
size = Vector3(0.17626953, 0.099365234, 0.2541504)
@ -279,6 +273,9 @@ texture_albedo = ExtResource("18_r47aq")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Footprint2 R"]
clue_id = 6
[node name="Footprint2 L" type="Decal" parent="."]
transform = Transform3D(0.9589733, 0, 0.2834965, 0, 1, 0, -0.2834965, 0, 0.9589733, -0.9112543, 0.9222919, 2.8204436)
size = Vector3(0.17578125, 0.12597656, 0.24414063)
@ -286,6 +283,9 @@ texture_albedo = ExtResource("19_6irsn")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Footprint2 L"]
clue_id = 6
[node name="Bloodsplatter2" type="Decal" parent="."]
transform = Transform3D(-0.599331, 0, 0.8005013, 0, 1, 0, -0.8005013, 0, -0.599331, 0.51748204, 0.9300381, 2.6389475)
size = Vector3(0.5859375, 0.07910156, 0.4267578)
@ -293,6 +293,9 @@ texture_albedo = ExtResource("20_gqftm")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter2"]
clue_id = 2
[node name="Scratch" type="Decal" parent="."]
transform = Transform3D(-0.07245497, 0, 0.9973717, 0, 1, 0, -0.9973717, 0, -0.07245497, -1.0733345, 0.924097, 3.2352705)
size = Vector3(0.25585938, 0.092166565, 0.13891602)
@ -314,31 +317,54 @@ texture_albedo = ExtResource("27_lm11r")
upper_fade = 3.6621128e-05
lower_fade = 4.206671e-05
[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter3"]
clue_id = 2
[node name="Buisnesscard1" type="Sprite3D" parent="."]
transform = Transform3D(0.006, 0, 0, 0, -2.6226832e-10, 0.222, 0, -0.006, -9.703928e-09, -1.6939461, 0.90204763, 2.6792004)
material_override = ExtResource("29_bpk3j")
texture = ExtResource("25_5dk4p")
[node name="ClueMarker" type="ClueMarker" parent="Buisnesscard1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.062170506)
clue_id = 7
[node name="Buisnesscard2" type="Sprite3D" parent="."]
transform = Transform3D(0.006, 0, 0, 0, -2.6226832e-10, 0.222, 0, -0.006, -9.703928e-09, -1.5378518, 0.90204763, 2.6792004)
material_override = ExtResource("31_ngbhp")
texture = ExtResource("26_bpk3j")
[node name="ClueMarker" type="ClueMarker" parent="Buisnesscard2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.062170506)
clue_id = 7
[node name="Document1" type="Sprite3D" parent="."]
transform = Transform3D(0.013686965, -0.002943977, -4.440892e-16, -1.2868531e-10, -5.982762e-10, 0.518, -0.002943977, -0.013686965, -2.26425e-08, -1.6418377, 0.9020476, 3.0393605)
material_override = ExtResource("28_twkf6")
texture = ExtResource("29_4fjq2")
[node name="ClueMarker" type="ClueMarker" parent="Document1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.062170506)
clue_id = 8
[node name="Document2" type="Sprite3D" parent="."]
transform = Transform3D(0.013671204, 0.003016317, 0, 1.318474e-10, -5.975873e-10, 0.518, 0.003016317, -0.013671204, -2.26425e-08, -1.3745216, 0.9020477, 3.1730976)
material_override = ExtResource("30_o4j5v")
texture = ExtResource("31_qlrfd")
[node name="ClueMarker" type="ClueMarker" parent="Document2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.062170506)
clue_id = 8
[node name="Folder" type="Sprite3D" parent="."]
transform = Transform3D(0.016600749, 0.003662671, 5.1797198e-09, 0, -7.4309364e-10, 0.55, 0.003662671, -0.016600749, -2.3476645e-08, 0.4551283, 0.9020477, 3.1117392)
material_override = ExtResource("32_o4j5v")
texture = ExtResource("33_qlrfd")
[node name="ClueMarker" type="ClueMarker" parent="Folder"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.062170506)
clue_id = 5
[node name="Card1" type="Sprite3D" parent="."]
transform = Transform3D(0.006, 0, 0, 0, -2.6226832e-10, 0.222, 0, -0.006, -9.703928e-09, -1.6939461, 0.90204763, 2.5409558)
material_override = ExtResource("26_lm11r")