feat: retextured and adjusted the rifle model

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

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

project/assets/materials/weapons/rifle.tres

@@ -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

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

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

project/assets/models/weapons/rifle.glb.import

@@ -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

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]
 

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

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

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

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

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

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

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")