diff --git a/assets/sfxzip/Detective SFX/Muziek/Discussion track.ogg b/assets/sfxzip/Detective SFX/Muziek/Discussion track.ogg new file mode 100644 index 00000000..47831d7b Binary files /dev/null and b/assets/sfxzip/Detective SFX/Muziek/Discussion track.ogg differ diff --git a/assets/sfxzip/Detective SFX/Muziek/Exploring wip.mp3 b/assets/sfxzip/Detective SFX/Muziek/Exploring wip.mp3 new file mode 100644 index 00000000..b7a3a739 Binary files /dev/null and b/assets/sfxzip/Detective SFX/Muziek/Exploring wip.mp3 differ diff --git a/assets/sfxzip/Detective SFX/Muziek/Verdictstingerplaceholder.ogg b/assets/sfxzip/Detective SFX/Muziek/Verdictstingerplaceholder.ogg new file mode 100644 index 00000000..78aaf460 Binary files /dev/null and b/assets/sfxzip/Detective SFX/Muziek/Verdictstingerplaceholder.ogg differ diff --git a/assets/sfxzip/Detective SFX/Muziek/ending track.mp3 b/assets/sfxzip/Detective SFX/Muziek/ending track.mp3 new file mode 100644 index 00000000..2bec81dc Binary files /dev/null and b/assets/sfxzip/Detective SFX/Muziek/ending track.mp3 differ diff --git a/assets/sfxzip/Detective SFX/Pinning SFX/pin1.ogg b/assets/sfxzip/Detective SFX/Pinning SFX/pin1.ogg new file mode 100644 index 00000000..0a6fbc68 Binary files /dev/null and b/assets/sfxzip/Detective SFX/Pinning SFX/pin1.ogg differ diff --git a/assets/sfxzip/Detective SFX/Pinning SFX/pin2.ogg b/assets/sfxzip/Detective SFX/Pinning SFX/pin2.ogg new file mode 100644 index 00000000..c2d89ed4 Binary files /dev/null and b/assets/sfxzip/Detective SFX/Pinning SFX/pin2.ogg differ diff --git a/assets/sfxzip/Detective SFX/Pinning SFX/pin3.ogg b/assets/sfxzip/Detective SFX/Pinning SFX/pin3.ogg new file mode 100644 index 00000000..171f4963 Binary files /dev/null and b/assets/sfxzip/Detective SFX/Pinning SFX/pin3.ogg differ diff --git a/assets/sfxzip/Detective SFX/footsteps.rar b/assets/sfxzip/Detective SFX/footsteps.rar new file mode 100644 index 00000000..ddd665e1 Binary files /dev/null and b/assets/sfxzip/Detective SFX/footsteps.rar differ diff --git a/assets/sfxzip/Detective SFX/paper ruffling.ogg b/assets/sfxzip/Detective SFX/paper ruffling.ogg new file mode 100644 index 00000000..f9d58be2 Binary files /dev/null and b/assets/sfxzip/Detective SFX/paper ruffling.ogg differ diff --git a/assets/sfxzip/Detective SFX/paper tear.mp3 b/assets/sfxzip/Detective SFX/paper tear.mp3 new file mode 100644 index 00000000..9e5ab076 Binary files /dev/null and b/assets/sfxzip/Detective SFX/paper tear.mp3 differ diff --git a/assets/sfxzip/Detective SFX/phone call end.ogg b/assets/sfxzip/Detective SFX/phone call end.ogg new file mode 100644 index 00000000..cb270b3f Binary files /dev/null and b/assets/sfxzip/Detective SFX/phone call end.ogg differ diff --git a/assets/sfxzip/Detective SFX/phone pickup.ogg b/assets/sfxzip/Detective SFX/phone pickup.ogg new file mode 100644 index 00000000..437ce1c3 Binary files /dev/null and b/assets/sfxzip/Detective SFX/phone pickup.ogg differ diff --git a/assets/sfxzip/Detective SFX/phone ringing.ogg b/assets/sfxzip/Detective SFX/phone ringing.ogg new file mode 100644 index 00000000..f6fdb636 Binary files /dev/null and b/assets/sfxzip/Detective SFX/phone ringing.ogg differ diff --git a/assets/sfxzip/Detective SFX/photo sent2.ogg b/assets/sfxzip/Detective SFX/photo sent2.ogg new file mode 100644 index 00000000..efb46393 Binary files /dev/null and b/assets/sfxzip/Detective SFX/photo sent2.ogg differ diff --git a/assets/sfxzip/Detective SFX/photo taken2.ogg b/assets/sfxzip/Detective SFX/photo taken2.ogg new file mode 100644 index 00000000..d12a0e42 Binary files /dev/null and b/assets/sfxzip/Detective SFX/photo taken2.ogg differ diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp index 96012008..ca85d434 100644 --- a/modules/you_done_it/clue_finder.cpp +++ b/modules/you_done_it/clue_finder.cpp @@ -1,7 +1,6 @@ #include "clue_finder.h" #include "core/config/engine.h" #include "core/math/math_defs.h" -#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/xr/xr_nodes.h" #include "scene/main/node.h" #include "scene/resources/material.h" @@ -10,10 +9,14 @@ ClueFinder *ClueFinder::singleton_instance{ nullptr }; String const ClueFinder::sig_found_marker_changed{ "found_marker_changed" }; +String const ClueFinder::sig_clue_deleted{ "clue_deleted" }; +String const ClueFinder::sig_clue_sent{ "clue_sent" }; void ClueFinder::_bind_methods() { ClassDB::bind_method(D_METHOD("take_photo"), &ClueFinder::take_photo); ADD_SIGNAL(MethodInfo(sig_found_marker_changed, PropertyInfo(Variant::BOOL, "has_marker"))); + ADD_SIGNAL(MethodInfo(sig_clue_deleted)); + ADD_SIGNAL(MethodInfo(sig_clue_sent)); BIND_HPROPERTY(Variant::OBJECT, empty_texture, PROPERTY_HINT_RESOURCE_TYPE, "Texture"); BIND_HPROPERTY(Variant::OBJECT, photo_material, PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D"); } @@ -105,6 +108,7 @@ void ClueFinder::send_photo() { this->found_marker->reveal(); this->found_marker = nullptr; emit_signal(sig_found_marker_changed, false); + emit_signal(sig_clue_sent); photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, this->empty_texture); } } @@ -113,6 +117,7 @@ void ClueFinder::delete_photo() { if (this->found_marker) { this->found_marker = nullptr; emit_signal(sig_found_marker_changed, false); + emit_signal(sig_clue_deleted); photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, this->empty_texture); } } diff --git a/modules/you_done_it/clue_finder.h b/modules/you_done_it/clue_finder.h index acee08f4..71cfa304 100644 --- a/modules/you_done_it/clue_finder.h +++ b/modules/you_done_it/clue_finder.h @@ -38,4 +38,6 @@ private: public: static String const sig_found_marker_changed; + static String const sig_clue_deleted; + static String const sig_clue_sent; }; diff --git a/vr-project/Screenshots/camera.tres b/vr-project/Screenshots/camera.tres index b08acac8..239fe675 100644 --- a/vr-project/Screenshots/camera.tres +++ b/vr-project/Screenshots/camera.tres @@ -1,6 +1,8 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cuqb70irkbrnt"] -[ext_resource type="Texture2D" uid="uid://cbtvb611mgvon" path="res://Screenshots/business_card_graves.png" id="1_j1r2d"] +[ext_resource type="Texture2D" uid="uid://dejt8m4v8krty" path="res://Screenshots/empty.tres" id="1_j1r2d"] [resource] +diffuse_mode = 3 +specular_mode = 1 albedo_texture = ExtResource("1_j1r2d") diff --git a/vr-project/Screenshots/empty.tres b/vr-project/Screenshots/empty.tres index 56f03545..ce084093 100644 --- a/vr-project/Screenshots/empty.tres +++ b/vr-project/Screenshots/empty.tres @@ -1,7 +1,7 @@ [gd_resource type="GradientTexture1D" load_steps=2 format=3 uid="uid://dejt8m4v8krty"] [sub_resource type="Gradient" id="Gradient_3y05i"] -colors = PackedColorArray(0, 0, 0, 1, 0.29827362, 0.29827365, 0.29827365, 1) +colors = PackedColorArray(0.45217735, 0.45217735, 0.45217735, 1, 0.29827362, 0.29827365, 0.29827365, 1) [resource] gradient = SubResource("Gradient_3y05i") diff --git a/vr-project/sounds/Detective SFX/paper tear.mp3 b/vr-project/sounds/Detective SFX/paper tear.mp3 new file mode 100644 index 00000000..9e5ab076 Binary files /dev/null and b/vr-project/sounds/Detective SFX/paper tear.mp3 differ diff --git a/vr-project/sounds/Detective SFX/paper tear.mp3.import b/vr-project/sounds/Detective SFX/paper tear.mp3.import new file mode 100644 index 00000000..166a71ca --- /dev/null +++ b/vr-project/sounds/Detective SFX/paper tear.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://wxbioki5jty6" +path="res://.godot/imported/paper tear.mp3-f1d3386bab463f26e500c297ec6fb2be.mp3str" + +[deps] + +source_file="res://sounds/Detective SFX/paper tear.mp3" +dest_files=["res://.godot/imported/paper tear.mp3-f1d3386bab463f26e500c297ec6fb2be.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/vr-project/sounds/Detective SFX/photo sent2.ogg b/vr-project/sounds/Detective SFX/photo sent2.ogg new file mode 100644 index 00000000..efb46393 Binary files /dev/null and b/vr-project/sounds/Detective SFX/photo sent2.ogg differ diff --git a/vr-project/sounds/Detective SFX/photo sent2.ogg.import b/vr-project/sounds/Detective SFX/photo sent2.ogg.import new file mode 100644 index 00000000..e7d48d0e --- /dev/null +++ b/vr-project/sounds/Detective SFX/photo sent2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://jswt268du1pe" +path="res://.godot/imported/photo sent2.ogg-9e046792ce9fc6dfed47783c62682021.oggvorbisstr" + +[deps] + +source_file="res://sounds/Detective SFX/photo sent2.ogg" +dest_files=["res://.godot/imported/photo sent2.ogg-9e046792ce9fc6dfed47783c62682021.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/vr-project/vr_base.tscn b/vr-project/vr_base.tscn index c4020dc2..77b5f43c 100644 --- a/vr-project/vr_base.tscn +++ b/vr-project/vr_base.tscn @@ -1,16 +1,18 @@ -[gd_scene load_steps=28 format=4 uid="uid://ctf3dsro4aqon"] +[gd_scene load_steps=30 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://dejt8m4v8krty" path="res://Screenshots/empty.tres" id="2_sb8vi"] [ext_resource type="Material" uid="uid://cuqb70irkbrnt" path="res://Screenshots/camera.tres" id="3_btcmj"] -[ext_resource type="Texture2D" uid="uid://cixjbnroqtf0m" path="res://Screenshots/signed_papers.png" id="3_iyk8l"] [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://tuq77602j30a" path="res://UI elements/A_Button.png" id="5_71qfo"] +[ext_resource type="Texture2D" uid="uid://bwgimdlsfucwd" path="res://Screenshots/victim_blood.png" id="5_tuwdj"] [ext_resource type="AudioStream" uid="uid://bof8u3k3pne1q" path="res://sounds/Detective SFX/photo taken2.ogg" id="6_hkenl"] [ext_resource type="Texture2D" uid="uid://brnep4ge1rh17" path="res://UI elements/B_Button.png" id="6_x2gwt"] +[ext_resource type="AudioStream" uid="uid://wxbioki5jty6" path="res://sounds/Detective SFX/paper tear.mp3" id="7_71yui"] +[ext_resource type="AudioStream" uid="uid://jswt268du1pe" path="res://sounds/Detective SFX/photo sent2.ogg" id="8_tuwdj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nmntx"] resource_name = "Material" @@ -397,12 +399,12 @@ photo_material = ExtResource("3_btcmj") 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="Sprite3D" type="Sprite3D" parent="RightController/ClueFinder/Camera_asset"] -transform = Transform3D(-6.995666e-08, 0.00030715764, -0.9266038, 9.772177e-12, 0.9266038, 0.00030715764, 0.92660373, 1.3422152e-11, -6.995664e-08, -0.1022765, 0.015313052, 0.003340669) +transform = Transform3D(-6.4526006e-08, 0.00028331578, -0.8546725, 9.011897e-12, 0.8546725, 0.00028331578, 0.8546725, 1.2379431e-11, -6.452599e-08, -0.10227652, 0.015313044, 0.0054907724) material_override = ExtResource("3_btcmj") pixel_size = 0.0001 -texture = ExtResource("3_iyk8l") +texture = ExtResource("5_tuwdj") -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="RightController/ClueFinder/Camera_asset"] +[node name="FlashSound" type="AudioStreamPlayer3D" parent="RightController/ClueFinder/Camera_asset"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.04537191, 0.11853313, -0.033608295) stream = ExtResource("6_hkenl") script = SubResource("GDScript_hkenl") @@ -417,6 +419,14 @@ light_color = Color(0.59700024, 0.38, 1, 1) light_energy = 2.876 omni_range = 10.439486 +[node name="DeleteSound" type="AudioStreamPlayer3D" parent="RightController/ClueFinder/Camera_asset"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.12590878, -0.056787297, 5.0099395e-08) +stream = ExtResource("7_71yui") + +[node name="SendSound" type="AudioStreamPlayer3D" parent="RightController/ClueFinder/Camera_asset"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.12590878, -0.056787297, 5.0099395e-08) +stream = ExtResource("8_tuwdj") + [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) @@ -566,5 +576,7 @@ texture = ExtResource("4_ho4oo") 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/ClueFinder/Camera_asset/AudioStreamPlayer3D" method="_on_clue_finder_found_marker_changed"] +[connection signal="clue_deleted" from="RightController/ClueFinder" to="RightController/ClueFinder/Camera_asset/DeleteSound" method="play"] +[connection signal="clue_sent" from="RightController/ClueFinder" to="RightController/ClueFinder/Camera_asset/SendSound" method="play"] +[connection signal="found_marker_changed" from="RightController/ClueFinder" to="RightController/ClueFinder/Camera_asset/FlashSound" method="_on_clue_finder_found_marker_changed"] [connection signal="found_marker_changed" from="RightController/ClueFinder" to="RightController/SendDeletePopup" method="_on_clue_finder_found_marker_changed"]