diff --git a/flatscreen-project/clue_db.tres b/flatscreen-project/clue_db.tres index 26602631..34338e43 100644 --- a/flatscreen-project/clue_db.tres +++ b/flatscreen-project/clue_db.tres @@ -1,55 +1,79 @@ -[gd_resource type="ClueDB" load_steps=33 format=3 uid="uid://dlf8dxiter8b8"] +[gd_resource type="ClueDB" load_steps=51 format=3 uid="uid://dlf8dxiter8b8"] -[ext_resource type="Texture2D" uid="uid://p7uaxluyc0tk" path="res://assets/photo-images/Knife.jpg" id="1_q5eka"] +[ext_resource type="Texture2D" uid="uid://bu3fjxwoh43yr" path="res://assets/Screenshots/Stapler.png" id="1_fqtcy"] [ext_resource type="Texture2D" uid="uid://xna4wolwbnpa" path="res://assets/photo-images/VictimFloraLamb.png" id="2_0lck8"] [ext_resource type="Texture2D" uid="uid://7hh3r3rnf4kq" path="res://assets/photo-images/#4GordonChevield.png" id="2_bgtdi"] [ext_resource type="Texture2D" uid="uid://h6jhafohg215" path="res://assets/photo-images/#9VelmaGraves.png" id="2_doypg"] [ext_resource type="Texture2D" uid="uid://bdd155nyrgbd1" path="res://assets/photo-images/#8AmosSchwartz.png" id="2_du6rq"] [ext_resource type="Texture2D" uid="uid://cni216b1urj1t" path="res://assets/photo-images/#1FloydHunt.png" id="2_e5lqe"] [ext_resource type="Texture2D" uid="uid://dsdtbw48ce40y" path="res://assets/photo-images/#5SadieWood.png" id="2_k2o5n"] +[ext_resource type="Texture2D" uid="uid://b4k3hx3cbag1y" path="res://assets/Screenshots/HeadBloodSplatter.png" id="2_k6v75"] [ext_resource type="Texture2D" uid="uid://ooh0l61s7f6k" path="res://assets/photo-images/#6UrsulaGlass.png" id="2_mhl4k"] [ext_resource type="Texture2D" uid="uid://d1ap7ugrthds8" path="res://assets/photo-images/#2RichardOBrien.png" id="2_u53f6"] [ext_resource type="Texture2D" uid="uid://cewoyb3qs775u" path="res://assets/photo-images/#7BarneyOrtiz.png" id="2_y8781"] +[ext_resource type="Texture2D" uid="uid://cmongc0y04rlv" path="res://assets/Screenshots/FootBloodSplatter.png" id="3_037ed"] +[ext_resource type="Texture2D" uid="uid://bop1ttfh7texr" path="res://assets/Screenshots/Knife.png" id="4_037ed"] +[ext_resource type="Texture2D" uid="uid://nbeojmdet0jl" path="res://assets/Screenshots/Apple.png" id="5_ucrra"] +[ext_resource type="Texture2D" uid="uid://bocfkwumyal82" path="res://assets/Screenshots/FloydDocument.png" id="6_lrkph"] +[ext_resource type="Texture2D" uid="uid://c2qfmk5jdhn3s" path="res://assets/Screenshots/FootprintsDoor.png" id="7_mi3iw"] +[ext_resource type="Texture2D" uid="uid://c8kahk6uyl1ty" path="res://assets/Screenshots/BarneyCard.png" id="8_iamej"] +[ext_resource type="Texture2D" uid="uid://dftmb86swwgql" path="res://assets/Screenshots/FloraDocument.png" id="9_lf4cx"] +[ext_resource type="Texture2D" uid="uid://4iy4aqnvsiqy" path="res://assets/Screenshots/Fingerprint.png" id="10_tdk3v"] [ext_resource type="Texture2D" uid="uid://b5lwmme5avmmc" path="res://assets/photo-images/#3GraceRoss.png" id="11_fqtcy"] +[ext_resource type="Texture2D" uid="uid://lobbswan14vf" path="res://assets/Screenshots/Hair.png" id="11_u1usl"] +[ext_resource type="Texture2D" uid="uid://q4yn8ojbj1do" path="res://assets/Screenshots/VelmaCard.png" id="22_un36s"] +[ext_resource type="Texture2D" uid="uid://bncj4svg7h8q3" path="res://assets/Screenshots/TableCornerBlood.png" id="23_cs8xv"] +[ext_resource type="Texture2D" uid="uid://cwliryl528gho" path="res://assets/Screenshots/RedFootprints.png" id="24_ghepb"] +[ext_resource type="Texture2D" uid="uid://b8jm6weyym50" path="res://assets/Screenshots/Body.png" id="25_ghepb"] [sub_resource type="ClueData" id="ClueData_kxjsf"] id = 0 -image = ExtResource("1_q5eka") +image = ExtResource("1_fqtcy") [sub_resource type="ClueData" id="ClueData_q5eka"] popup_text = "Forensic Analysis Blood Type: A+" id = 1 +image = ExtResource("2_k6v75") [sub_resource type="ClueData" id="ClueData_du6rq"] popup_text = "Forensic Analysis Blood Type: AB+" id = 2 +image = ExtResource("3_037ed") [sub_resource type="ClueData" id="ClueData_y8781"] id = 3 +image = ExtResource("4_037ed") [sub_resource type="ClueData" id="ClueData_mhl4k"] id = 4 +image = ExtResource("5_ucrra") [sub_resource type="ClueData" id="ClueData_k2o5n"] id = 5 +image = ExtResource("6_lrkph") [sub_resource type="ClueData" id="ClueData_bgtdi"] id = 6 +image = ExtResource("7_mi3iw") [sub_resource type="ClueData" id="ClueData_u53f6"] id = 7 +image = ExtResource("8_iamej") [sub_resource type="ClueData" id="ClueData_e5lqe"] popup_text = "Employment contract for the recent promotion of Flora Lamb" id = 8 +image = ExtResource("9_lf4cx") [sub_resource type="ClueData" id="ClueData_doypg"] id = 9 +image = ExtResource("10_tdk3v") [sub_resource type="ClueData" id="ClueData_0lck8"] id = 10 +image = ExtResource("11_u1usl") [sub_resource type="ClueData" id="ClueData_fqtcy"] id = 11 @@ -91,5 +115,21 @@ image = ExtResource("2_du6rq") id = 20 image = ExtResource("11_fqtcy") +[sub_resource type="ClueData" id="ClueData_u1usl"] +id = 21 +image = ExtResource("22_un36s") + +[sub_resource type="ClueData" id="ClueData_un36s"] +id = 22 +image = ExtResource("23_cs8xv") + +[sub_resource type="ClueData" id="ClueData_grbhq"] +id = 23 +image = ExtResource("24_ghepb") + +[sub_resource type="ClueData" id="ClueData_cs8xv"] +id = 24 +image = ExtResource("25_ghepb") + [resource] -clues = [SubResource("ClueData_kxjsf"), SubResource("ClueData_q5eka"), SubResource("ClueData_du6rq"), SubResource("ClueData_y8781"), SubResource("ClueData_mhl4k"), SubResource("ClueData_k2o5n"), SubResource("ClueData_bgtdi"), SubResource("ClueData_u53f6"), SubResource("ClueData_e5lqe"), SubResource("ClueData_doypg"), SubResource("ClueData_0lck8"), SubResource("ClueData_fqtcy"), SubResource("ClueData_qpqg2"), SubResource("ClueData_k6v75"), SubResource("ClueData_037ed"), SubResource("ClueData_ucrra"), SubResource("ClueData_lrkph"), SubResource("ClueData_mi3iw"), SubResource("ClueData_iamej"), SubResource("ClueData_lf4cx"), SubResource("ClueData_tdk3v")] +clues = [SubResource("ClueData_kxjsf"), SubResource("ClueData_q5eka"), SubResource("ClueData_du6rq"), SubResource("ClueData_y8781"), SubResource("ClueData_mhl4k"), SubResource("ClueData_k2o5n"), SubResource("ClueData_bgtdi"), SubResource("ClueData_u53f6"), SubResource("ClueData_e5lqe"), SubResource("ClueData_doypg"), SubResource("ClueData_0lck8"), SubResource("ClueData_fqtcy"), SubResource("ClueData_qpqg2"), SubResource("ClueData_k6v75"), SubResource("ClueData_037ed"), SubResource("ClueData_ucrra"), SubResource("ClueData_lrkph"), SubResource("ClueData_mi3iw"), SubResource("ClueData_iamej"), SubResource("ClueData_lf4cx"), SubResource("ClueData_tdk3v"), SubResource("ClueData_u1usl"), SubResource("ClueData_un36s"), SubResource("ClueData_grbhq"), SubResource("ClueData_cs8xv")] diff --git a/flatscreen-project/project.godot b/flatscreen-project/project.godot index 234aa91f..7d3749ea 100644 --- a/flatscreen-project/project.godot +++ b/flatscreen-project/project.godot @@ -13,6 +13,7 @@ config_version=5 config/name="you_done_it" run/main_scene="uid://dosb4sb7pvss4" config/features=PackedStringArray("4.5", "Forward Plus") +run/max_fps=60 config/icon="res://icon.svg" [display] diff --git a/flatscreen-project/scenes/workspace.tscn b/flatscreen-project/scenes/workspace.tscn index dfa4b650..16eb483d 100644 --- a/flatscreen-project/scenes/workspace.tscn +++ b/flatscreen-project/scenes/workspace.tscn @@ -80,17 +80,7 @@ conclusion_screen = ExtResource("1_thvsl") anchor_mode = 0 [node name="Pinboard" type="Pinboard" 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 = "" position = Vector2(109, 19) -script = null [node name="MeshInstance2D" type="MeshInstance2D" parent="Pinboard"] position = Vector2(859.21375, 523.26025) @@ -133,51 +123,24 @@ mesh = SubResource("QuadMesh_cnvne") texture = ExtResource("6_xic1t") [node name="WeaponSlot" type="ConclusionField" parent="Handin"] -_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 = "" position = Vector2(-98.48659, 414.2287) -script = null [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/WeaponSlot"] position = Vector2(0, 43.237) shape = SubResource("CircleShape2D_cnvne") [node name="MotiveSlot" type="ConclusionField" parent="Handin"] -_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 = "" position = Vector2(-91.47182, 247.37608) -script = null [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/MotiveSlot"] position = Vector2(0, 43.237) shape = SubResource("CircleShape2D_cnvne") [node name="MurdererSlot" type="ConclusionField" parent="Handin"] -_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 = "" position = Vector2(-302.63367, 56.33772) -script = null [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/MurdererSlot"] position = Vector2(0, 43.237) @@ -204,175 +167,59 @@ script = SubResource("GDScript_cnvne") [node name="PhotosParent" type="Node2D" parent="."] [node name="PhotoInbox" type="PhotoInbox" parent="PhotosParent"] -_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 = "" -position = Vector2(1727, 830) +position = Vector2(1783, 919) photo_scene = ExtResource("1_7cefc") -script = null [node name="PinnedPhoto" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(303, 863) +clue = 20 [node name="PinnedPhoto2" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(428, 861) +clue = 19 [node name="PinnedPhoto3" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(557, 858) +clue = 18 [node name="PinnedPhoto4" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(684, 856) +clue = 17 [node name="PinnedPhoto5" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(812, 855) +clue = 16 [node name="PinnedPhoto6" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(937, 859) +clue = 15 [node name="PinnedPhoto7" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(1063, 861) +clue = 14 [node name="PinnedPhoto8" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(1189, 856) +clue = 13 [node name="PinnedPhoto9" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(1314, 855) +clue = 12 [node name="PinnedPhoto10" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_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 +position = Vector2(814, 363) +clue = 11 [node name="VictimFile" parent="." instance=ExtResource("2_vo7lu")] -_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="WitnessReport" parent="." instance=ExtResource("3_wjago")] -_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="CaseFile" parent="." instance=ExtResource("4_cnvne")] -_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="FilePositionTarget" type="Node2D" parent="."] position = Vector2(678.00006, 63.999996) rotation = -0.0034519732 + +[connection signal="selection_changed" from="Handin/WeaponSlot" to="Handin/SubmitButton" method="_on_any_slot_selection_changed"] +[connection signal="selection_changed" from="Handin/MotiveSlot" to="Handin/SubmitButton" method="_on_any_slot_selection_changed"] +[connection signal="selection_changed" from="Handin/MurdererSlot" to="Handin/SubmitButton" method="_on_any_slot_selection_changed"] diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp index c18944c0..96012008 100644 --- a/modules/you_done_it/clue_finder.cpp +++ b/modules/you_done_it/clue_finder.cpp @@ -1,8 +1,12 @@ #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" +#include "scene/resources/texture.h" +#include "you_done_it/clue_db.h" ClueFinder *ClueFinder::singleton_instance{ nullptr }; String const ClueFinder::sig_found_marker_changed{ "found_marker_changed" }; @@ -10,6 +14,8 @@ String const ClueFinder::sig_found_marker_changed{ "found_marker_changed" }; 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"))); + BIND_HPROPERTY(Variant::OBJECT, empty_texture, PROPERTY_HINT_RESOURCE_TYPE, "Texture"); + BIND_HPROPERTY(Variant::OBJECT, photo_material, PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D"); } void ClueFinder::enter_tree() { @@ -65,9 +71,10 @@ ClueMarker *ClueFinder::find_current_clue() { float best_score{ Math::INF }; ClueMarker *best_marker{ nullptr }; for (ClueMarker *marker : this->clue_markers) { - if (marker->score_in_view() < best_score) { - print_line("found marker ", marker->get_path()); + float score{ marker->score_in_view() }; + if (!Math::is_nan(score) && score < best_score) { best_marker = marker; + best_score = score; } } return best_marker; @@ -83,6 +90,13 @@ void ClueFinder::remove_clue_marker(ClueMarker *marker) { void ClueFinder::take_photo() { this->found_marker = find_current_clue(); + if (this->found_marker) { + Ref clue{ ClueDB::get_singleton()->get_clue(this->found_marker->get_clue_id()) }; + print_line("Found clue: ", this->found_marker->get_clue_id(), " ", clue, " ", clue->get_image()); + photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, clue->get_image()); + } else { + photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, this->empty_texture); + } emit_signal(sig_found_marker_changed, bool(this->found_marker)); } @@ -91,6 +105,7 @@ void ClueFinder::send_photo() { this->found_marker->reveal(); this->found_marker = nullptr; emit_signal(sig_found_marker_changed, false); + photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, this->empty_texture); } } @@ -98,5 +113,22 @@ void ClueFinder::delete_photo() { if (this->found_marker) { this->found_marker = nullptr; emit_signal(sig_found_marker_changed, false); + photo_material->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, this->empty_texture); } } + +void ClueFinder::set_empty_texture(Ref texture) { + this->empty_texture = texture; +} + +Ref ClueFinder::get_empty_texture() const { + return this->empty_texture; +} + +void ClueFinder::set_photo_material(Ref material) { + this->photo_material = material; +} + +Ref ClueFinder::get_photo_material() const { + return this->photo_material; +} diff --git a/modules/you_done_it/clue_finder.h b/modules/you_done_it/clue_finder.h index 75efbcdc..acee08f4 100644 --- a/modules/you_done_it/clue_finder.h +++ b/modules/you_done_it/clue_finder.h @@ -2,6 +2,8 @@ #include "core/templates/hash_set.h" #include "scene/3d/node_3d.h" +#include "scene/resources/material.h" +#include "scene/resources/texture.h" #include "you_done_it/clue_marker.h" class ClueFinder : public Node3D { @@ -23,8 +25,14 @@ public: void take_photo(); void send_photo(); void delete_photo(); + void set_empty_texture(Ref texture); + Ref get_empty_texture() const; + void set_photo_material(Ref material); + Ref get_photo_material() const; private: + Ref photo_material{}; + Ref empty_texture{}; ClueMarker *found_marker{ nullptr }; HashSet clue_markers{}; diff --git a/modules/you_done_it/clue_marker.cpp b/modules/you_done_it/clue_marker.cpp index 5ba81ee0..f49a7799 100644 --- a/modules/you_done_it/clue_marker.cpp +++ b/modules/you_done_it/clue_marker.cpp @@ -36,13 +36,13 @@ float ClueMarker::score_in_view() const { Basis const basis{ viewpoint.get_basis() }; Vector3 const pos_relative{ get_global_position() - viewpoint.get_origin() }; Vector3 const pos_transformed{ basis.get_column(0).dot(pos_relative), basis.get_column(1).dot(pos_relative), basis.get_column(2).dot(pos_relative) }; - if (pos_transformed.z <= 0.5f) { - return false; + if (pos_transformed.z <= 0.0f) { + return Math::NaN; } Vector3 const transformed_dir{ pos_transformed.normalized() }; - float max{ pos_transformed.z / 5.f }; - if (Math::abs(transformed_dir.x) < max && Math::abs(transformed_dir.y) < max) { - return Math::INF; + float max{ pos_transformed.z / 10.f }; + if (Math::abs(transformed_dir.x) > max && Math::abs(transformed_dir.y) > max) { + return Math::NaN; } return pos_transformed.z * (Math::abs(transformed_dir.x) + Math::abs(transformed_dir.y)); } diff --git a/modules/you_done_it/ydi_client.cpp b/modules/you_done_it/ydi_client.cpp index de15c856..7a93c1e7 100644 --- a/modules/you_done_it/ydi_client.cpp +++ b/modules/you_done_it/ydi_client.cpp @@ -150,10 +150,10 @@ namespace receive { FixedVector &conclusion() { static FixedVector thread_safe_conclusion{}; if (connection) { - thread_safe_conclusion.clear(); - } else { std::scoped_lock lock{ connection->mtx }; thread_safe_conclusion = connection->conclusion; + } else { + thread_safe_conclusion.clear(); } return thread_safe_conclusion; } diff --git a/vr-project/Screenshots/apple.png.import b/vr-project/Screenshots/apple.png.import index 1dffda9e..4a83c563 100644 --- a/vr-project/Screenshots/apple.png.import +++ b/vr-project/Screenshots/apple.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://barh2henhru51" -path="res://.godot/imported/apple.png-e0a3752048583aa1653dd5558f073961.ctex" +path.s3tc="res://.godot/imported/apple.png-e0a3752048583aa1653dd5558f073961.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/apple.png" -dest_files=["res://.godot/imported/apple.png-e0a3752048583aa1653dd5558f073961.ctex"] +dest_files=["res://.godot/imported/apple.png-e0a3752048583aa1653dd5558f073961.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/Screenshots/business_card_barney.png.import b/vr-project/Screenshots/business_card_barney.png.import index 2ab0fafc..5334d5ac 100644 --- a/vr-project/Screenshots/business_card_barney.png.import +++ b/vr-project/Screenshots/business_card_barney.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://ciau26jt6ixaj" -path="res://.godot/imported/business_card_barney.png-8dcfb750d5d3760ad107022bffee26d4.ctex" +path.s3tc="res://.godot/imported/business_card_barney.png-8dcfb750d5d3760ad107022bffee26d4.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/business_card_barney.png" -dest_files=["res://.godot/imported/business_card_barney.png-8dcfb750d5d3760ad107022bffee26d4.ctex"] +dest_files=["res://.godot/imported/business_card_barney.png-8dcfb750d5d3760ad107022bffee26d4.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/Screenshots/business_card_graves.png.import b/vr-project/Screenshots/business_card_graves.png.import index dd89cf4e..c8e878f6 100644 --- a/vr-project/Screenshots/business_card_graves.png.import +++ b/vr-project/Screenshots/business_card_graves.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://cbtvb611mgvon" -path="res://.godot/imported/business_card_graves.png-33269bc0658432b396ef726131ffc9c6.ctex" +path.s3tc="res://.godot/imported/business_card_graves.png-33269bc0658432b396ef726131ffc9c6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/business_card_graves.png" -dest_files=["res://.godot/imported/business_card_graves.png-33269bc0658432b396ef726131ffc9c6.ctex"] +dest_files=["res://.godot/imported/business_card_graves.png-33269bc0658432b396ef726131ffc9c6.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/Screenshots/camera.tres b/vr-project/Screenshots/camera.tres new file mode 100644 index 00000000..b08acac8 --- /dev/null +++ b/vr-project/Screenshots/camera.tres @@ -0,0 +1,6 @@ +[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"] + +[resource] +albedo_texture = ExtResource("1_j1r2d") diff --git a/vr-project/Screenshots/empty.tres b/vr-project/Screenshots/empty.tres new file mode 100644 index 00000000..56f03545 --- /dev/null +++ b/vr-project/Screenshots/empty.tres @@ -0,0 +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) + +[resource] +gradient = SubResource("Gradient_3y05i") diff --git a/vr-project/Screenshots/fingerprints_phone.png.import b/vr-project/Screenshots/fingerprints_phone.png.import index d6aa57d8..1dbc42cd 100644 --- a/vr-project/Screenshots/fingerprints_phone.png.import +++ b/vr-project/Screenshots/fingerprints_phone.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://c305cifiiewf2" -path="res://.godot/imported/fingerprints_phone.png-590586ff96d79dd1e8f1cf7e6af32651.ctex" +path.s3tc="res://.godot/imported/fingerprints_phone.png-590586ff96d79dd1e8f1cf7e6af32651.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/fingerprints_phone.png" -dest_files=["res://.godot/imported/fingerprints_phone.png-590586ff96d79dd1e8f1cf7e6af32651.ctex"] +dest_files=["res://.godot/imported/fingerprints_phone.png-590586ff96d79dd1e8f1cf7e6af32651.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/Screenshots/footsteps_bloody.png.import b/vr-project/Screenshots/footsteps_bloody.png.import index 01a64dd5..11344cf5 100644 --- a/vr-project/Screenshots/footsteps_bloody.png.import +++ b/vr-project/Screenshots/footsteps_bloody.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://bqvo65t7knnpq" -path="res://.godot/imported/footsteps_bloody.png-d622781d0f16b3022b6128a0995d1b4e.ctex" +path.s3tc="res://.godot/imported/footsteps_bloody.png-d622781d0f16b3022b6128a0995d1b4e.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/footsteps_bloody.png" -dest_files=["res://.godot/imported/footsteps_bloody.png-d622781d0f16b3022b6128a0995d1b4e.ctex"] +dest_files=["res://.godot/imported/footsteps_bloody.png-d622781d0f16b3022b6128a0995d1b4e.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/Screenshots/footsteps_door.png.import b/vr-project/Screenshots/footsteps_door.png.import index b48cf2c7..977fce9a 100644 --- a/vr-project/Screenshots/footsteps_door.png.import +++ b/vr-project/Screenshots/footsteps_door.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://dec6jcct1iwrt" -path="res://.godot/imported/footsteps_door.png-e681d94ac24cf9d0cbd41fff2c1d2c51.ctex" +path.s3tc="res://.godot/imported/footsteps_door.png-e681d94ac24cf9d0cbd41fff2c1d2c51.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/footsteps_door.png" -dest_files=["res://.godot/imported/footsteps_door.png-e681d94ac24cf9d0cbd41fff2c1d2c51.ctex"] +dest_files=["res://.godot/imported/footsteps_door.png-e681d94ac24cf9d0cbd41fff2c1d2c51.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/Screenshots/hair.png.import b/vr-project/Screenshots/hair.png.import index 2c8c9e92..722049a8 100644 --- a/vr-project/Screenshots/hair.png.import +++ b/vr-project/Screenshots/hair.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://boeo630rggcpn" -path="res://.godot/imported/hair.png-d905addd5da497489e430816b109e5be.ctex" +path.s3tc="res://.godot/imported/hair.png-d905addd5da497489e430816b109e5be.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/hair.png" -dest_files=["res://.godot/imported/hair.png-d905addd5da497489e430816b109e5be.ctex"] +dest_files=["res://.godot/imported/hair.png-d905addd5da497489e430816b109e5be.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/Screenshots/knife.png.import b/vr-project/Screenshots/knife.png.import index f5d3d33e..b7207515 100644 --- a/vr-project/Screenshots/knife.png.import +++ b/vr-project/Screenshots/knife.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://cpuh1w3qqt6rj" -path="res://.godot/imported/knife.png-d79c8320ce4c5af224ba2f1c2a696f84.ctex" +path.s3tc="res://.godot/imported/knife.png-d79c8320ce4c5af224ba2f1c2a696f84.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/knife.png" -dest_files=["res://.godot/imported/knife.png-d79c8320ce4c5af224ba2f1c2a696f84.ctex"] +dest_files=["res://.godot/imported/knife.png-d79c8320ce4c5af224ba2f1c2a696f84.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/Screenshots/outline.png.import b/vr-project/Screenshots/outline.png.import index 186a3c67..38903d78 100644 --- a/vr-project/Screenshots/outline.png.import +++ b/vr-project/Screenshots/outline.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://bk8pw2bjbjfgr" -path="res://.godot/imported/outline.png-fa92e36f33cc7522c2259e32b7e4082a.ctex" +path.s3tc="res://.godot/imported/outline.png-fa92e36f33cc7522c2259e32b7e4082a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/outline.png" -dest_files=["res://.godot/imported/outline.png-fa92e36f33cc7522c2259e32b7e4082a.ctex"] +dest_files=["res://.godot/imported/outline.png-fa92e36f33cc7522c2259e32b7e4082a.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/Screenshots/perp_blood.png.import b/vr-project/Screenshots/perp_blood.png.import index 91bf06bd..6bd6ddcb 100644 --- a/vr-project/Screenshots/perp_blood.png.import +++ b/vr-project/Screenshots/perp_blood.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://fm14j3163ct3" -path="res://.godot/imported/perp_blood.png-977001f1615dc483d0088dad3ed2773c.ctex" +path.s3tc="res://.godot/imported/perp_blood.png-977001f1615dc483d0088dad3ed2773c.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/perp_blood.png" -dest_files=["res://.godot/imported/perp_blood.png-977001f1615dc483d0088dad3ed2773c.ctex"] +dest_files=["res://.godot/imported/perp_blood.png-977001f1615dc483d0088dad3ed2773c.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/Screenshots/signed_paper_desk.png.import b/vr-project/Screenshots/signed_paper_desk.png.import index 22e37c75..bf9dc3a1 100644 --- a/vr-project/Screenshots/signed_paper_desk.png.import +++ b/vr-project/Screenshots/signed_paper_desk.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3fvmoagl6deg" -path="res://.godot/imported/signed_paper_desk.png-93821b73c33d498e5d416194586ad995.ctex" +path.s3tc="res://.godot/imported/signed_paper_desk.png-93821b73c33d498e5d416194586ad995.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/signed_paper_desk.png" -dest_files=["res://.godot/imported/signed_paper_desk.png-93821b73c33d498e5d416194586ad995.ctex"] +dest_files=["res://.godot/imported/signed_paper_desk.png-93821b73c33d498e5d416194586ad995.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/Screenshots/signed_papers.png.import b/vr-project/Screenshots/signed_papers.png.import index a4c91e66..bf6c93d6 100644 --- a/vr-project/Screenshots/signed_papers.png.import +++ b/vr-project/Screenshots/signed_papers.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://cixjbnroqtf0m" -path="res://.godot/imported/signed_papers.png-acc71032dd93070c9b5fa8644fc35c6f.ctex" +path.s3tc="res://.godot/imported/signed_papers.png-acc71032dd93070c9b5fa8644fc35c6f.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/signed_papers.png" -dest_files=["res://.godot/imported/signed_papers.png-acc71032dd93070c9b5fa8644fc35c6f.ctex"] +dest_files=["res://.godot/imported/signed_papers.png-acc71032dd93070c9b5fa8644fc35c6f.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/Screenshots/stapler.png.import b/vr-project/Screenshots/stapler.png.import index bcaf6754..5e39214f 100644 --- a/vr-project/Screenshots/stapler.png.import +++ b/vr-project/Screenshots/stapler.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://fiydbekjt06r" -path="res://.godot/imported/stapler.png-4c0265acb29a82c7844c45309c602b4e.ctex" +path.s3tc="res://.godot/imported/stapler.png-4c0265acb29a82c7844c45309c602b4e.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/stapler.png" -dest_files=["res://.godot/imported/stapler.png-4c0265acb29a82c7844c45309c602b4e.ctex"] +dest_files=["res://.godot/imported/stapler.png-4c0265acb29a82c7844c45309c602b4e.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/Screenshots/victim_blood.png.import b/vr-project/Screenshots/victim_blood.png.import index b66ef4a2..664a0c92 100644 --- a/vr-project/Screenshots/victim_blood.png.import +++ b/vr-project/Screenshots/victim_blood.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://bwgimdlsfucwd" -path="res://.godot/imported/victim_blood.png-bb6e3165c9145286deb3e0ffe6020ee7.ctex" +path.s3tc="res://.godot/imported/victim_blood.png-bb6e3165c9145286deb3e0ffe6020ee7.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/victim_blood.png" -dest_files=["res://.godot/imported/victim_blood.png-bb6e3165c9145286deb3e0ffe6020ee7.ctex"] +dest_files=["res://.godot/imported/victim_blood.png-bb6e3165c9145286deb3e0ffe6020ee7.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/Screenshots/victim_blood_corner.png.import b/vr-project/Screenshots/victim_blood_corner.png.import index fa9a4d3b..4847f045 100644 --- a/vr-project/Screenshots/victim_blood_corner.png.import +++ b/vr-project/Screenshots/victim_blood_corner.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://bwl8soqxphntw" -path="res://.godot/imported/victim_blood_corner.png-7fa2e3fa283d374557d67c2a56463ebf.ctex" +path.s3tc="res://.godot/imported/victim_blood_corner.png-7fa2e3fa283d374557d67c2a56463ebf.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Screenshots/victim_blood_corner.png" -dest_files=["res://.godot/imported/victim_blood_corner.png-7fa2e3fa283d374557d67c2a56463ebf.ctex"] +dest_files=["res://.godot/imported/victim_blood_corner.png-7fa2e3fa283d374557d67c2a56463ebf.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/clue_db.tres b/vr-project/clue_db.tres index 3385a4af..7c5f9c0c 100644 --- a/vr-project/clue_db.tres +++ b/vr-project/clue_db.tres @@ -1,4 +1,4 @@ -[gd_resource type="ClueDB" load_steps=34 format=3 uid="uid://dlf8dxiter8b8"] +[gd_resource type="ClueDB" load_steps=39 format=3 uid="uid://dlf8dxiter8b8"] [ext_resource type="Texture2D" uid="uid://fiydbekjt06r" path="res://Screenshots/stapler.png" id="1_mhl4k"] [ext_resource type="Texture2D" uid="uid://bwgimdlsfucwd" path="res://Screenshots/victim_blood.png" id="2_k2o5n"] @@ -8,6 +8,11 @@ [ext_resource type="Texture2D" uid="uid://c3fvmoagl6deg" path="res://Screenshots/signed_paper_desk.png" id="6_bgtdi"] [ext_resource type="Texture2D" uid="uid://dec6jcct1iwrt" path="res://Screenshots/footsteps_door.png" id="7_e5lqe"] [ext_resource type="Texture2D" uid="uid://ciau26jt6ixaj" path="res://Screenshots/business_card_barney.png" id="8_doypg"] +[ext_resource type="Texture2D" uid="uid://bqvo65t7knnpq" path="res://Screenshots/footsteps_bloody.png" id="9_0lck8"] +[ext_resource type="Texture2D" uid="uid://bk8pw2bjbjfgr" path="res://Screenshots/outline.png" id="9_doypg"] +[ext_resource type="Texture2D" uid="uid://bwl8soqxphntw" path="res://Screenshots/victim_blood_corner.png" id="9_fqtcy"] +[ext_resource type="Texture2D" uid="uid://c305cifiiewf2" path="res://Screenshots/fingerprints_phone.png" id="9_k6v75"] +[ext_resource type="Texture2D" uid="uid://cbtvb611mgvon" path="res://Screenshots/business_card_graves.png" id="9_qpqg2"] [sub_resource type="ClueData" id="ClueData_kxjsf"] id = 0 @@ -47,6 +52,7 @@ image = ExtResource("6_bgtdi") [sub_resource type="ClueData" id="ClueData_0lck8"] id = 9 +image = ExtResource("9_k6v75") [sub_resource type="ClueData" id="ClueData_fqtcy"] id = 10 @@ -83,15 +89,19 @@ id = 20 [sub_resource type="ClueData" id="ClueData_un36s"] id = 21 +image = ExtResource("9_qpqg2") [sub_resource type="ClueData" id="ClueData_grbhq"] id = 22 +image = ExtResource("9_fqtcy") [sub_resource type="ClueData" id="ClueData_cs8xv"] id = 23 +image = ExtResource("9_0lck8") [sub_resource type="ClueData" id="ClueData_ghepb"] id = 24 +image = ExtResource("9_doypg") [resource] clues = [SubResource("ClueData_kxjsf"), SubResource("ClueData_du6rq"), SubResource("ClueData_y8781"), SubResource("ClueData_mhl4k"), SubResource("ClueData_k2o5n"), SubResource("ClueData_bgtdi"), SubResource("ClueData_u53f6"), SubResource("ClueData_e5lqe"), SubResource("ClueData_doypg"), SubResource("ClueData_0lck8"), SubResource("ClueData_fqtcy"), SubResource("ClueData_qpqg2"), SubResource("ClueData_k6v75"), SubResource("ClueData_037ed"), SubResource("ClueData_ucrra"), SubResource("ClueData_lrkph"), SubResource("ClueData_mi3iw"), SubResource("ClueData_iamej"), SubResource("ClueData_lf4cx"), SubResource("ClueData_tdk3v"), SubResource("ClueData_u1usl"), SubResource("ClueData_un36s"), SubResource("ClueData_grbhq"), SubResource("ClueData_cs8xv"), SubResource("ClueData_ghepb")] diff --git a/vr-project/scenes/game_root.tscn b/vr-project/scenes/game_root.tscn index 3f0aeac3..612046e7 100644 --- a/vr-project/scenes/game_root.tscn +++ b/vr-project/scenes/game_root.tscn @@ -31,16 +31,7 @@ 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 @@ -69,5 +60,6 @@ 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 ba579a09..fad77f10 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -93,6 +93,7 @@ fog_height_density = -0.6636 [node name="Root" type="Node3D"] [node name="VROrigin" parent="." instance=ExtResource("2_onqr8")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0) [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) @@ -441,7 +442,7 @@ upper_fade = 1e-05 lower_fade = 1e-05 [node name="ClueMarker" type="ClueMarker" parent="FingerPrint"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0044395113, -1.1641532e-10) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.9849193e-10, 0.022176072, -1.5133992e-09) clue_id = 9 [node name="ClueMarker" type="ClueMarker" parent="."] diff --git a/vr-project/vr_base.tscn b/vr-project/vr_base.tscn index fc79bc5e..990934f8 100644 --- a/vr-project/vr_base.tscn +++ b/vr-project/vr_base.tscn @@ -1,7 +1,10 @@ -[gd_scene load_steps=20 format=4 uid="uid://ctf3dsro4aqon"] +[gd_scene load_steps=22 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"] @@ -95,9 +98,6 @@ _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 @@ -348,13 +348,17 @@ tracker = &"right_hand" [node name="ClueFinder" type="ClueFinder" parent="RightController"] transform = Transform3D(1, 0, 0, 0, -0.25849885, -0.96601164, 0, 0.96601164, -0.25849885, -0.079550676, -0.05049658, 0.06030319) +empty_texture = ExtResource("2_sb8vi") +photo_material = ExtResource("3_btcmj") [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="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) +material_override = ExtResource("3_btcmj") +pixel_size = 0.0001 +texture = ExtResource("3_iyk8l") [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)