diff --git a/vr-project/3D Models/Filing Cabinets.blend b/vr-project/3D Models/Filing Cabinets.blend index baa39a94..76c8d8a4 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/Knife.blend b/vr-project/3D Models/Knife.blend new file mode 100644 index 00000000..a91aafcc Binary files /dev/null and b/vr-project/3D Models/Knife.blend differ diff --git a/vr-project/3D Models/Knife.blend.import b/vr-project/3D Models/Knife.blend.import new file mode 100644 index 00000000..8a94024d --- /dev/null +++ b/vr-project/3D Models/Knife.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dgwr2md2wey24" +path="res://.godot/imported/Knife.blend-94fb8b76ac00d4f3e6f29fae2f8ee7dc.scn" + +[deps] + +source_file="res://3D Models/Knife.blend" +dest_files=["res://.godot/imported/Knife.blend-94fb8b76ac00d4f3e6f29fae2f8ee7dc.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": { +"KnifeHandle": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/KnifeHandleToonMat.tres", +"use_external/path": "uid://bip8f7rtdhs18" +}, +"KnifeMetal": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/KnifeMetalToonMat.tres", +"use_external/path": "uid://232pnp4mwjmp" +} +} +} +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/textures/KnifeHandleMat.001.png b/vr-project/3D Models/textures/KnifeHandleMat.001.png new file mode 100644 index 00000000..b223dc03 Binary files /dev/null and b/vr-project/3D Models/textures/KnifeHandleMat.001.png differ diff --git a/vr-project/Materials/CabinetMetalToonMat.tres b/vr-project/Materials/CabinetMetalToonMat.tres index b7a42db5..22a0b3da 100644 --- a/vr-project/Materials/CabinetMetalToonMat.tres +++ b/vr-project/Materials/CabinetMetalToonMat.tres @@ -13,6 +13,8 @@ grow_amount = 0.004 next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 +albedo_color = Color(0.84, 0.84, 0.84, 1) albedo_texture = ExtResource("1_xgiyf") +metallic = 0.19 roughness = 0.0 rim_enabled = true diff --git a/vr-project/Materials/KnifeHandleToonMat.tres b/vr-project/Materials/KnifeHandleToonMat.tres new file mode 100644 index 00000000..80f5df34 --- /dev/null +++ b/vr-project/Materials/KnifeHandleToonMat.tres @@ -0,0 +1,19 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bip8f7rtdhs18"] + +[ext_resource type="Texture2D" uid="uid://bi5jfcwlus5e2" path="res://Textures/KnifeHandleMat.png" id="1_trawk"] + +[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.1 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_color = Color(0.7801374, 0.7801375, 0.7801374, 1) +albedo_texture = ExtResource("1_trawk") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/KnifeMetalToonMat.tres b/vr-project/Materials/KnifeMetalToonMat.tres new file mode 100644 index 00000000..faeead33 --- /dev/null +++ b/vr-project/Materials/KnifeMetalToonMat.tres @@ -0,0 +1,19 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://232pnp4mwjmp"] + +[ext_resource type="Texture2D" uid="uid://cntu5t7tc7w35" path="res://Textures/KnifeMetalMat.png" id="1_derp1"] + +[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.12 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_derp1") +metallic_specular = 0.72 +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Textures/KnifeHandleMat.png b/vr-project/Textures/KnifeHandleMat.png new file mode 100644 index 00000000..957a18f9 Binary files /dev/null and b/vr-project/Textures/KnifeHandleMat.png differ diff --git a/vr-project/Textures/KnifeHandleMat.png.import b/vr-project/Textures/KnifeHandleMat.png.import new file mode 100644 index 00000000..006fe890 --- /dev/null +++ b/vr-project/Textures/KnifeHandleMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bi5jfcwlus5e2" +path.s3tc="res://.godot/imported/KnifeHandleMat.png-2f406ec2253be4a8dd80d7be19ddd4bc.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/KnifeHandleMat.png" +dest_files=["res://.godot/imported/KnifeHandleMat.png-2f406ec2253be4a8dd80d7be19ddd4bc.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/KnifeMetalMat.png b/vr-project/Textures/KnifeMetalMat.png new file mode 100644 index 00000000..639ae4f5 Binary files /dev/null and b/vr-project/Textures/KnifeMetalMat.png differ diff --git a/vr-project/Textures/KnifeMetalMat.png.import b/vr-project/Textures/KnifeMetalMat.png.import new file mode 100644 index 00000000..be6b1bfb --- /dev/null +++ b/vr-project/Textures/KnifeMetalMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cntu5t7tc7w35" +path.s3tc="res://.godot/imported/KnifeMetalMat.png-6a64ccc46ab060bad24314e911044f16.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/KnifeMetalMat.png" +dest_files=["res://.godot/imported/KnifeMetalMat.png-6a64ccc46ab060bad24314e911044f16.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 824711d2..4a41fa36 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=8 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=9 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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(0.16916332, 0.10069999, 0.19, 1) @@ -20,7 +21,7 @@ background_color = Color(0.93894166, 0, 0.11225095, 1) background_energy_multiplier = 2.73 sky = SubResource("Sky_ycayy") ambient_light_source = 2 -ambient_light_color = Color(0.15817368, 0.28141087, 0.62470627, 1) +ambient_light_color = Color(0.24536058, 0.3008557, 0.49238563, 1) ambient_light_energy = 8.11 tonemap_mode = 2 tonemap_white = 1.34 @@ -35,6 +36,16 @@ glow_enabled = true [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") @@ -42,23 +53,36 @@ 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) light_color = Color(0.9863629, 0, 0.3088207, 1) -light_energy = 1.167 +light_energy = 3.764 light_indirect_energy = 0.75 light_specular = 0.917 shadow_enabled = true shadow_bias = 0.0 shadow_normal_bias = 10.0 shadow_transmittance_bias = 10.717 -shadow_blur = 0.635 +shadow_blur = 2.834 [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) [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) [node name="Filing Cabinets" parent="." instance=ExtResource("4_bw6k5")] 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)