diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 76bda3f2..7381740e 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 54aedd59..90f22f9b 100644 --- a/vr-project/3D Models/Block Out VR.blend.import +++ b/vr-project/3D Models/Block Out VR.blend.import @@ -41,7 +41,7 @@ _subresources={ "materials": { "BaseMesh_Male_M": { "use_external/enabled": true, -"use_external/fallback_path": "res://Materials/BlockoutMat.tres", +"use_external/fallback_path": "res://Materials/BlockoutToonMat.tres", "use_external/path": "uid://c86xxl67a5axp" } } diff --git a/vr-project/3D Models/Filing Cabinets.blend b/vr-project/3D Models/Filing Cabinets.blend new file mode 100644 index 00000000..baa39a94 Binary files /dev/null and b/vr-project/3D Models/Filing Cabinets.blend differ diff --git a/vr-project/3D Models/Filing Cabinets.blend.import b/vr-project/3D Models/Filing Cabinets.blend.import new file mode 100644 index 00000000..dd2ce75b --- /dev/null +++ b/vr-project/3D Models/Filing Cabinets.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://qi0hk5v0aag7" +path="res://.godot/imported/Filing Cabinets.blend-59c3c1e18bb69eff235dc5c56bfb2edd.scn" + +[deps] + +source_file="res://3D Models/Filing Cabinets.blend" +dest_files=["res://.godot/imported/Filing Cabinets.blend-59c3c1e18bb69eff235dc5c56bfb2edd.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": { +"Metal": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/CabinetMetalToonMat.tres", +"use_external/path": "uid://cne2pjsvtncfc" +}, +"Wood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/CabinetWoodToonMat.tres", +"use_external/path": "uid://dmxmvrh3abre0" +} +} +} +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/BlockoutMat.tres b/vr-project/Materials/BlockoutToonMat.tres similarity index 100% rename from vr-project/Materials/BlockoutMat.tres rename to vr-project/Materials/BlockoutToonMat.tres diff --git a/vr-project/Materials/CabinetMetalToonMat.tres b/vr-project/Materials/CabinetMetalToonMat.tres new file mode 100644 index 00000000..b7a42db5 --- /dev/null +++ b/vr-project/Materials/CabinetMetalToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cne2pjsvtncfc"] + +[ext_resource type="Texture2D" uid="uid://d2uaevvrtb4py" path="res://Textures/CabinHandleMat.png" id="1_xgiyf"] + +[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.004 + +[resource] +next_pass = SubResource("StandardMaterial3D_ycayy") +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = ExtResource("1_xgiyf") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/CabinetWoodToonMat.tres b/vr-project/Materials/CabinetWoodToonMat.tres new file mode 100644 index 00000000..7a24ea91 --- /dev/null +++ b/vr-project/Materials/CabinetWoodToonMat.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dmxmvrh3abre0"] + +[ext_resource type="Texture2D" uid="uid://dlry7rp2xp44l" path="res://Textures/WoodMat.png" id="1_wf643"] + +[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_wf643") +roughness = 0.0 +rim_enabled = true diff --git a/vr-project/Materials/StaplerToon.tres b/vr-project/Materials/StaplerToonMat.tres similarity index 100% rename from vr-project/Materials/StaplerToon.tres rename to vr-project/Materials/StaplerToonMat.tres diff --git a/vr-project/Materials/ToonMaterial.tres b/vr-project/Materials/ToonMaterial.tres index b3ae2958..b4742db0 100644 --- a/vr-project/Materials/ToonMaterial.tres +++ b/vr-project/Materials/ToonMaterial.tres @@ -11,6 +11,5 @@ grow_amount = 0.01 next_pass = SubResource("StandardMaterial3D_ycayy") diffuse_mode = 3 specular_mode = 1 -albedo_color = Color(0.58, 0.58, 0.58, 1) roughness = 0.0 rim_enabled = true diff --git a/vr-project/Textures/CabinHandleMat.png b/vr-project/Textures/CabinHandleMat.png new file mode 100644 index 00000000..cfb2bdac Binary files /dev/null and b/vr-project/Textures/CabinHandleMat.png differ diff --git a/vr-project/Textures/CabinHandleMat.png.import b/vr-project/Textures/CabinHandleMat.png.import new file mode 100644 index 00000000..c18454f9 --- /dev/null +++ b/vr-project/Textures/CabinHandleMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2uaevvrtb4py" +path.s3tc="res://.godot/imported/CabinHandleMat.png-2c68a40ef169b6bb8f6d8844da3e98a0.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/CabinHandleMat.png" +dest_files=["res://.godot/imported/CabinHandleMat.png-2c68a40ef169b6bb8f6d8844da3e98a0.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/WoodMat.png b/vr-project/Textures/WoodMat.png new file mode 100644 index 00000000..90e121b7 Binary files /dev/null and b/vr-project/Textures/WoodMat.png differ diff --git a/vr-project/Textures/WoodMat.png.import b/vr-project/Textures/WoodMat.png.import new file mode 100644 index 00000000..d5029af8 --- /dev/null +++ b/vr-project/Textures/WoodMat.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dlry7rp2xp44l" +path.s3tc="res://.godot/imported/WoodMat.png-5e737c6619de7a28b131759d7aa3d8d1.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/WoodMat.png" +dest_files=["res://.godot/imported/WoodMat.png-5e737c6619de7a28b131759d7aa3d8d1.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 a71de797..2f53c041 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=7 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=8 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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(0.16916332, 0.10069999, 0.19, 1) @@ -22,9 +23,9 @@ ambient_light_source = 2 ambient_light_color = Color(0.15817368, 0.28141087, 0.62470627, 1) ambient_light_energy = 8.11 tonemap_mode = 2 +tonemap_white = 1.34 +ssr_fade_in = 0.4873501 ssao_enabled = true -ssao_intensity = 2.34 -ssao_power = 1.39955 ssao_detail = 5.0 ssao_sharpness = 1.0 sdfgi_cascades = 2 @@ -78,3 +79,6 @@ 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)