diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 7381740e..86ade0c5 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/Interrogation Chair.blend b/vr-project/3D Models/Interrogation Chair.blend new file mode 100644 index 00000000..a1349122 Binary files /dev/null and b/vr-project/3D Models/Interrogation Chair.blend differ diff --git a/vr-project/3D Models/Interrogation Chair.blend.import b/vr-project/3D Models/Interrogation Chair.blend.import new file mode 100644 index 00000000..5a9e9ea2 --- /dev/null +++ b/vr-project/3D Models/Interrogation Chair.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b7r2apg6ppb30" +path="res://.godot/imported/Interrogation Chair.blend-3637cd450b83c3622c8c0293bff4b71c.scn" + +[deps] + +source_file="res://3D Models/Interrogation Chair.blend" +dest_files=["res://.godot/imported/Interrogation Chair.blend-3637cd450b83c3622c8c0293bff4b71c.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": { +"ChairCushon": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/InterrogationChairToonMat.tres", +"use_external/path": "uid://ccwr35jdqdd5q" +}, +"ChairWood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/InterrogationChairToonMat.tres", +"use_external/path": "uid://ccwr35jdqdd5q" +} +} +} +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/Lamp.blend b/vr-project/3D Models/Lamp.blend new file mode 100644 index 00000000..94ad60e3 Binary files /dev/null and b/vr-project/3D Models/Lamp.blend differ diff --git a/vr-project/3D Models/Lamp.blend.import b/vr-project/3D Models/Lamp.blend.import new file mode 100644 index 00000000..45044499 --- /dev/null +++ b/vr-project/3D Models/Lamp.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c4v17rpici6ic" +path="res://.godot/imported/Lamp.blend-c55ef1798f67e9d825c4e9d72af0dad0.scn" + +[deps] + +source_file="res://3D Models/Lamp.blend" +dest_files=["res://.godot/imported/Lamp.blend-c55ef1798f67e9d825c4e9d72af0dad0.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": { +"LampPost": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/LampToonMat.tres", +"use_external/path": "uid://0l5xqn44c87c" +}, +"LampShade": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/LampToonMat.tres", +"use_external/path": "uid://0l5xqn44c87c" +} +} +} +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/InterrogationChairToonMat.tres b/vr-project/Materials/InterrogationChairToonMat.tres new file mode 100644 index 00000000..2e5025d6 --- /dev/null +++ b/vr-project/Materials/InterrogationChairToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ccwr35jdqdd5q"] + +[ext_resource type="Texture2D" uid="uid://cj4s1ls1v1ctm" path="res://Textures/ChairMat.png" id="1_0q2nm"] + +[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.005 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_0q2nm") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/LampToonMat.tres b/vr-project/Materials/LampToonMat.tres new file mode 100644 index 00000000..84cca07a --- /dev/null +++ b/vr-project/Materials/LampToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://0l5xqn44c87c"] + +[ext_resource type="Texture2D" uid="uid://xmvk34blcp21" path="res://Textures/LampMat.png" id="1_sri3c"] + +[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.005 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_sri3c") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Textures/ChairMat.png b/vr-project/Textures/ChairMat.png new file mode 100644 index 00000000..31fc10d7 Binary files /dev/null and b/vr-project/Textures/ChairMat.png differ diff --git a/vr-project/Textures/ChairMat.png.import b/vr-project/Textures/ChairMat.png.import new file mode 100644 index 00000000..2acd4075 --- /dev/null +++ b/vr-project/Textures/ChairMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cj4s1ls1v1ctm" +path.s3tc="res://.godot/imported/ChairMat.png-98bb74d53a117c7516598e8804a027ad.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/ChairMat.png" +dest_files=["res://.godot/imported/ChairMat.png-98bb74d53a117c7516598e8804a027ad.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/3D Models/textures/KnifeHandleMat.001.png b/vr-project/Textures/KnifeHandleMat.001.png similarity index 100% rename from vr-project/3D Models/textures/KnifeHandleMat.001.png rename to vr-project/Textures/KnifeHandleMat.001.png diff --git a/vr-project/Textures/KnifeHandleMat.001.png.import b/vr-project/Textures/KnifeHandleMat.001.png.import new file mode 100644 index 00000000..8a1c7c61 --- /dev/null +++ b/vr-project/Textures/KnifeHandleMat.001.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://oy0dty53kphy" +path="res://.godot/imported/KnifeHandleMat.001.png-386cdc961f253cd090bb3642adf7dea4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Textures/KnifeHandleMat.001.png" +dest_files=["res://.godot/imported/KnifeHandleMat.001.png-386cdc961f253cd090bb3642adf7dea4.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/Textures/LampMat.png b/vr-project/Textures/LampMat.png new file mode 100644 index 00000000..3b05a14f Binary files /dev/null and b/vr-project/Textures/LampMat.png differ diff --git a/vr-project/Textures/LampMat.png.import b/vr-project/Textures/LampMat.png.import new file mode 100644 index 00000000..053df5b5 --- /dev/null +++ b/vr-project/Textures/LampMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xmvk34blcp21" +path.s3tc="res://.godot/imported/LampMat.png-f0fed3a976fa6ec25043cba96e519cad.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/LampMat.png" +dest_files=["res://.godot/imported/LampMat.png-f0fed3a976fa6ec25043cba96e519cad.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 954d0dc7..ff7e11ec 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=9 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=11 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://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"] +[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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(0.16916332, 0.10069999, 0.19, 1) @@ -84,3 +86,18 @@ transform = Transform3D(-5.1816137e-08, 0, -1.185415, 0, 1.185415, 0, 1.185415, [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) + +[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) + +[node name="Lamp2" parent="." instance=ExtResource("6_kk2rg")] +transform = Transform3D(1.0885172, 0, 0, 0, 1.0577642, 0, 0, 0, 1.0371894, -2.313608, 0, 4.7957315) + +[node name="Lamp3" parent="." instance=ExtResource("6_kk2rg")] +transform = Transform3D(1.0885172, 0, 0, 0, 1.0577642, 0, 0, 0, 1.0371894, 2.3578973, 2.3841858e-07, 1.4913816) + +[node name="Interrogation Chair" parent="." instance=ExtResource("7_b5spy")] +transform = Transform3D(0.811508, 0, 0.69081837, 0, 1.0657276, 0, -0.69081837, 0, 0.811508, 0.28074962, 0.038553715, 1.8628062) + +[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)