diff --git a/modules/you_done_it/client_node.cpp b/modules/you_done_it/client_node.cpp index 8ddb6a70..1259113a 100644 --- a/modules/you_done_it/client_node.cpp +++ b/modules/you_done_it/client_node.cpp @@ -24,9 +24,8 @@ void ClientNode::enter_tree() { if (singleton_instance) { print_error("Attempt to create duplicate ClientNode, aborting"); abort(); - } else { - singleton_instance = this; } + singleton_instance = this; } void ClientNode::process() { @@ -71,6 +70,7 @@ void ClientNode::_notification(int what) { return; case NOTIFICATION_ENTER_TREE: set_process(true); + enter_tree(); return; case NOTIFICATION_PROCESS: process(); diff --git a/vr-project/UI elements/A_Button.png b/vr-project/UI elements/A_Button.png new file mode 100644 index 00000000..59f7772a Binary files /dev/null and b/vr-project/UI elements/A_Button.png differ diff --git a/vr-project/UI elements/A_Button.png.import b/vr-project/UI elements/A_Button.png.import new file mode 100644 index 00000000..027349e1 --- /dev/null +++ b/vr-project/UI elements/A_Button.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://tuq77602j30a" +path.s3tc="res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://UI elements/A_Button.png" +dest_files=["res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/vr-project/UI elements/B_Button.png b/vr-project/UI elements/B_Button.png new file mode 100644 index 00000000..461620b9 Binary files /dev/null and b/vr-project/UI elements/B_Button.png differ diff --git a/vr-project/UI elements/B_Button.png.import b/vr-project/UI elements/B_Button.png.import new file mode 100644 index 00000000..b2fdca05 --- /dev/null +++ b/vr-project/UI elements/B_Button.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brnep4ge1rh17" +path.s3tc="res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://UI elements/B_Button.png" +dest_files=["res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/vr-project/UI elements/Envelope_Back.png.import b/vr-project/UI elements/Envelope_Back.png.import index ed0af7f4..89653ec7 100644 --- a/vr-project/UI elements/Envelope_Back.png.import +++ b/vr-project/UI elements/Envelope_Back.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://7oya07qd7qxn" -path="res://.godot/imported/Envelope_Back.png-069496cc5011d1ddd22a1848459c04c3.ctex" +path.s3tc="res://.godot/imported/Envelope_Back.png-069496cc5011d1ddd22a1848459c04c3.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://UI elements/Envelope_Back.png" -dest_files=["res://.godot/imported/Envelope_Back.png-069496cc5011d1ddd22a1848459c04c3.ctex"] +dest_files=["res://.godot/imported/Envelope_Back.png-069496cc5011d1ddd22a1848459c04c3.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/vr-project/UI elements/VR_Failed.png b/vr-project/UI elements/VR_Failed.png new file mode 100644 index 00000000..a51b2887 Binary files /dev/null and b/vr-project/UI elements/VR_Failed.png differ diff --git a/vr-project/UI elements/VR_Failed.png.import b/vr-project/UI elements/VR_Failed.png.import new file mode 100644 index 00000000..005c3492 --- /dev/null +++ b/vr-project/UI elements/VR_Failed.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3knvj2q7vmif" +path="res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI elements/VR_Failed.png" +dest_files=["res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/vr-project/UI elements/VR_Succes.png b/vr-project/UI elements/VR_Succes.png new file mode 100644 index 00000000..83104f07 Binary files /dev/null and b/vr-project/UI elements/VR_Succes.png differ diff --git a/vr-project/UI elements/VR_Succes.png.import b/vr-project/UI elements/VR_Succes.png.import new file mode 100644 index 00000000..ff0020f4 --- /dev/null +++ b/vr-project/UI elements/VR_Succes.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://eyeddfidmekf" +path="res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI elements/VR_Succes.png" +dest_files=["res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/vr-project/objects/game_over_ui.tscn b/vr-project/objects/game_over_ui.tscn new file mode 100644 index 00000000..3817a395 --- /dev/null +++ b/vr-project/objects/game_over_ui.tscn @@ -0,0 +1,44 @@ +[gd_scene load_steps=4 format=3 uid="uid://chre5k8uyvfiu"] + +[sub_resource type="GDScript" id="GDScript_ww6lu"] +script/source = "extends Node3D + +func _enter_tree() -> void: + visible = false + ClientNode.get_singleton().conclusion_received.connect(_on_conclusion_received) + +func _on_conclusion_received(_method : int, _motive : int, murderer : int) -> void: + if murderer == NetworkData.CLUE_VELMA_GRAVES: + %Escaped.visible = false + else: + %Caught.visible = false + self.visible = true + +func _process(_delta) -> void: + var relative := get_viewport().get_camera_3d().global_position + global_position = relative + Vector3(0, 0, 4) + +" + +[sub_resource type="TextMesh" id="TextMesh_d4vfo"] +text = "You Were Caught" + +[sub_resource type="TextMesh" id="TextMesh_pn3ym"] +text = "You Got Away With Murder!" + +[node name="GameOverUI" type="Node3D"] +script = SubResource("GDScript_ww6lu") + +[node name="Caught" type="Node3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, -0.03917709, -1.6931363) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Caught"] +mesh = SubResource("TextMesh_d4vfo") + +[node name="Escaped" type="Node3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, -0.03917709, -1.6931363) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Escaped"] +mesh = SubResource("TextMesh_pn3ym") diff --git a/vr-project/scenes/game_root.tscn b/vr-project/scenes/game_root.tscn index 612046e7..3f0aeac3 100644 --- a/vr-project/scenes/game_root.tscn +++ b/vr-project/scenes/game_root.tscn @@ -31,7 +31,16 @@ script = SubResource("GDScript_78s5d") game_scene = ExtResource("1_78s5d") [node name="ClientNode" type="ClientNode" parent="."] +_import_path = NodePath("") unique_name_in_owner = true +process_mode = 0 +process_priority = 0 +process_physics_priority = 0 +process_thread_group = 0 +physics_interpolation_mode = 0 +auto_translate_mode = 0 +editor_description = "" +script = null [node name="PanelContainer" type="PanelContainer" parent="."] anchors_preset = 15 @@ -60,6 +69,5 @@ placeholder_text = "IP Address" layout_mode = 2 text = "Connect" -[connection signal="connection_changed" from="ClientNode" to="." method="_on_client_node_connection_changed"] [connection signal="text_submitted" from="PanelContainer/CenterContainer/AspectRatioContainer/VBoxContainer/LineEdit" to="PanelContainer/CenterContainer/AspectRatioContainer/VBoxContainer" method="_on_line_edit_text_submitted"] [connection signal="pressed" from="PanelContainer/CenterContainer/AspectRatioContainer/VBoxContainer/Button" to="PanelContainer/CenterContainer/AspectRatioContainer/VBoxContainer" method="_on_button_pressed"] diff --git a/vr-project/scenes/game_scene.tscn b/vr-project/scenes/game_scene.tscn index c6f4f653..55e5311a 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=50 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=51 format=3 uid="uid://b5m5h30gog3pu"] [ext_resource type="PackedScene" uid="uid://2cbtvp67pwom" path="res://3D Models/Block Out VR.blend" id="1_w5aja"] [ext_resource type="PackedScene" uid="uid://ctf3dsro4aqon" path="res://vr_base.tscn" id="2_onqr8"] +[ext_resource type="PackedScene" uid="uid://chre5k8uyvfiu" path="res://objects/game_over_ui.tscn" id="2_ww6lu"] [ext_resource type="PackedScene" uid="uid://bf4jrykbuk2q2" path="res://3D Models/Stapler.blend" id="3_ycayy"] [ext_resource type="PackedScene" uid="uid://qi0hk5v0aag7" path="res://3D Models/Filing Cabinets.blend" id="4_bw6k5"] [ext_resource type="PackedScene" uid="uid://dgwr2md2wey24" path="res://3D Models/Knife.blend" id="5_y3j0m"] @@ -90,16 +91,9 @@ fog_height_density = -0.6636 [node name="Root" type="Node3D"] [node name="VROrigin" parent="." instance=ExtResource("2_onqr8")] -_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 = "" -script = null + +[node name="GameOverUI" parent="." instance=ExtResource("2_ww6lu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5185778, 0.96736765, 1.6569399) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_bw6k5") @@ -118,11 +112,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.38688594, -0.0103544, 1.46 [node name="Stapler" parent="." instance=ExtResource("3_ycayy")] transform = Transform3D(-1.9726052, 0, 1.7671852, 0, 2.6484175, 0, -1.7671852, 0, -1.9726052, 0.40129814, 1.1189419, 3.1127234) +[node name="ClueMarker" type="ClueMarker" parent="Stapler"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.028165957, 0) +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.5466789, -0.053719245, 0.83561736, -0.11416241, 0.99340326, -0.010824659, -0.82952344, -0.101313755, -0.5492052, 0.8759462, 0.058308348, 3.8492327) +transform = Transform3D(-0.5466789, -0.053719245, 0.83561736, -0.11416241, 0.99340326, -0.010824659, -0.82952344, -0.101313755, -0.5492052, 0.8775213, 0.029181391, 3.8522031) + +[node name="ClueMarker" type="ClueMarker" parent="Knife"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.7252903e-09, 0, 0.08833364) +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) @@ -211,6 +213,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(-0.7688565, -0.22517157, 0.59846264, 0.61459136, -0.0019505993, 0.7888432, -0.17645782, 0.97431725, 0.13988826, 2.0476034, 0.07884676, 2.7876625) +[node name="ClueMarker" type="ClueMarker" parent="Apple"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8626451e-09, 0.09626824, 0) +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.13758563, 0.0048140995, 1.6608908) @@ -234,6 +240,9 @@ texture_albedo = ExtResource("15_liy57") upper_fade = 1e-05 lower_fade = 1e-05 +[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter1"] +clue_id = 1 + [node name="Bloodsplatter4" type="Decal" parent="."] transform = Transform3D(-0.8823406, 0, -0.47061145, 0, 1, 0, 0.47061145, 0, -0.8823406, 0.7437153, 1.156807, 2.540987) layers = 2 @@ -242,6 +251,9 @@ texture_albedo = ExtResource("15_liy57") upper_fade = 1e-05 lower_fade = 1e-05 +[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter4"] +clue_id = 1 + [node name="Footprint R" type="Decal" parent="."] transform = Transform3D(0.8491654, 0, -0.52812713, 0, 1, 0, 0.52812713, 0, 0.8491654, 1.148722, -0.012379527, -1.3868501) size = Vector3(0.20458984, 0.13964844, 0.38183594) @@ -270,6 +282,10 @@ texture_albedo = ExtResource("17_rw4oa") upper_fade = 3.6621128e-05 lower_fade = 4.206671e-05 +[node name="ClueMarker" type="ClueMarker" parent="Footprint R"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.16852462, 0.009639382, 0.15745556) +clue_id = 6 + [node name="Hair" type="Decal" parent="."] transform = Transform3D(-0.3621941, 0, -0.9321027, 0, 1, 0, 0.9321027, 0, -0.3621941, -1.1590292, 0.6544432, 1.9611405) size = Vector3(0.15872192, 0.12597656, 0.3642273) @@ -277,6 +293,10 @@ texture_albedo = ExtResource("18_584by") upper_fade = 3.6621128e-05 lower_fade = 4.206671e-05 +[node name="ClueMarker" type="ClueMarker" parent="Hair"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.009119272, 0) +clue_id = 10 + [node name="Footprint2 R2" type="Decal" parent="."] transform = Transform3D(0.9815339, 0, 0.19128862, 0, 1, 0, -0.19128862, 0, 0.9815339, -0.15119411, 0.043035507, 1.3314617) size = Vector3(0.22729492, 0.099365234, 0.36486816) @@ -291,6 +311,10 @@ texture_albedo = ExtResource("21_v7uyc") upper_fade = 3.6621128e-05 lower_fade = 4.206671e-05 +[node name="ClueMarker" type="ClueMarker" parent="Footprint2 R2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.142824, 0.027901143, 0.05373939) +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.7452566, 0.014263272, 1.1378098) layers = 2 @@ -299,6 +323,10 @@ texture_albedo = ExtResource("20_gqftm") upper_fade = 3.6621128e-05 lower_fade = 4.206671e-05 +[node name="ClueMarker" type="ClueMarker" parent="Bloodsplatter2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.043592602, 0) +clue_id = 2 + [node name="Scratch" type="Decal" parent="."] transform = Transform3D(-0.6355933, 0, 0.77202415, 0, 1, 0, -0.77202415, 0, -0.6355933, 0.52548635, 1.0966023, 2.9547005) size = Vector3(0.1230278, 0.25496694, 0.13343811) @@ -325,6 +353,10 @@ transform = Transform3D(0.005720883, -0.0018087283, 0, -7.9062014e-11, -2.500677 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, -3.5527137e-15, 0, 0.06289639) +clue_id = 7 + [node name="Buisnesscard2" type="Sprite3D" parent="."] transform = Transform3D(0.004489013, -0.0039810506, 0, -1.7401725e-10, -1.9622098e-10, 0.222, -0.0039810506, -0.004489013, -9.703928e-09, -1.027857, 0.11634141, -1.3167363) material_override = ExtResource("31_ngbhp") @@ -335,11 +367,19 @@ transform = Transform3D(0.0117143, -0.0076664984, 0, -3.3511327e-10, -5.120483e- 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, -3.5527137e-15, 0, 0.040631033) +clue_id = 8 + [node name="Document2" type="Sprite3D" parent="."] transform = Transform3D(-0.012558702, -0.006187002, 1.3322676e-15, -2.7044245e-10, 5.489583e-10, 0.518, -0.006187002, 0.012558702, -2.26425e-08, -2.440934, 0.023508262, 2.4400322) 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, -3.5527137e-15, 7.1054274e-15, 0.06605714) +clue_id = 8 + [node name="Folder" type="Sprite3D" parent="."] transform = Transform3D(-0.0071196416, 0.015437318, 5.1797184e-09, 7.259893e-10, 1.585169e-10, 0.55, 0.015437318, 0.0071196416, -2.3476645e-08, 1.981359, 1.0726281, 2.5971837) material_override = ExtResource("32_o4j5v") diff --git a/vr-project/vr_base.tscn b/vr-project/vr_base.tscn index a5e069c0..fc79bc5e 100644 --- a/vr-project/vr_base.tscn +++ b/vr-project/vr_base.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=19 format=4 uid="uid://ctf3dsro4aqon"] +[gd_scene load_steps=20 format=4 uid="uid://ctf3dsro4aqon"] [ext_resource type="Texture2D" uid="uid://c0aarcidro2ml" path="res://Textures/HandLeftMat.png" id="1_pvnbl"] [ext_resource type="PackedScene" uid="uid://jl44wibohg6a" path="res://3D Models/Camera_asset.blend" id="2_pvnbl"] [ext_resource type="Texture2D" uid="uid://bgyefxmoyrpqe" path="res://Textures/HandRightCameraMat.png" id="3_pvnbl"] [ext_resource type="Texture2D" uid="uid://cvm0k5l7n5w7n" path="res://UI elements/Dele_Button.png" id="4_ho4oo"] [ext_resource type="Texture2D" uid="uid://dh1v02dybfrey" path="res://UI elements/Save Photo_Button.png" id="4_qs2no"] -[ext_resource type="Texture2D" uid="uid://b0vg80bljwuk4" path="res://UI elements/X_Button.png" id="5_x2gwt"] -[ext_resource type="Texture2D" uid="uid://g81rhcfasgdj" path="res://UI elements/Left_Button.png" id="6_iyk8l"] +[ext_resource type="Texture2D" uid="uid://tuq77602j30a" path="res://UI elements/A_Button.png" id="5_71qfo"] +[ext_resource type="Texture2D" uid="uid://brnep4ge1rh17" path="res://UI elements/B_Button.png" id="6_x2gwt"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nmntx"] resource_name = "Material" @@ -95,6 +95,9 @@ _data = { &"RESET": SubResource("Animation_csfug") } +[sub_resource type="QuadMesh" id="QuadMesh_x2gwt"] +size = Vector2(0.143, 0.143) + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_w55c1"] resource_name = "Material.001" cull_mode = 2 @@ -192,6 +195,9 @@ _data = { [sub_resource type="GDScript" id="GDScript_x2gwt"] script/source = "extends Node3D +func _enter_tree() -> void: + visible = false + func _on_clue_finder_found_marker_changed(has_marker: bool) -> void: visible = has_marker " @@ -346,6 +352,10 @@ transform = Transform3D(1, 0, 0, 0, -0.25849885, -0.96601164, 0, 0.96601164, -0. [node name="Camera_asset" parent="RightController/ClueFinder" instance=ExtResource("2_pvnbl")] transform = Transform3D(-7.5497894e-08, 1.0540293e-11, 1, -0.00033155084, -0.9999999, -1.4484414e-11, 0.9999999, -0.00033155084, 7.549793e-08, -0.017460376, 9.406052e-05, 0.06945008) +[node name="MeshInstance3D" type="MeshInstance3D" parent="RightController/ClueFinder"] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.014130591, -0.0096812295, -0.03398455) +mesh = SubResource("QuadMesh_x2gwt") + [node name="VR Hand Right Camera" type="Node3D" parent="RightController"] transform = Transform3D(0.85242325, 0.44246125, 0.2785726, -0.16515681, -0.27765465, 0.94637775, 0.4960825, -0.85272264, -0.16360374, 0.007563427, 0.00068473816, 0.0065676123) @@ -476,22 +486,23 @@ libraries = { } [node name="SendDeletePopup" type="Node3D" parent="RightController"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.03526345, -0.004750766, 0.0015540421) script = SubResource("GDScript_x2gwt") [node name="Sprite3D" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(0.024243923, 0, 0, 0, 0.012121962, 0.020995853, 0, -0.020995853, 0.012121962, 0.19533283, 0.00052747875, -0.054790676) +transform = Transform3D(0.019132394, 0, 0, 0, 0.0035460119, 0.01880091, 0, -0.01880091, 0.0035460119, 0.14982739, -0.0013536327, -0.076785505) texture = ExtResource("4_qs2no") -[node name="Sprite3D3" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(0.024243923, 0, 0, 0, 0.012121962, 0.020995853, 0, -0.020995853, 0.012121962, 0.015297756, 0.029627975, -0.10519428) -texture = ExtResource("5_x2gwt") - -[node name="Sprite3D4" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(-1.3237387e-09, 0.030283615, 0, -0.015141808, -1.1633353e-09, 0.02622638, 0.026226377, 1.1633353e-09, 0.015141809, 0.055142492, -0.0019377172, -0.050520867) -texture = ExtResource("6_iyk8l") +[node name="Sprite3D6" type="Sprite3D" parent="RightController/SendDeletePopup"] +transform = Transform3D(0.01971072, 3.6190773e-09, 6.0617084e-10, -2.3009707e-09, 0.003653201, 0.019369224, 2.387995e-09, -0.01936922, 0.0036532015, 0.024356574, -0.0012763627, -0.07759598) +texture = ExtResource("6_x2gwt") [node name="Sprite3D2" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(0.028563617, 0, 0, 0, 0.014281811, 0.024736822, 0, -0.024736822, 0.014281811, -0.08789468, 0.025699826, -0.09839058) +transform = Transform3D(0.025283948, 0, 0, 0, 0.0046861465, 0.02484589, 0, -0.02484589, 0.0046861465, 0.08324468, 0.010925824, -0.14189175) texture = ExtResource("4_ho4oo") +[node name="Sprite3D5" type="Sprite3D" parent="RightController/SendDeletePopup"] +transform = Transform3D(0.018740967, 3.4410212e-09, 5.763476e-10, -2.1877646e-09, 0.0034734658, 0.018416272, 2.2705073e-09, -0.018416267, 0.0034734665, -0.013277769, 0.011410562, -0.1448622) +texture = ExtResource("5_71qfo") + [connection signal="found_marker_changed" from="RightController/ClueFinder" to="RightController/SendDeletePopup" method="_on_clue_finder_found_marker_changed"]