diff --git a/vr-project/3D Models/Block Out VR.blend b/vr-project/3D Models/Block Out VR.blend index 27820aa9..76bda3f2 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 9d2afb46..54aedd59 100644 --- a/vr-project/3D Models/Block Out VR.blend.import +++ b/vr-project/3D Models/Block Out VR.blend.import @@ -37,7 +37,15 @@ import_script/path="" materials/extract=0 materials/extract_format=0 materials/extract_path="" -_subresources={} +_subresources={ +"materials": { +"BaseMesh_Male_M": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/BlockoutMat.tres", +"use_external/path": "uid://c86xxl67a5axp" +} +} +} blender/nodes/visible=0 blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true 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 abfad44e..a4484b40 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/Reference Model_Immerse.fbx.import b/vr-project/3D Models/Reference Model_Immerse.fbx.import new file mode 100644 index 00000000..ed396a50 --- /dev/null +++ b/vr-project/3D Models/Reference Model_Immerse.fbx.import @@ -0,0 +1,44 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cdlkhakrdtati" +path="res://.godot/imported/Reference Model_Immerse.fbx-f817902c69f4d17f18a3eca55ebe24bf.scn" + +[deps] + +source_file="res://3D Models/Reference Model_Immerse.fbx" +dest_files=["res://.godot/imported/Reference Model_Immerse.fbx-f817902c69f4d17f18a3eca55ebe24bf.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/Stapler.blend b/vr-project/3D Models/Stapler.blend new file mode 100644 index 00000000..68aedc9e Binary files /dev/null and b/vr-project/3D Models/Stapler.blend differ diff --git a/vr-project/3D Models/Stapler.blend.import b/vr-project/3D Models/Stapler.blend.import new file mode 100644 index 00000000..c377ce6b --- /dev/null +++ b/vr-project/3D Models/Stapler.blend.import @@ -0,0 +1,67 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bf4jrykbuk2q2" +path="res://.godot/imported/Stapler.blend-a1ab1302710537f084a37677cbb7c634.scn" + +[deps] + +source_file="res://3D Models/Stapler.blend" +dest_files=["res://.godot/imported/Stapler.blend-a1ab1302710537f084a37677cbb7c634.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": { +"StaplerMat": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/StaplerToon.tres", +"use_external/path": "uid://b8uu6hswvrum5" +} +} +} +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/Textures/Stapler_Texture.png b/vr-project/Textures/Stapler_Texture.png new file mode 100644 index 00000000..a029ca15 Binary files /dev/null and b/vr-project/Textures/Stapler_Texture.png differ diff --git a/vr-project/Textures/Stapler_Texture.png.import b/vr-project/Textures/Stapler_Texture.png.import new file mode 100644 index 00000000..a8b18ee9 --- /dev/null +++ b/vr-project/Textures/Stapler_Texture.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8kqdlrhsf7qe" +path.s3tc="res://.godot/imported/Stapler_Texture.png-a926c2840c8d12b59eda43cc07c2488a.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/Stapler_Texture.png" +dest_files=["res://.godot/imported/Stapler_Texture.png-a926c2840c8d12b59eda43cc07c2488a.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 538131c5..a71de797 100644 --- a/vr-project/scenes/game_scene.tscn +++ b/vr-project/scenes/game_scene.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://b5m5h30gog3pu"] +[gd_scene load_steps=7 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"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_onqr8"] sky_top_color = Color(0.16916332, 0.10069999, 0.19, 1) @@ -14,14 +15,18 @@ sky_material = SubResource("ProceduralSkyMaterial_onqr8") [sub_resource type="Environment" id="Environment_bw6k5"] background_mode = 1 -background_color = Color(0.91819453, 0, 0.38414586, 1) +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.16658881, 0.2494578, 0.80619437, 1) -ambient_light_energy = 0.5 +ambient_light_color = Color(0.15817368, 0.28141087, 0.62470627, 1) +ambient_light_energy = 8.11 tonemap_mode = 2 ssao_enabled = true +ssao_intensity = 2.34 +ssao_power = 1.39955 +ssao_detail = 5.0 +ssao_sharpness = 1.0 sdfgi_cascades = 2 sdfgi_min_cell_size = 0.1171875 glow_enabled = true @@ -29,28 +34,47 @@ glow_enabled = true [node name="Root" type="Node3D"] [node name="VROrigin" parent="." instance=ExtResource("2_onqr8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0004169941, 0, -0.95417106) +_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") [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(1, 0, 0, 1) -light_energy = 0.733 -light_indirect_energy = 1.145 -light_volumetric_fog_energy = 0.0 -light_angular_distance = 1.0 -light_specular = 5.667 -light_bake_mode = 1 +light_color = Color(0.9863629, 0, 0.3088207, 1) +light_energy = 1.167 +light_indirect_energy = 0.75 +light_specular = 0.917 shadow_enabled = true -shadow_normal_bias = 0.1 -shadow_blur = 0.75 -directional_shadow_fade_start = 0.965 -directional_shadow_max_distance = 20.0 +shadow_bias = 0.0 +shadow_normal_bias = 10.0 +shadow_transmittance_bias = 10.717 +shadow_blur = 0.635 [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)