diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 86ade0c5..0a54fa21 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.unwrap_cache b/vr-project/3D Models/Block Out VR.blend.unwrap_cache index a4484b40..00caddf8 100644 Binary files a/vr-project/3D Models/Block Out VR.blend.unwrap_cache and b/vr-project/3D Models/Block Out VR.blend.unwrap_cache differ diff --git a/vr-project/3D Models/Wall Phone.blend b/vr-project/3D Models/Wall Phone.blend new file mode 100644 index 00000000..1d9f1578 Binary files /dev/null and b/vr-project/3D Models/Wall Phone.blend differ diff --git a/vr-project/3D Models/Wall Phone.blend.import b/vr-project/3D Models/Wall Phone.blend.import new file mode 100644 index 00000000..1a6670a8 --- /dev/null +++ b/vr-project/3D Models/Wall Phone.blend.import @@ -0,0 +1,82 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://crgsa0iyher8i" +path="res://.godot/imported/Wall Phone.blend-903eadf37c3a65762c9e6dbe59085d51.scn" + +[deps] + +source_file="res://3D Models/Wall Phone.blend" +dest_files=["res://.godot/imported/Wall Phone.blend-903eadf37c3a65762c9e6dbe59085d51.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": { +"BlackMetal": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/WallPhoneToonMat.tres", +"use_external/path": "uid://ty843jwri41a" +}, +"Cable": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/WallPhoneToonMat.tres", +"use_external/path": "uid://ty843jwri41a" +}, +"Metal": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/WallPhoneToonMat.tres", +"use_external/path": "uid://ty843jwri41a" +}, +"Wood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/WallPhoneToonMat.tres", +"use_external/path": "uid://ty843jwri41a" +} +} +} +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/Materials/CabinetMetalToonMat.tres b/vr-project/Materials/CabinetMetalToonMat.tres index 22a0b3da..5582af8c 100644 --- a/vr-project/Materials/CabinetMetalToonMat.tres +++ b/vr-project/Materials/CabinetMetalToonMat.tres @@ -15,6 +15,7 @@ diffuse_mode = 3 specular_mode = 1 albedo_color = Color(0.84, 0.84, 0.84, 1) albedo_texture = ExtResource("1_xgiyf") -metallic = 0.19 +metallic = 0.33 +metallic_specular = 0.64 roughness = 0.0 rim_enabled = true diff --git a/vr-project/Materials/InterrogationChairToonMat.tres b/vr-project/Materials/InterrogationChairToonMat.tres index 2e5025d6..9f32f1fc 100644 --- a/vr-project/Materials/InterrogationChairToonMat.tres +++ b/vr-project/Materials/InterrogationChairToonMat.tres @@ -14,5 +14,5 @@ next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 albedo_texture = ExtResource("1_0q2nm") -roughness = 0.0 +roughness = 0.02 rim_enabled = true diff --git a/vr-project/Materials/KnifeMetalToonMat.tres b/vr-project/Materials/KnifeMetalToonMat.tres index faeead33..c63882c2 100644 --- a/vr-project/Materials/KnifeMetalToonMat.tres +++ b/vr-project/Materials/KnifeMetalToonMat.tres @@ -14,6 +14,7 @@ next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 albedo_texture = ExtResource("1_derp1") -metallic_specular = 0.72 +metallic = 0.38 +metallic_specular = 0.79 roughness = 0.0 rim_enabled = true diff --git a/vr-project/Materials/StaplerToonMat.tres b/vr-project/Materials/StaplerToonMat.tres index c9326b97..8e901aad 100644 --- a/vr-project/Materials/StaplerToonMat.tres +++ b/vr-project/Materials/StaplerToonMat.tres @@ -14,5 +14,7 @@ next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 albedo_texture = ExtResource("1_fdtp7") -roughness = 0.0 +metallic = 0.3 +metallic_specular = 0.6 +roughness = 0.02 rim_enabled = true diff --git a/vr-project/Materials/ToonMaterial.tres b/vr-project/Materials/ToonMaterial.tres index b4742db0..e7f2456e 100644 --- a/vr-project/Materials/ToonMaterial.tres +++ b/vr-project/Materials/ToonMaterial.tres @@ -11,5 +11,4 @@ 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/Materials/WallPhoneToonMat.tres b/vr-project/Materials/WallPhoneToonMat.tres new file mode 100644 index 00000000..6d52fc9d --- /dev/null +++ b/vr-project/Materials/WallPhoneToonMat.tres @@ -0,0 +1,25 @@ +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://ty843jwri41a"] + +[ext_resource type="Texture2D" uid="uid://bbow0if15yu8c" path="res://Textures/WallPhoneMat.png" id="1_ntcj0"] +[ext_resource type="Texture2D" uid="uid://dey2b1xjld6qh" path="res://Textures/WallPhoneMetal.001.png" id="2_ntcj0"] +[ext_resource type="Texture2D" uid="uid://hf6gqh8tj1ok" path="res://Textures/WallPhoneRoughness.png" id="3_lx676"] + +[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_color = Color(1.1561769, 1.1561769, 1.1561769, 1) +albedo_texture = ExtResource("1_ntcj0") +metallic = 0.41 +metallic_specular = 0.6 +metallic_texture = ExtResource("2_ntcj0") +roughness = 0.04 +roughness_texture = ExtResource("3_lx676") +rim_enabled = true diff --git a/vr-project/Textures/WallPhoneMat.png b/vr-project/Textures/WallPhoneMat.png new file mode 100644 index 00000000..02ed08f6 Binary files /dev/null and b/vr-project/Textures/WallPhoneMat.png differ diff --git a/vr-project/Textures/WallPhoneMat.png.import b/vr-project/Textures/WallPhoneMat.png.import new file mode 100644 index 00000000..0b1a2e23 --- /dev/null +++ b/vr-project/Textures/WallPhoneMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbow0if15yu8c" +path.s3tc="res://.godot/imported/WallPhoneMat.png-7554a08a6373ee496eaf27e23b6daeec.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/WallPhoneMat.png" +dest_files=["res://.godot/imported/WallPhoneMat.png-7554a08a6373ee496eaf27e23b6daeec.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/WallPhoneMetal.001.png b/vr-project/Textures/WallPhoneMetal.001.png new file mode 100644 index 00000000..1ab39996 Binary files /dev/null and b/vr-project/Textures/WallPhoneMetal.001.png differ diff --git a/vr-project/Textures/WallPhoneMetal.001.png.import b/vr-project/Textures/WallPhoneMetal.001.png.import new file mode 100644 index 00000000..d30bea15 --- /dev/null +++ b/vr-project/Textures/WallPhoneMetal.001.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dey2b1xjld6qh" +path.s3tc="res://.godot/imported/WallPhoneMetal.001.png-172a4031d6530977ea5dd16065873ec8.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/WallPhoneMetal.001.png" +dest_files=["res://.godot/imported/WallPhoneMetal.001.png-172a4031d6530977ea5dd16065873ec8.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/WallPhoneRoughness.png b/vr-project/Textures/WallPhoneRoughness.png new file mode 100644 index 00000000..bd54eb8d Binary files /dev/null and b/vr-project/Textures/WallPhoneRoughness.png differ diff --git a/vr-project/Textures/WallPhoneRoughness.png.import b/vr-project/Textures/WallPhoneRoughness.png.import new file mode 100644 index 00000000..c68cb96d --- /dev/null +++ b/vr-project/Textures/WallPhoneRoughness.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hf6gqh8tj1ok" +path.s3tc="res://.godot/imported/WallPhoneRoughness.png-358e72f2391ea094ff0980f969ab8162.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/WallPhoneRoughness.png" +dest_files=["res://.godot/imported/WallPhoneRoughness.png-358e72f2391ea094ff0980f969ab8162.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 ff7e11ec..dbfca7ef 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=12 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"] @@ -7,31 +7,47 @@ [ext_resource type="PackedScene" uid="uid://dgwr2md2wey24" path="res://3D Models/Knife.blend" id="5_y3j0m"] [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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] -sky_top_color = Color(0.16916332, 0.10069999, 0.19, 1) -sky_horizon_color = Color(0.14369965, 0.12658381, 0.14890882, 1) -ground_bottom_color = Color(0, 0, 0, 1) -ground_horizon_color = Color(0.14369965, 0.12658381, 0.14890882, 1) +sky_top_color = Color(1, 0.35000002, 0.55583334, 1) +sky_horizon_color = Color(0.22190088, 0.049761534, 0.1066461, 1) +sky_curve = 0.22735739 +ground_bottom_color = Color(0.079900004, 0.27495003, 0.47, 1) +ground_horizon_color = Color(0.053439245, 0.10101802, 0.24055791, 1) +ground_curve = 0.3805476 +sun_angle_max = 0.0 [sub_resource type="Sky" id="Sky_ycayy"] sky_material = SubResource("ProceduralSkyMaterial_onqr8") [sub_resource type="Environment" id="Environment_bw6k5"] background_mode = 1 -background_color = Color(0.93894166, 0, 0.11225095, 1) +background_color = Color(0.93293375, 0, 0.20776036, 1) background_energy_multiplier = 2.73 sky = SubResource("Sky_ycayy") ambient_light_source = 2 -ambient_light_color = Color(0.24536058, 0.3008557, 0.49238563, 1) +ambient_light_color = Color(0.2132, 0.2796733, 0.52, 1) ambient_light_energy = 8.11 +reflected_light_source = 2 tonemap_mode = 2 tonemap_white = 1.34 ssr_fade_in = 0.4873501 ssao_enabled = true -sdfgi_cascades = 2 -sdfgi_min_cell_size = 0.1171875 +ssil_radius = 0.21 +ssil_sharpness = 1.0 glow_enabled = true +glow_intensity = 0.04 +glow_strength = 0.82 +glow_blend_mode = 1 +fog_enabled = true +fog_light_color = Color(0.009000002, 0.077399984, 0.18, 1) +fog_light_energy = 2.25 +fog_sun_scatter = 0.01 +fog_density = 0.0 +fog_sky_affect = 0.0 +fog_height = 4.58 +fog_height_density = -0.4746 [node name="Root" type="Node3D"] @@ -85,7 +101,7 @@ transform = Transform3D(-1.8868132, 0, -1.8585076, 0, 2.6484175, 0, 1.8585076, 0 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.59039426, 0, 0.80711496, 0, 1, 0, -0.80711496, 0, -0.59039426, 0.12756646, 0.923417, 3.030509) +transform = Transform3D(-0.437768, 0.39613712, 0.80711496, 0.6709704, 0.74148417, 0, -0.59846294, 0.5415502, -0.59039426, 0.12756646, 0.923417, 3.030509) [node name="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) @@ -101,3 +117,6 @@ transform = Transform3D(0.811508, 0, 0.69081837, 0, 1.0657276, 0, -0.69081837, 0 [node name="Interrogation Chair2" parent="." instance=ExtResource("7_b5spy")] transform = Transform3D(-0.32313028, 0, 1.0155599, 0, 1.0657276, 0, -1.0155599, 0, -0.32313028, -1.2798595, 0.038553715, 1.7969729) + +[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)