diff --git a/assets/materials/metal.ptex b/assets/materials/metal.ptex new file mode 100644 index 00000000..a9e394d0 --- /dev/null +++ b/assets/materials/metal.ptex @@ -0,0 +1,206 @@ +{ + "connections": [ + { + "from": "fbm2", + "from_port": 0, + "to": "gaussian_blur", + "to_port": 0 + }, + { + "from": "math", + "from_port": 0, + "to": "math_2", + "to_port": 0 + }, + { + "from": "math_2", + "from_port": 0, + "to": "colorize", + "to_port": 0 + }, + { + "from": "colorize", + "from_port": 0, + "to": "Material", + "to_port": 0 + }, + { + "from": "gaussian_blur", + "from_port": 0, + "to": "math", + "to_port": 1 + }, + { + "from": "fbm2", + "from_port": 0, + "to": "math", + "to_port": 0 + }, + { + "from": "normal_map2", + "from_port": 0, + "to": "Material", + "to_port": 4 + }, + { + "from": "math_2", + "from_port": 0, + "to": "normal_map2", + "to_port": 0 + } + ], + "label": "Graph", + "longdesc": "", + "name": "369", + "node_position": { + "x": 0, + "y": 0 + }, + "nodes": [ + { + "export_last_target": "Blender", + "export_paths": { + "Blender": "/home/sara/Documents/gd-projects/wave-survival-fps/project/assets/textures/metal/metal" + }, + "name": "Material", + "node_position": { + "x": 0, + "y": 0 + }, + "parameters": { + "albedo_color": { + "a": 1, + "b": 1, + "g": 1, + "r": 1, + "type": "Color" + }, + "ao": 1, + "depth_scale": 0.5, + "emission_energy": 1, + "flags_transparent": true, + "metallic": 1, + "normal": 1, + "roughness": 0.25, + "size": 11, + "sss": 1 + }, + "seed_int": 0, + "type": "material" + }, + { + "name": "fbm2", + "node_position": { + "x": -1712, + "y": -20 + }, + "parameters": { + "folds": 0, + "iterations": 10, + "noise": 0, + "offset": 0, + "persistence": 0.98, + "scale_x": 10, + "scale_y": 10 + }, + "seed_int": 0, + "type": "fbm2" + }, + { + "name": "gaussian_blur", + "node_position": { + "x": -1443.694458, + "y": 90.861107 + }, + "parameters": { + "param0": 9, + "param1": 4.3, + "param2": 0 + }, + "seed_int": 0, + "type": "gaussian_blur" + }, + { + "name": "math", + "node_position": { + "x": -1181, + "y": -3 + }, + "parameters": { + "clamp": false, + "default_in1": 0, + "default_in2": 0, + "op": 0 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "math_2", + "node_position": { + "x": -903, + "y": -38 + }, + "parameters": { + "clamp": false, + "default_in1": 0, + "default_in2": 2, + "op": 3 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "colorize", + "node_position": { + "x": -632, + "y": -46.000004 + }, + "parameters": { + "gradient": { + "interpolation": 1, + "points": [ + { + "a": 1, + "b": 0.167969, + "g": 0.153021, + "pos": 0.031302, + "r": 0.132538 + }, + { + "a": 1, + "b": 0.449219, + "g": 0.44198, + "pos": 1, + "r": 0.421143 + } + ], + "type": "Gradient" + } + }, + "seed_int": 0, + "type": "colorize" + }, + { + "name": "normal_map2", + "node_position": { + "x": -583.357422, + "y": 209.24588 + }, + "parameters": { + "buffer": 1, + "param2": 0, + "size": 10, + "strength": 0.03 + }, + "seed_int": 0, + "type": "normal_map2" + } + ], + "parameters": { + + }, + "seed_int": 0, + "shortdesc": "", + "type": "graph" +} \ No newline at end of file diff --git a/assets/materials/woodgrain.ptex b/assets/materials/woodgrain.ptex new file mode 100644 index 00000000..27e0b164 --- /dev/null +++ b/assets/materials/woodgrain.ptex @@ -0,0 +1,265 @@ +{ + "connections": [ + { + "from": "colorize", + "from_port": 0, + "to": "Material", + "to_port": 0 + }, + { + "from": "normal_map2", + "from_port": 0, + "to": "Material", + "to_port": 4 + }, + { + "from": "math_2", + "from_port": 0, + "to": "math", + "to_port": 0 + }, + { + "from": "math", + "from_port": 0, + "to": "Material", + "to_port": 2 + }, + { + "from": "math", + "from_port": 0, + "to": "Material", + "to_port": 1 + }, + { + "from": "fbm2", + "from_port": 0, + "to": "math_3", + "to_port": 1 + }, + { + "from": "fbm2_2", + "from_port": 0, + "to": "math_3", + "to_port": 0 + }, + { + "from": "math_3", + "from_port": 0, + "to": "math_4", + "to_port": 0 + }, + { + "from": "math_4", + "from_port": 0, + "to": "colorize", + "to_port": 0 + }, + { + "from": "math_4", + "from_port": 0, + "to": "math_2", + "to_port": 0 + }, + { + "from": "math_4", + "from_port": 0, + "to": "normal_map2", + "to_port": 0 + } + ], + "label": "Graph", + "longdesc": "", + "name": "369", + "node_position": { + "x": 0, + "y": 0 + }, + "nodes": [ + { + "export_last_target": "Blender", + "export_paths": { + "Blender": "/home/sara/Documents/gd-projects/wave-survival-fps/project/assets/textures/woodgrain/woodgrain" + }, + "name": "Material", + "node_position": { + "x": -261, + "y": -157 + }, + "parameters": { + "albedo_color": { + "a": 1, + "b": 1, + "g": 1, + "r": 1, + "type": "Color" + }, + "ao": 1, + "depth_scale": 0.5, + "emission_energy": 1, + "flags_transparent": true, + "metallic": 0.27, + "normal": 1, + "roughness": 1, + "size": 11, + "sss": 1 + }, + "seed_int": 0, + "type": "material" + }, + { + "name": "fbm2", + "node_position": { + "x": -1519.475952, + "y": -49.501205 + }, + "parameters": { + "folds": 0, + "iterations": 1, + "noise": 9, + "offset": -0.29, + "persistence": 0.5, + "scale_x": 33, + "scale_y": 11 + }, + "seed_int": 2286710528, + "type": "fbm2" + }, + { + "name": "colorize", + "node_position": { + "x": -588.617126, + "y": -194.049042 + }, + "parameters": { + "gradient": { + "interpolation": 1, + "points": [ + { + "a": 1, + "b": 0.031693, + "g": 0.117952, + "pos": 0.307692, + "r": 0.261719 + }, + { + "a": 1, + "b": 0.127655, + "g": 0.20245, + "pos": 0.640885, + "r": 0.347656 + }, + { + "a": 1, + "b": 0.234985, + "g": 0.321144, + "pos": 0.81625, + "r": 0.429688 + } + ], + "type": "Gradient" + } + }, + "seed_int": 0, + "type": "colorize" + }, + { + "name": "normal_map2", + "node_position": { + "x": -569.059753, + "y": 94.181038 + }, + "parameters": { + "buffer": 1, + "param2": 0, + "size": 10, + "strength": 0.01 + }, + "seed_int": 0, + "type": "normal_map2" + }, + { + "name": "math_2", + "node_position": { + "x": -719.059753, + "y": -78.346741 + }, + "parameters": { + "clamp": false, + "default_in1": 0, + "default_in2": 0.4, + "op": 2 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "math", + "node_position": { + "x": -511.420837, + "y": -76.957855 + }, + "parameters": { + "clamp": true, + "default_in1": 0, + "default_in2": 0.54, + "op": 0 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "fbm2_2", + "node_position": { + "x": -1524.254761, + "y": -291.327667 + }, + "parameters": { + "folds": 0, + "iterations": 1, + "noise": 9, + "offset": -0.29, + "persistence": 0.5, + "scale_x": 440, + "scale_y": 32 + }, + "seed_int": 1364257280, + "type": "fbm2" + }, + { + "name": "math_3", + "node_position": { + "x": -1233.410522, + "y": -105.440308 + }, + "parameters": { + "clamp": false, + "default_in1": 0, + "default_in2": 0, + "op": 0 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "math_4", + "node_position": { + "x": -1004.905396, + "y": -115.8423 + }, + "parameters": { + "clamp": false, + "default_in1": 0, + "default_in2": 2, + "op": 3 + }, + "seed_int": 0, + "type": "math" + } + ], + "parameters": { + + }, + "seed_int": 0, + "shortdesc": "", + "type": "graph" +} \ No newline at end of file diff --git a/assets/models/weapons/rifle.blend b/assets/models/weapons/rifle.blend index 920e2edd..cf74f5c7 100644 Binary files a/assets/models/weapons/rifle.blend and b/assets/models/weapons/rifle.blend differ diff --git a/assets/models/weapons/rifle.blend1 b/assets/models/weapons/rifle.blend1 index 7bf8740f..ace2e9ae 100644 Binary files a/assets/models/weapons/rifle.blend1 and b/assets/models/weapons/rifle.blend1 differ diff --git a/project/assets/materials/weapons/arms.tres b/project/assets/materials/weapons/arms.tres index 32c546c6..64cf0afc 100644 --- a/project/assets/materials/weapons/arms.tres +++ b/project/assets/materials/weapons/arms.tres @@ -6,6 +6,4 @@ cull_mode = 2 albedo_color = Color(0.9063318, 0.9063318, 0.9063318, 1) roughness = 0.5 use_z_clip_scale = true -z_clip_scale = 0.2 -fov_override = 50.0 -stencil_flags = 2 +z_clip_scale = 0.1 diff --git a/project/assets/materials/weapons/metal.tres b/project/assets/materials/weapons/metal.tres new file mode 100644 index 00000000..1e48dbab --- /dev/null +++ b/project/assets/materials/weapons/metal.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cey2t4uje80f3"] + +[ext_resource type="Texture2D" uid="uid://bfk5amosuiriq" path="res://assets/textures/metal/metal_albedo.png" id="1_7pld1"] +[ext_resource type="Texture2D" uid="uid://b2uh6cnh7e1xr" path="res://assets/textures/metal/metal_normal.png" id="2_vujp3"] + +[resource] +resource_name = "metal" +cull_mode = 2 +albedo_texture = ExtResource("1_7pld1") +metallic = 0.98 +metallic_specular = 0.85 +roughness = 0.48 +normal_enabled = true +normal_texture = ExtResource("2_vujp3") +use_z_clip_scale = true +z_clip_scale = 0.1 diff --git a/project/assets/materials/weapons/rifle.tres b/project/assets/materials/weapons/rifle.tres deleted file mode 100644 index d2853391..00000000 --- a/project/assets/materials/weapons/rifle.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://56reb3m4e6fd"] - -[ext_resource type="Texture2D" uid="uid://48j7riad4n6g" path="res://assets/models/weapons/rifle_lee_enfield.jpg" id="1_eg0kj"] - -[resource] -resource_name = "rifle" -cull_mode = 2 -albedo_texture = ExtResource("1_eg0kj") -metallic = 0.29381442 -roughness = 0.6443299 -use_z_clip_scale = true -z_clip_scale = 0.2 -fov_override = 50.0 diff --git a/project/assets/materials/weapons/wood.tres b/project/assets/materials/weapons/wood.tres new file mode 100644 index 00000000..af8c568d --- /dev/null +++ b/project/assets/materials/weapons/wood.tres @@ -0,0 +1,19 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bvy3xngb287wd"] + +[ext_resource type="Texture2D" uid="uid://dstrf0oxck5by" path="res://assets/textures/woodgrain/woodgrain_albedo.png" id="1_4wqgt"] +[ext_resource type="Texture2D" uid="uid://celwjqrlb4cdv" path="res://assets/textures/woodgrain/woodgrain_rough.exr" id="2_o8vs7"] +[ext_resource type="Texture2D" uid="uid://doix25s0krepr" path="res://assets/textures/woodgrain/woodgrain_normal.png" id="3_elfj7"] + +[resource] +resource_name = "wood" +cull_mode = 2 +albedo_texture = ExtResource("1_4wqgt") +metallic = 1.0 +metallic_texture = ExtResource("2_o8vs7") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_o8vs7") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_elfj7") +use_z_clip_scale = true +z_clip_scale = 0.1 diff --git a/project/assets/models/weapons/rifle.blend b/project/assets/models/weapons/rifle.blend new file mode 100644 index 00000000..b76f6f38 Binary files /dev/null and b/project/assets/models/weapons/rifle.blend differ diff --git a/project/assets/models/weapons/rifle.blend.import b/project/assets/models/weapons/rifle.blend.import new file mode 100644 index 00000000..142dc565 --- /dev/null +++ b/project/assets/models/weapons/rifle.blend.import @@ -0,0 +1,77 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bodfxp36t6v36" +path="res://.godot/imported/rifle.blend-14798bc6ebcedec88609ba3fc12be686.scn" + +[deps] + +source_file="res://assets/models/weapons/rifle.blend" +dest_files=["res://.godot/imported/rifle.blend-14798bc6ebcedec88609ba3fc12be686.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": { +"arms": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/materials/weapons/arms.tres", +"use_external/path": "uid://dgl8ygpyta7b0" +}, +"metal": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/materials/weapons/metal.tres", +"use_external/path": "uid://cey2t4uje80f3" +}, +"wood": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/materials/weapons/wood.tres", +"use_external/path": "uid://bvy3xngb287wd" +} +} +} +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/project/assets/models/weapons/rifle.blend1 b/project/assets/models/weapons/rifle.blend1 index 7f240b73..2ac9a4c8 100644 Binary files a/project/assets/models/weapons/rifle.blend1 and b/project/assets/models/weapons/rifle.blend1 differ diff --git a/project/assets/models/weapons/rifle.glb b/project/assets/models/weapons/rifle.glb deleted file mode 100644 index 7d41fd8d..00000000 Binary files a/project/assets/models/weapons/rifle.glb and /dev/null differ diff --git a/project/assets/models/weapons/rifle.glb.import b/project/assets/models/weapons/rifle.glb.import deleted file mode 100644 index 554c1136..00000000 --- a/project/assets/models/weapons/rifle.glb.import +++ /dev/null @@ -1,55 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://c8jbxkm1paa8u" -path="res://.godot/imported/rifle.glb-7e791117157b5204625fa46cea3758ea.scn" - -[deps] - -source_file="res://assets/models/weapons/rifle.glb" -dest_files=["res://.godot/imported/rifle.glb-7e791117157b5204625fa46cea3758ea.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=1 -materials/extract_format=0 -materials/extract_path="res://assets/materials/weapons" -_subresources={ -"materials": { -"arms": { -"use_external/enabled": true, -"use_external/fallback_path": "res://assets/materials/weapons/arms.tres", -"use_external/path": "uid://dgl8ygpyta7b0" -}, -"rifle": { -"use_external/enabled": true, -"use_external/fallback_path": "res://assets/materials/weapons/rifle.tres", -"use_external/path": "uid://56reb3m4e6fd" -} -} -} -gltf/naming_version=1 -gltf/embedded_image_handling=1 diff --git a/project/assets/models/weapons/rifle_lee_enfield.jpg b/project/assets/models/weapons/rifle_lee_enfield.jpg deleted file mode 100644 index 1d5d6d11..00000000 Binary files a/project/assets/models/weapons/rifle_lee_enfield.jpg and /dev/null differ diff --git a/project/assets/textures/metal/metal_albedo.png b/project/assets/textures/metal/metal_albedo.png new file mode 100644 index 00000000..18341342 Binary files /dev/null and b/project/assets/textures/metal/metal_albedo.png differ diff --git a/project/assets/models/weapons/rifle_lee_enfield.jpg.import b/project/assets/textures/metal/metal_albedo.png.import similarity index 67% rename from project/assets/models/weapons/rifle_lee_enfield.jpg.import rename to project/assets/textures/metal/metal_albedo.png.import index 2cd47e38..a65051f8 100644 --- a/project/assets/models/weapons/rifle_lee_enfield.jpg.import +++ b/project/assets/textures/metal/metal_albedo.png.import @@ -2,20 +2,17 @@ importer="texture" type="CompressedTexture2D" -uid="uid://48j7riad4n6g" -path.s3tc="res://.godot/imported/rifle_lee_enfield.jpg-3d7c7612e94a4e73effbe000ea16a19a.s3tc.ctex" +uid="uid://bfk5amosuiriq" +path.s3tc="res://.godot/imported/metal_albedo.png-20be0dd630117143fd050711aa1a1740.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true } -generator_parameters={ -"md5": "089dd972f5e3dfeee508b839c59d2347" -} [deps] -source_file="res://assets/models/weapons/rifle_lee_enfield.jpg" -dest_files=["res://.godot/imported/rifle_lee_enfield.jpg-3d7c7612e94a4e73effbe000ea16a19a.s3tc.ctex"] +source_file="res://assets/textures/metal/metal_albedo.png" +dest_files=["res://.godot/imported/metal_albedo.png-20be0dd630117143fd050711aa1a1740.s3tc.ctex"] [params] diff --git a/project/assets/textures/metal/metal_normal.png b/project/assets/textures/metal/metal_normal.png new file mode 100644 index 00000000..4ba02a77 Binary files /dev/null and b/project/assets/textures/metal/metal_normal.png differ diff --git a/project/assets/textures/metal/metal_normal.png.import b/project/assets/textures/metal/metal_normal.png.import new file mode 100644 index 00000000..2ea76de0 --- /dev/null +++ b/project/assets/textures/metal/metal_normal.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2uh6cnh7e1xr" +path.s3tc="res://.godot/imported/metal_normal.png-f9b5f97999979a27faee5f0953fcc26a.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/metal/metal_normal.png" +dest_files=["res://.godot/imported/metal_normal.png-f9b5f97999979a27faee5f0953fcc26a.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=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/metal/metal_normal.png" +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/project/assets/textures/woodgrain/woodgrain_albedo.png b/project/assets/textures/woodgrain/woodgrain_albedo.png new file mode 100644 index 00000000..62aee700 Binary files /dev/null and b/project/assets/textures/woodgrain/woodgrain_albedo.png differ diff --git a/project/assets/textures/woodgrain/woodgrain_albedo.png.import b/project/assets/textures/woodgrain/woodgrain_albedo.png.import new file mode 100644 index 00000000..9e8630d8 --- /dev/null +++ b/project/assets/textures/woodgrain/woodgrain_albedo.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dstrf0oxck5by" +path.s3tc="res://.godot/imported/woodgrain_albedo.png-750f70e1e84a30aced10854454e1255d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/woodgrain/woodgrain_albedo.png" +dest_files=["res://.godot/imported/woodgrain_albedo.png-750f70e1e84a30aced10854454e1255d.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/project/assets/textures/woodgrain/woodgrain_metal.exr b/project/assets/textures/woodgrain/woodgrain_metal.exr new file mode 100644 index 00000000..d2d1ec78 Binary files /dev/null and b/project/assets/textures/woodgrain/woodgrain_metal.exr differ diff --git a/project/assets/textures/woodgrain/woodgrain_metal.exr.import b/project/assets/textures/woodgrain/woodgrain_metal.exr.import new file mode 100644 index 00000000..ab001b4b --- /dev/null +++ b/project/assets/textures/woodgrain/woodgrain_metal.exr.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c58s4rk8bnwhe" +path="res://.godot/imported/woodgrain_metal.exr-4e059ee7fe23db91f18cb62260fc30f7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/woodgrain/woodgrain_metal.exr" +dest_files=["res://.godot/imported/woodgrain_metal.exr-4e059ee7fe23db91f18cb62260fc30f7.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/project/assets/textures/woodgrain/woodgrain_normal.png b/project/assets/textures/woodgrain/woodgrain_normal.png new file mode 100644 index 00000000..c030f4b2 Binary files /dev/null and b/project/assets/textures/woodgrain/woodgrain_normal.png differ diff --git a/project/assets/textures/woodgrain/woodgrain_normal.png.import b/project/assets/textures/woodgrain/woodgrain_normal.png.import new file mode 100644 index 00000000..3bfc7919 --- /dev/null +++ b/project/assets/textures/woodgrain/woodgrain_normal.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://doix25s0krepr" +path.s3tc="res://.godot/imported/woodgrain_normal.png-307903992e88c9a2cbeed193acaf9481.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/woodgrain/woodgrain_normal.png" +dest_files=["res://.godot/imported/woodgrain_normal.png-307903992e88c9a2cbeed193acaf9481.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=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/woodgrain/woodgrain_normal.png" +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/project/assets/textures/woodgrain/woodgrain_rough.exr b/project/assets/textures/woodgrain/woodgrain_rough.exr new file mode 100644 index 00000000..d2d1ec78 Binary files /dev/null and b/project/assets/textures/woodgrain/woodgrain_rough.exr differ diff --git a/project/assets/textures/woodgrain/woodgrain_rough.exr.import b/project/assets/textures/woodgrain/woodgrain_rough.exr.import new file mode 100644 index 00000000..98c2aaac --- /dev/null +++ b/project/assets/textures/woodgrain/woodgrain_rough.exr.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://celwjqrlb4cdv" +path.bptc="res://.godot/imported/woodgrain_rough.exr-c0d9b7d4bbe138dfb750e030a31a8155.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/woodgrain/woodgrain_rough.exr" +dest_files=["res://.godot/imported/woodgrain_rough.exr-c0d9b7d4bbe138dfb750e030a31a8155.bptc.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/project/maps/industrial_area_map.tscn b/project/maps/industrial_area_map.tscn index 18442045..9ff3a98e 100644 --- a/project/maps/industrial_area_map.tscn +++ b/project/maps/industrial_area_map.tscn @@ -403,6 +403,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.56762, -2.2319336, 71.1054 operation = 2 size = Vector3(98.4565, 5.463867, 39.458916) +[node name="CSGBox3D9" type="CSGBox3D" parent="Terrain"] +transform = Transform3D(0.90530956, 0, 0.4247525, 0, 1, 0, -0.4247525, 0, 0.90530956, 58.50878, -2.2319298, 58.448696) +operation = 2 +size = Vector3(40.76953, 5.463867, 39.458916) + [node name="CSGBox3D4" type="CSGBox3D" parent="Terrain"] transform = Transform3D(1, 0, 0, 0, 0.7289446, -0.6845726, 0, 0.6845726, 0.7289446, -2.95533, 1.3600307, 55.553867) operation = 2 diff --git a/project/objects/weapons/rifle.tscn b/project/objects/weapons/rifle.tscn index 25b94677..e13fa75b 100644 --- a/project/objects/weapons/rifle.tscn +++ b/project/objects/weapons/rifle.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://ce40pq785yoyi"] -[ext_resource type="PackedScene" uid="uid://c8jbxkm1paa8u" path="res://assets/models/weapons/rifle.glb" id="1_afgyw"] +[ext_resource type="PackedScene" uid="uid://bodfxp36t6v36" path="res://assets/models/weapons/rifle.blend" id="1_afgyw"] [node name="Rifle" type="Rifle" node_paths=PackedStringArray("anim")] anim = NodePath("rifle/AnimationPlayer")