diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 0560b4e4..c002c385 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 00caddf8..532dd129 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/Bookshelf.blend b/vr-project/3D Models/Bookshelf.blend index 52f83c09..ac3225f5 100644 Binary files a/vr-project/3D Models/Bookshelf.blend and b/vr-project/3D Models/Bookshelf.blend differ diff --git a/vr-project/3D Models/Coat Rack.blend b/vr-project/3D Models/Coat Rack.blend new file mode 100644 index 00000000..45efc7d6 Binary files /dev/null and b/vr-project/3D Models/Coat Rack.blend differ diff --git a/vr-project/3D Models/Coat Rack.blend.import b/vr-project/3D Models/Coat Rack.blend.import new file mode 100644 index 00000000..be50b595 --- /dev/null +++ b/vr-project/3D Models/Coat Rack.blend.import @@ -0,0 +1,67 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b56mjoggc7s7" +path="res://.godot/imported/Coat Rack.blend-5d7cb39eaa7edc9a3a554652746cc4f8.scn" + +[deps] + +source_file="res://3D Models/Coat Rack.blend" +dest_files=["res://.godot/imported/Coat Rack.blend-5d7cb39eaa7edc9a3a554652746cc4f8.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": { +"CoatRackWood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/CoatRackToonMat.tres", +"use_external/path": "uid://dgox41nvqnsuh" +} +} +} +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/Filing Cabinets.blend b/vr-project/3D Models/Filing Cabinets.blend index 76c8d8a4..b90a1ced 100644 Binary files a/vr-project/3D Models/Filing Cabinets.blend and b/vr-project/3D Models/Filing Cabinets.blend differ diff --git a/vr-project/3D Models/MainChair.blend b/vr-project/3D Models/MainChair.blend new file mode 100644 index 00000000..75ec2080 Binary files /dev/null and b/vr-project/3D Models/MainChair.blend differ diff --git a/vr-project/3D Models/MainChair.blend.import b/vr-project/3D Models/MainChair.blend.import new file mode 100644 index 00000000..35123170 --- /dev/null +++ b/vr-project/3D Models/MainChair.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dnjrqeylu6l1v" +path="res://.godot/imported/MainChair.blend-7f0c454bb36fc9c0db48823c294f4d6a.scn" + +[deps] + +source_file="res://3D Models/MainChair.blend" +dest_files=["res://.godot/imported/MainChair.blend-7f0c454bb36fc9c0db48823c294f4d6a.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/MainChairToonMat.tres", +"use_external/path": "uid://ieckq8bqfhsj" +}, +"ChairWood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/MainChairToonMat.tres", +"use_external/path": "uid://ieckq8bqfhsj" +} +} +} +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/Rug.blend b/vr-project/3D Models/Rug.blend index 12576fe4..c595bc67 100644 Binary files a/vr-project/3D Models/Rug.blend and b/vr-project/3D Models/Rug.blend differ diff --git a/vr-project/3D Models/Staircase.blend b/vr-project/3D Models/Staircase.blend new file mode 100644 index 00000000..1e3c9895 Binary files /dev/null and b/vr-project/3D Models/Staircase.blend differ diff --git a/vr-project/3D Models/Staircase.blend.import b/vr-project/3D Models/Staircase.blend.import new file mode 100644 index 00000000..5588c1a3 --- /dev/null +++ b/vr-project/3D Models/Staircase.blend.import @@ -0,0 +1,67 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://7rcvgus7b4p7" +path="res://.godot/imported/Staircase.blend-2cd176347815a0a9de433dbb279cc9ed.scn" + +[deps] + +source_file="res://3D Models/Staircase.blend" +dest_files=["res://.godot/imported/Staircase.blend-2cd176347815a0a9de433dbb279cc9ed.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": { +"StairsWood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/StairsToonMat.tres", +"use_external/path": "uid://b1oultarc0lsb" +} +} +} +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/Wall Phone.blend b/vr-project/3D Models/Wall Phone.blend index c0dbd342..5aae7fef 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 index f730a82f..935b39f5 100644 --- a/vr-project/Materials/AppleToonMat.tres +++ b/vr-project/Materials/AppleToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.002 diff --git a/vr-project/Materials/BlockoutToonMat.tres b/vr-project/Materials/BlockoutToonMat.tres index 0b6edc3a..53616474 100644 --- a/vr-project/Materials/BlockoutToonMat.tres +++ b/vr-project/Materials/BlockoutToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.006 diff --git a/vr-project/Materials/BookshelfToonMat.tres b/vr-project/Materials/BookshelfToonMat.tres index 27235c0d..1d9d82e5 100644 --- a/vr-project/Materials/BookshelfToonMat.tres +++ b/vr-project/Materials/BookshelfToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.01 diff --git a/vr-project/Materials/CabinetMetalToonMat.tres b/vr-project/Materials/CabinetMetalToonMat.tres index 5582af8c..ea39f4e1 100644 --- a/vr-project/Materials/CabinetMetalToonMat.tres +++ b/vr-project/Materials/CabinetMetalToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.004 diff --git a/vr-project/Materials/CabinetWoodToonMat.tres b/vr-project/Materials/CabinetWoodToonMat.tres index 7a24ea91..f500f811 100644 --- a/vr-project/Materials/CabinetWoodToonMat.tres +++ b/vr-project/Materials/CabinetWoodToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.005 diff --git a/vr-project/Materials/CoatRackToonMat.tres b/vr-project/Materials/CoatRackToonMat.tres new file mode 100644 index 00000000..09a3b3a7 --- /dev/null +++ b/vr-project/Materials/CoatRackToonMat.tres @@ -0,0 +1,19 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dgox41nvqnsuh"] + +[ext_resource type="Texture2D" uid="uid://vc3klvgljg7r" path="res://Textures/CoatRackMat.png" id="1_v6vxd"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] +cull_mode = 1 +shading_mode = 2 +diffuse_mode = 3 +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_v6vxd") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/DoorToonMat.tres b/vr-project/Materials/DoorToonMat.tres index 599071d6..e91aa90d 100644 --- a/vr-project/Materials/DoorToonMat.tres +++ b/vr-project/Materials/DoorToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.005 diff --git a/vr-project/Materials/FloorToonMat.tres b/vr-project/Materials/FloorToonMat.tres index 80904580..06e1c578 100644 --- a/vr-project/Materials/FloorToonMat.tres +++ b/vr-project/Materials/FloorToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0, 0, 0, 1) grow = true grow_amount = 0.03 diff --git a/vr-project/Materials/InterrogationChairToonMat.tres b/vr-project/Materials/InterrogationChairToonMat.tres index 9f32f1fc..2cb0a478 100644 --- a/vr-project/Materials/InterrogationChairToonMat.tres +++ b/vr-project/Materials/InterrogationChairToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.005 diff --git a/vr-project/Materials/KnifeHandleToonMat.tres b/vr-project/Materials/KnifeHandleToonMat.tres index 80f5df34..c93b4f78 100644 --- a/vr-project/Materials/KnifeHandleToonMat.tres +++ b/vr-project/Materials/KnifeHandleToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.1 diff --git a/vr-project/Materials/KnifeMetalToonMat.tres b/vr-project/Materials/KnifeMetalToonMat.tres index c63882c2..6f75b971 100644 --- a/vr-project/Materials/KnifeMetalToonMat.tres +++ b/vr-project/Materials/KnifeMetalToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.12 diff --git a/vr-project/Materials/LampToonMat.tres b/vr-project/Materials/LampToonMat.tres index 84cca07a..eeafb587 100644 --- a/vr-project/Materials/LampToonMat.tres +++ b/vr-project/Materials/LampToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.005 diff --git a/vr-project/Materials/MainChairToonMat.tres b/vr-project/Materials/MainChairToonMat.tres new file mode 100644 index 00000000..5d98c22c --- /dev/null +++ b/vr-project/Materials/MainChairToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ieckq8bqfhsj"] + +[ext_resource type="Texture2D" uid="uid://c8cms3u714vmh" path="res://Textures/MainChairMat.png" id="1_5v408"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] +cull_mode = 1 +diffuse_mode = 3 +albedo_color = Color(0.07, 0.07, 0.07, 1) +grow = true +grow_amount = 0.006 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_5v408") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/RugToonMat.tres b/vr-project/Materials/RugToonMat.tres index dcdf0838..a85b3f58 100644 --- a/vr-project/Materials/RugToonMat.tres +++ b/vr-project/Materials/RugToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.01 diff --git a/vr-project/Materials/StairsToonMat.tres b/vr-project/Materials/StairsToonMat.tres new file mode 100644 index 00000000..e5df62ca --- /dev/null +++ b/vr-project/Materials/StairsToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://b1oultarc0lsb"] + +[ext_resource type="Texture2D" uid="uid://bj3upvlwlmg85" path="res://Textures/StairsMat.png" id="1_wyvru"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] +cull_mode = 1 +diffuse_mode = 3 +albedo_color = Color(0.07, 0.07, 0.07, 1) +grow = true +grow_amount = 0.01 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_wyvru") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/StaplerToonMat.tres b/vr-project/Materials/StaplerToonMat.tres index 8e901aad..c86dfe43 100644 --- a/vr-project/Materials/StaplerToonMat.tres +++ b/vr-project/Materials/StaplerToonMat.tres @@ -4,7 +4,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0, 0, 0, 1) grow = true grow_amount = 0.001 diff --git a/vr-project/Materials/ToonMaterial.tres b/vr-project/Materials/ToonMaterial.tres index b4742db0..69c00264 100644 --- a/vr-project/Materials/ToonMaterial.tres +++ b/vr-project/Materials/ToonMaterial.tres @@ -2,7 +2,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.01 diff --git a/vr-project/Materials/WallPhoneToonMat.tres b/vr-project/Materials/WallPhoneToonMat.tres index b2fd5271..e6d71078 100644 --- a/vr-project/Materials/WallPhoneToonMat.tres +++ b/vr-project/Materials/WallPhoneToonMat.tres @@ -6,7 +6,7 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true grow_amount = 0.003 diff --git a/vr-project/Materials/WallWoodToonMat.tres b/vr-project/Materials/WallWoodToonMat.tres index 1d098473..50fbf7bb 100644 --- a/vr-project/Materials/WallWoodToonMat.tres +++ b/vr-project/Materials/WallWoodToonMat.tres @@ -4,10 +4,10 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ycayy"] cull_mode = 1 -shading_mode = 0 +diffuse_mode = 3 albedo_color = Color(0.07, 0.07, 0.07, 1) grow = true -grow_amount = 0.005 +grow_amount = 0.007 [resource] next_pass = SubResource("StandardMaterial3D_ycayy") diff --git a/vr-project/3D Models/FloorPlan Immerse yourself.fbx b/vr-project/Reference models/FloorPlan Immerse yourself.fbx similarity index 100% rename from vr-project/3D Models/FloorPlan Immerse yourself.fbx rename to vr-project/Reference models/FloorPlan Immerse yourself.fbx diff --git a/vr-project/3D Models/FloorPlan Immerse yourself.fbx.import b/vr-project/Reference models/FloorPlan Immerse yourself.fbx.import similarity index 82% rename from vr-project/3D Models/FloorPlan Immerse yourself.fbx.import rename to vr-project/Reference models/FloorPlan Immerse yourself.fbx.import index 33f12fee..c73e8c7d 100644 --- a/vr-project/3D Models/FloorPlan Immerse yourself.fbx.import +++ b/vr-project/Reference models/FloorPlan Immerse yourself.fbx.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://ch6ybfu01ljcr" -path="res://.godot/imported/FloorPlan Immerse yourself.fbx-c40a1bbb836354e07164f2e8a7605309.scn" +path="res://.godot/imported/FloorPlan Immerse yourself.fbx-e764294fc5d8a5b7bb3a065e55f7cbd2.scn" [deps] -source_file="res://3D Models/FloorPlan Immerse yourself.fbx" -dest_files=["res://.godot/imported/FloorPlan Immerse yourself.fbx-c40a1bbb836354e07164f2e8a7605309.scn"] +source_file="res://Reference models/FloorPlan Immerse yourself.fbx" +dest_files=["res://.godot/imported/FloorPlan Immerse yourself.fbx-e764294fc5d8a5b7bb3a065e55f7cbd2.scn"] [params] diff --git a/vr-project/Reference models/Interrogation Chair Reference.fbx b/vr-project/Reference models/Interrogation Chair Reference.fbx new file mode 100644 index 00000000..d866fc3d Binary files /dev/null and b/vr-project/Reference models/Interrogation Chair Reference.fbx differ diff --git a/vr-project/Reference models/Interrogation Chair Reference.fbx.import b/vr-project/Reference models/Interrogation Chair Reference.fbx.import new file mode 100644 index 00000000..01db0b58 --- /dev/null +++ b/vr-project/Reference models/Interrogation Chair Reference.fbx.import @@ -0,0 +1,44 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://f4dyhk1kf46n" +path="res://.godot/imported/Interrogation Chair Reference.fbx-0233da364c6fa3d2470db7439c4867a8.scn" + +[deps] + +source_file="res://Reference models/Interrogation Chair Reference.fbx" +dest_files=["res://.godot/imported/Interrogation Chair Reference.fbx-0233da364c6fa3d2470db7439c4867a8.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=true +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={} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +fbx/naming_version=2 diff --git a/vr-project/3D Models/Reference Model_Immerse.fbx b/vr-project/Reference models/Reference Model_Immerse.fbx similarity index 100% rename from vr-project/3D Models/Reference Model_Immerse.fbx rename to vr-project/Reference models/Reference Model_Immerse.fbx diff --git a/vr-project/3D Models/Reference Model_Immerse.fbx.import b/vr-project/Reference models/Reference Model_Immerse.fbx.import similarity index 77% rename from vr-project/3D Models/Reference Model_Immerse.fbx.import rename to vr-project/Reference models/Reference Model_Immerse.fbx.import index ed396a50..2400281a 100644 --- a/vr-project/3D Models/Reference Model_Immerse.fbx.import +++ b/vr-project/Reference models/Reference Model_Immerse.fbx.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://cdlkhakrdtati" -path="res://.godot/imported/Reference Model_Immerse.fbx-f817902c69f4d17f18a3eca55ebe24bf.scn" +path="res://.godot/imported/Reference Model_Immerse.fbx-de65190630c2f4c6e83b3b5c4465fdc9.scn" [deps] -source_file="res://3D Models/Reference Model_Immerse.fbx" -dest_files=["res://.godot/imported/Reference Model_Immerse.fbx-f817902c69f4d17f18a3eca55ebe24bf.scn"] +source_file="res://Reference models/Reference Model_Immerse.fbx" +dest_files=["res://.godot/imported/Reference Model_Immerse.fbx-de65190630c2f4c6e83b3b5c4465fdc9.scn"] [params] diff --git a/vr-project/Textures/BookshelfMat.png b/vr-project/Textures/BookshelfMat.png index 012c3a74..bf6b6bbc 100644 Binary files a/vr-project/Textures/BookshelfMat.png and b/vr-project/Textures/BookshelfMat.png differ diff --git a/vr-project/Textures/CabinHandleMat.png b/vr-project/Textures/CabinHandleMat.png index cfb2bdac..b2f68f90 100644 Binary files a/vr-project/Textures/CabinHandleMat.png and b/vr-project/Textures/CabinHandleMat.png differ diff --git a/vr-project/Textures/CoatRackMat.png b/vr-project/Textures/CoatRackMat.png new file mode 100644 index 00000000..54c4f25a Binary files /dev/null and b/vr-project/Textures/CoatRackMat.png differ diff --git a/vr-project/Textures/CoatRackMat.png.import b/vr-project/Textures/CoatRackMat.png.import new file mode 100644 index 00000000..dad09dd9 --- /dev/null +++ b/vr-project/Textures/CoatRackMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vc3klvgljg7r" +path.s3tc="res://.godot/imported/CoatRackMat.png-2ded888d6d75ebf3e47dcc7e6e6b514c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/CoatRackMat.png" +dest_files=["res://.godot/imported/CoatRackMat.png-2ded888d6d75ebf3e47dcc7e6e6b514c.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/MainChairMat.png b/vr-project/Textures/MainChairMat.png new file mode 100644 index 00000000..0ed4037b Binary files /dev/null and b/vr-project/Textures/MainChairMat.png differ diff --git a/vr-project/Textures/MainChairMat.png.import b/vr-project/Textures/MainChairMat.png.import new file mode 100644 index 00000000..4e35530e --- /dev/null +++ b/vr-project/Textures/MainChairMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8cms3u714vmh" +path.s3tc="res://.godot/imported/MainChairMat.png-e4cdf3c275f3b85017120ea98d2b9c83.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/MainChairMat.png" +dest_files=["res://.godot/imported/MainChairMat.png-e4cdf3c275f3b85017120ea98d2b9c83.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/RugMat.png b/vr-project/Textures/RugMat.png index 97a1dbc4..b9a8a2dc 100644 Binary files a/vr-project/Textures/RugMat.png and b/vr-project/Textures/RugMat.png differ diff --git a/vr-project/Textures/StairsMat.png b/vr-project/Textures/StairsMat.png new file mode 100644 index 00000000..39f16594 Binary files /dev/null and b/vr-project/Textures/StairsMat.png differ diff --git a/vr-project/Textures/StairsMat.png.import b/vr-project/Textures/StairsMat.png.import new file mode 100644 index 00000000..3656816d --- /dev/null +++ b/vr-project/Textures/StairsMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bj3upvlwlmg85" +path.s3tc="res://.godot/imported/StairsMat.png-a6df7e3aff776203857e19570182aa1c.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/StairsMat.png" +dest_files=["res://.godot/imported/StairsMat.png-a6df7e3aff776203857e19570182aa1c.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/WallPhoneMat.png b/vr-project/Textures/WallPhoneMat.png index 02ed08f6..b7c27dec 100644 Binary files a/vr-project/Textures/WallPhoneMat.png and b/vr-project/Textures/WallPhoneMat.png differ diff --git a/vr-project/Textures/WallPhoneRoughness.png b/vr-project/Textures/WallPhoneRoughness.png index bd54eb8d..f8408d75 100644 Binary files a/vr-project/Textures/WallPhoneRoughness.png and b/vr-project/Textures/WallPhoneRoughness.png differ diff --git a/vr-project/Textures/WoodMat.png b/vr-project/Textures/WoodMat.png index 90e121b7..6af6b95c 100644 Binary files a/vr-project/Textures/WoodMat.png and b/vr-project/Textures/WoodMat.png differ diff --git a/vr-project/scenes/game_scene.tscn b/vr-project/scenes/game_scene.tscn index ccf33625..ac38ad0e 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=18 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"] @@ -11,6 +11,9 @@ [ext_resource type="PackedScene" uid="uid://bx1v70hvn20av" path="res://3D Models/Apple.blend" id="9_utbpp"] [ext_resource type="PackedScene" uid="uid://cfcbaa1nma7di" path="res://3D Models/Rug.blend" id="10_mw25s"] [ext_resource type="PackedScene" uid="uid://boahpxyle160d" path="res://3D Models/Bookshelf.blend" id="11_tcjrq"] +[ext_resource type="PackedScene" uid="uid://dnjrqeylu6l1v" path="res://3D Models/MainChair.blend" id="12_rvs2r"] +[ext_resource type="PackedScene" uid="uid://7rcvgus7b4p7" path="res://3D Models/Staircase.blend" id="13_tqxxy"] +[ext_resource type="PackedScene" uid="uid://b56mjoggc7s7" path="res://3D Models/Coat Rack.blend" id="14_5ay1a"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(1, 0.35000002, 0.55583334, 1) @@ -30,7 +33,7 @@ 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.2132, 0.2796733, 0.52, 1) +ambient_light_color = Color(0.15640001, 0.26984668, 0.68, 1) ambient_light_energy = 8.11 reflected_light_source = 2 tonemap_mode = 2 @@ -70,16 +73,11 @@ script = null environment = SubResource("Environment_bw6k5") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.9162748, 0.22865315, -0.32887393, -0.007333067, 0.8304939, 0.5569795, 0.4004829, -0.5079345, 0.7626374, -0.020096421, 2.8933644, 0) +transform = Transform3D(0.9499409, 0.22866178, -0.21289855, -0.08187741, 0.83981466, 0.5366633, 0.30150962, -0.4923668, 0.8164967, -1.6417658, 3.0047228, -0.5980957) light_color = Color(0.9863629, 0, 0.3088207, 1) -light_energy = 3.764 -light_indirect_energy = 0.75 -light_specular = 0.917 +light_energy = 2.171 shadow_enabled = true -shadow_bias = 0.0 -shadow_normal_bias = 10.0 -shadow_transmittance_bias = 10.717 -shadow_blur = 2.834 +shadow_blur = 1.476 [node name="Block Out VR" parent="." instance=ExtResource("1_w5aja")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.27989578, 0, 1.4924412) @@ -109,20 +107,86 @@ transform = Transform3D(-0.437768, 0.39613712, 0.80711496, 0.6709704, 0.74148417 [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="SpotLight3D3" type="SpotLight3D" parent="Lamp"] +transform = Transform3D(0.9186809, -3.087941e-10, -2.7390454e-08, 2.8174826e-08, -0.018874904, 0.94520175, -8.979292e-10, -0.9639518, -0.019249327, 0.025473833, 1.7233746, -0.005883634) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 0.482 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 2.349 +spot_attenuation = -2.78 +spot_angle = 31.01 +spot_angle_attenuation = 0.8705506 + +[node name="SpotLight3D4" type="SpotLight3D" parent="Lamp"] +transform = Transform3D(-0.9193781, -4.656613e-10, -0.04000237, 0.028399304, -0.018874908, -0.9432497, -0.00040423032, -0.9639519, 0.019195396, 0.039413616, 1.6273518, -0.010236169) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 1.154 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 3.752 +spot_attenuation = 1.62 +spot_angle = 45.82 +spot_angle_attenuation = 0.8705506 + [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="SpotLight3D6" type="SpotLight3D" parent="Lamp2"] +transform = Transform3D(0.9186809, -3.087941e-10, -2.7390454e-08, 2.8174826e-08, -0.018874904, 0.94520175, -8.979292e-10, -0.9639518, -0.019249327, -0.0015716553, 1.8232813, -0.012326717) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 0.482 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 2.349 +spot_attenuation = -2.78 +spot_angle = 31.01 +spot_angle_attenuation = 0.8705506 + +[node name="SpotLight3D7" type="SpotLight3D" parent="Lamp2"] +transform = Transform3D(-0.9107139, 0.022059109, 0.12153722, -0.11775334, 0.04416447, -0.93702585, -0.0270163, -0.96222395, -0.047060356, 0.04859624, 1.6314453, -0.036852747) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 5.538 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 4.019819 +spot_attenuation = 2.66 +spot_angle = 39.59 +spot_angle_attenuation = 0.8705506 + [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="SpotLight3D2" type="SpotLight3D" parent="Lamp3"] +transform = Transform3D(-0.9205531, 6.9849193e-10, 0.014963311, -0.0012096837, -0.018874906, -0.9432604, -0.00017134403, -0.9639519, 0.019185212, 0.0061371326, 1.7182162, -0.0042523146) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 1.916 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 3.752 +spot_attenuation = 0.33 +spot_angle = 41.15 +spot_angle_attenuation = 0.8705506 + +[node name="SpotLight3D5" type="SpotLight3D" parent="Lamp3"] +transform = Transform3D(0.9186809, -3.087941e-10, -2.7390454e-08, 2.8174826e-08, -0.018874904, 0.94520175, -8.979292e-10, -0.9639518, -0.019249327, -0.019191265, 1.7609967, -0.007372737) +light_color = Color(0.93333334, 0.13333334, 0.47058824, 1) +light_energy = 0.482 +shadow_enabled = true +shadow_opacity = 0.55 +spot_range = 2.349 +spot_attenuation = -2.78 +spot_angle = 31.01 +spot_angle_attenuation = 0.8705506 + [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) +transform = Transform3D(0.7827341, 0, 0.6663238, 0, 1.0279398, 0, -0.6663238, 0, 0.7827341, 0.25541964, 0.03897707, 1.8858776) [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) +transform = Transform3D(-0.31167296, 0, 0.9795509, 0, 1.0279398, 0, -0.9795509, 0, -0.31167296, -1.2498544, 0.03897707, 1.8223786) [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.8170123, 1.262427, 0.6552586) +transform = Transform3D(-1.4768354, 0, 1.2910905e-07, 0, 1.4768354, 0, -1.2910905e-07, 0, -1.4768354, 2.8170123, 1.3162897, 0.6552586) [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) @@ -131,4 +195,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.22358268, 0.9, 2.8458138) transform = Transform3D(0.8833835, 0, 0, 0, 0.97992885, 0, 0, 0, 0.94528943, -0.1365559, 0.022262793, 1.6618729) [node name="Bookshelf" parent="." instance=ExtResource("11_tcjrq")] -transform = Transform3D(0.64484394, 0, 0, 0, 0.9164987, 0, 0, 0, 0.9164987, -3.0292282, 0.05360484, 2.240892) +transform = Transform3D(0.64484394, 0, 0, 0, 0.832451, 0, 0, 0, 0.9164987, -3.0292282, 0.05360484, 2.240892) + +[node name="MainChair" parent="." instance=ExtResource("12_rvs2r")] +transform = Transform3D(0.28741652, 0, -1.1008092, 0, 1.1377122, 0, 1.1008092, 0, 0.28741652, -0.30645457, 0.073526576, 3.83221) + +[node name="Staircase" parent="." instance=ExtResource("13_tqxxy")] +transform = Transform3D(0.9096238, 0, 0.6005032, 0, 1.0790231, 0, -0.58040977, 0, 0.94111454, -1.8165766, 0.10482753, 0.3478723) + +[node name="Coat Rack" parent="." instance=ExtResource("14_5ay1a")] +transform = Transform3D(1.0548915, 0, 0, 0, 1.0548915, 0, 0, 0, 1.0548915, 0.5406173, 0.020712256, -1.7082312)