diff --git a/vr-project/3D Models/Apple.blend b/vr-project/3D Models/Apple.blend new file mode 100644 index 00000000..35e2f8d7 Binary files /dev/null and b/vr-project/3D Models/Apple.blend differ diff --git a/vr-project/3D Models/Apple.blend.import b/vr-project/3D Models/Apple.blend.import new file mode 100644 index 00000000..8295f490 --- /dev/null +++ b/vr-project/3D Models/Apple.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bx1v70hvn20av" +path="res://.godot/imported/Apple.blend-3d90fe890eec8614bf98a111fb142c3f.scn" + +[deps] + +source_file="res://3D Models/Apple.blend" +dest_files=["res://.godot/imported/Apple.blend-3d90fe890eec8614bf98a111fb142c3f.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"Apple": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/AppleToonMat.tres", +"use_external/path": "uid://kv7lucwyxing" +}, +"Wick": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/AppleToonMat.tres", +"use_external/path": "uid://kv7lucwyxing" +} +} +} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true +gltf/naming_version=2 diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 0a54fa21..6dd0198f 100644 Binary files a/vr-project/3D Models/Block Out VR.blend and b/vr-project/3D Models/Block Out VR.blend differ diff --git a/vr-project/3D Models/Block Out VR.blend.import b/vr-project/3D Models/Block Out VR.blend.import index 90f22f9b..24270d0a 100644 --- a/vr-project/3D Models/Block Out VR.blend.import +++ b/vr-project/3D Models/Block Out VR.blend.import @@ -43,6 +43,11 @@ _subresources={ "use_external/enabled": true, "use_external/fallback_path": "res://Materials/BlockoutToonMat.tres", "use_external/path": "uid://c86xxl67a5axp" +}, +"FloorWood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/FloorToonMat.tres", +"use_external/path": "uid://bjua3iqwyywqa" } } } diff --git a/vr-project/3D Models/Interrogation Chair.blend b/vr-project/3D Models/Interrogation Chair.blend index a1349122..aae4f9fd 100644 Binary files a/vr-project/3D Models/Interrogation Chair.blend and b/vr-project/3D Models/Interrogation Chair.blend differ diff --git a/vr-project/3D Models/Wall Phone.blend b/vr-project/3D Models/Wall Phone.blend index 1d9f1578..c0dbd342 100644 Binary files a/vr-project/3D Models/Wall Phone.blend and b/vr-project/3D Models/Wall Phone.blend differ diff --git a/vr-project/Materials/AppleToonMat.tres b/vr-project/Materials/AppleToonMat.tres new file mode 100644 index 00000000..f730a82f --- /dev/null +++ b/vr-project/Materials/AppleToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://kv7lucwyxing"] + +[ext_resource type="Texture2D" uid="uid://bs63qd3emeoab" path="res://Textures/AppleMat.png" id="1_qr2xi"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] +cull_mode = 1 +shading_mode = 0 +albedo_color = Color(0.07, 0.07, 0.07, 1) +grow = true +grow_amount = 0.002 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_qr2xi") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/FloorToonMat.tres b/vr-project/Materials/FloorToonMat.tres new file mode 100644 index 00000000..80904580 --- /dev/null +++ b/vr-project/Materials/FloorToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bjua3iqwyywqa"] + +[ext_resource type="Texture2D" uid="uid://coxy4lvumqh3i" path="res://Textures/FloorMat.png" id="1_7ebxb"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] +cull_mode = 1 +shading_mode = 0 +albedo_color = Color(0, 0, 0, 1) +grow = true +grow_amount = 0.03 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_7ebxb") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/ToonMaterial.tres b/vr-project/Materials/ToonMaterial.tres index e7f2456e..b4742db0 100644 --- a/vr-project/Materials/ToonMaterial.tres +++ b/vr-project/Materials/ToonMaterial.tres @@ -11,4 +11,5 @@ grow_amount = 0.01 next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 +roughness = 0.0 rim_enabled = true diff --git a/vr-project/Textures/AppleMat.png b/vr-project/Textures/AppleMat.png new file mode 100644 index 00000000..5d31b048 Binary files /dev/null and b/vr-project/Textures/AppleMat.png differ diff --git a/vr-project/Textures/AppleMat.png.import b/vr-project/Textures/AppleMat.png.import new file mode 100644 index 00000000..f1bea72e --- /dev/null +++ b/vr-project/Textures/AppleMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bs63qd3emeoab" +path.s3tc="res://.godot/imported/AppleMat.png-256833b5ab9f6b99496e46f010fafa1d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/AppleMat.png" +dest_files=["res://.godot/imported/AppleMat.png-256833b5ab9f6b99496e46f010fafa1d.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/Textures/BlockoutTexture.png b/vr-project/Textures/BlockoutTexture.png index 56a6776b..d7fee280 100644 Binary files a/vr-project/Textures/BlockoutTexture.png and b/vr-project/Textures/BlockoutTexture.png differ diff --git a/vr-project/Textures/ChairMat.png b/vr-project/Textures/ChairMat.png index 31fc10d7..4765c118 100644 Binary files a/vr-project/Textures/ChairMat.png and b/vr-project/Textures/ChairMat.png differ diff --git a/vr-project/Textures/FloorMat.png b/vr-project/Textures/FloorMat.png new file mode 100644 index 00000000..fff64e1f Binary files /dev/null and b/vr-project/Textures/FloorMat.png differ diff --git a/vr-project/Textures/FloorMat.png.import b/vr-project/Textures/FloorMat.png.import new file mode 100644 index 00000000..7e2f86cb --- /dev/null +++ b/vr-project/Textures/FloorMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://coxy4lvumqh3i" +path.s3tc="res://.godot/imported/FloorMat.png-30aec07ee705f8bd58d4aaf5bc0ab88f.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/FloorMat.png" +dest_files=["res://.godot/imported/FloorMat.png-30aec07ee705f8bd58d4aaf5bc0ab88f.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/scenes/game_scene.tscn b/vr-project/scenes/game_scene.tscn index c8a681c3..7de27097 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=13 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"] @@ -8,6 +8,7 @@ [ext_resource type="PackedScene" uid="uid://c4v17rpici6ic" path="res://3D Models/Lamp.blend" id="6_kk2rg"] [ext_resource type="PackedScene" uid="uid://b7r2apg6ppb30" path="res://3D Models/Interrogation Chair.blend" id="7_b5spy"] [ext_resource type="PackedScene" uid="uid://crgsa0iyher8i" path="res://3D Models/Wall Phone.blend" id="8_b5spy"] +[ext_resource type="PackedScene" uid="uid://bx1v70hvn20av" path="res://3D Models/Apple.blend" id="9_utbpp"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(1, 0.35000002, 0.55583334, 1) @@ -52,6 +53,16 @@ fog_height_density = -0.4746 [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="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_bw6k5") @@ -72,7 +83,17 @@ shadow_blur = 2.834 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.27989578, 0, 1.4924412) [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 = "" clue_id = 0 +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) @@ -100,3 +121,6 @@ transform = Transform3D(-0.32313028, 0, 1.0155599, 0, 1.0657276, 0, -1.0155599, [node name="Wall Phone" parent="." instance=ExtResource("8_b5spy")] transform = Transform3D(-1.4768354, 0, 1.2910905e-07, 0, 1.4768354, 0, -1.2910905e-07, 0, -1.4768354, 2.826751, 1.5612175, 0.43450707) + +[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)