diff --git a/assets/materials/bullet_impact.ptex b/assets/materials/bullet_impact.ptex index dc2e83c7..4f12500f 100644 --- a/assets/materials/bullet_impact.ptex +++ b/assets/materials/bullet_impact.ptex @@ -1,23 +1,11 @@ { "connections": [ - { - "from": "shape_3", - "from_port": 0, - "to": "rotate", - "to_port": 0 - }, { "from": "shape", "from_port": 0, "to": "colorize", "to_port": 0 }, - { - "from": "colorize", - "from_port": 0, - "to": "blend2", - "to_port": 1 - }, { "from": "uniform", "from_port": 0, @@ -30,42 +18,6 @@ "to": "blend2_2", "to_port": 1 }, - { - "from": "shape_2", - "from_port": 0, - "to": "rotate_2", - "to_port": 0 - }, - { - "from": "blend2_2", - "from_port": 0, - "to": "blend2", - "to_port": 0 - }, - { - "from": "rotate", - "from_port": 0, - "to": "math", - "to_port": 0 - }, - { - "from": "rotate_2", - "from_port": 0, - "to": "math", - "to_port": 1 - }, - { - "from": "math", - "from_port": 0, - "to": "blend2_2", - "to_port": 2 - }, - { - "from": "blend2", - "from_port": 0, - "to": "Material", - "to_port": 0 - }, { "from": "normal_map2", "from_port": 0, @@ -96,19 +48,61 @@ "to": "normal_map2", "to_port": 0 }, + { + "from": "shape_5", + "from_port": 0, + "to": "math", + "to_port": 0 + }, + { + "from": "fbm4", + "from_port": 0, + "to": "math", + "to_port": 1 + }, { "from": "math", "from_port": 0, + "to": "tones_step", + "to_port": 0 + }, + { + "from": "tones_step", + "from_port": 0, + "to": "blend2_2", + "to_port": 2 + }, + { + "from": "math", + "from_port": 0, + "to": "math_4", + "to_port": 0 + }, + { + "from": "shape", + "from_port": 0, + "to": "math_4", + "to_port": 1 + }, + { + "from": "math_4", + "from_port": 0, "to": "Material", "to_port": 7 + }, + { + "from": "blend2_2", + "from_port": 0, + "to": "Material", + "to_port": 0 } ], "label": "Graph", "longdesc": "", - "name": "@@369", + "name": "__369", "node_position": { - "x": 0, - "y": 0 + "x": 0.0, + "y": 0.0 }, "nodes": [ { @@ -119,26 +113,26 @@ }, "name": "Material", "node_position": { - "x": 35, - "y": 206 + "x": 35.0, + "y": 206.0 }, "parameters": { "albedo_color": { - "a": 1, - "b": 1, - "g": 1, - "r": 1, + "a": 1.0, + "b": 1.0, + "g": 1.0, + "r": 1.0, "type": "Color" }, - "ao": 1, + "ao": 1.0, "depth_scale": 0.5, - "emission_energy": 1, + "emission_energy": 1.0, "flags_transparent": true, - "metallic": 0, - "normal": 1, - "roughness": 1, - "size": 11, - "sss": 1 + "metallic": 0.0, + "normal": 1.0, + "roughness": 1.0, + "size": 11.0, + "sss": 1.0 }, "seed_int": 0, "type": "material" @@ -146,62 +140,32 @@ { "name": "shape", "node_position": { - "x": -884, - "y": 617 + "x": -884.0, + "y": 617.0 }, "parameters": { - "edge": 0.52, - "radius": 0.57, - "shape": 0, - "sides": 6 + "edge": 0.69, + "radius": 0.54, + "shape": 0.0, + "sides": 6.0 }, "seed_int": 0, "type": "shape" }, - { - "name": "shape_3", - "node_position": { - "x": -1354, - "y": 458 - }, - "parameters": { - "edge": 0.13, - "radius": 0.49, - "shape": 2, - "sides": 7 - }, - "seed_int": 0, - "type": "shape" - }, - { - "generic_size": 1, - "name": "rotate", - "node_position": { - "x": -1203, - "y": 461 - }, - "parameters": { - "cx": 0, - "cy": 0, - "rotate": -112.325 - }, - "seed_int": 0, - "type": "rotate" - }, { "name": "fbm2", "node_position": { - "x": -962, - "y": 231 + "x": -1161.09094238281, + "y": 157.363647460938 }, "parameters": { - "folds": 0, - "iterations": 8, - "noise": 1, - "offset": 0, - "persistence": 1, - "scale_x": 1, - "scale_y": 1 + "folds": 0.0, + "iterations": 8.0, + "noise": 1.0, + "offset": 0.0, + "persistence": 1.0, + "scale_x": 1.0, + "scale_y": 1.0 }, "seed_int": 453903360, "type": "fbm2" @@ -209,26 +173,26 @@ { "name": "colorize", "node_position": { - "x": -638, - "y": 321 + "x": -619.326904296875, + "y": 349.070281982422 }, "parameters": { "gradient": { "interpolation": 1, "points": [ { - "a": 0, - "b": 0, - "g": 0, - "pos": 0, - "r": 0 + "a": 0.0, + "b": 0.0, + "g": 0.0, + "pos": 0.0, + "r": 0.0 }, { - "a": 1, - "b": 0, - "g": 0, - "pos": 1, - "r": 0 + "a": 1.0, + "b": 0.453125, + "g": 0.453125, + "pos": 1.0, + "r": 0.453125 } ], "type": "Gradient" @@ -237,30 +201,16 @@ "seed_int": 0, "type": "colorize" }, - { - "generic_size": 1, - "name": "blend2", - "node_position": { - "x": -413, - "y": 205 - }, - "parameters": { - "amount1": 1, - "blend_type1": 0 - }, - "seed_int": 0, - "type": "blend2" - }, { "generic_size": 1, "name": "blend2_2", "node_position": { - "x": -691, - "y": 205 + "x": -612.5, + "y": 189.0 }, "parameters": { - "amount1": 1, - "blend_type1": 0 + "amount1": 1.0, + "blend_type1": 0.0 }, "seed_int": 0, "type": "blend2" @@ -268,62 +218,32 @@ { "name": "uniform", "node_position": { - "x": -689, - "y": 139 + "x": -874.454528808594, + "y": 62.6363716125488 }, "parameters": { "color": { - "a": 0, - "b": 0, - "g": 0, - "r": 0, + "a": 0.0, + "b": 0.0, + "g": 0.0, + "r": 0.0, "type": "Color" } }, "seed_int": 0, "type": "uniform" }, - { - "name": "shape_2", - "node_position": { - "x": -1355.388916, - "y": 601.694458 - }, - "parameters": { - "edge": 0.12, - "radius": 0.49, - "shape": 2, - "sides": 8 - }, - "seed_int": 0, - "type": "shape" - }, - { - "generic_size": 1, - "name": "rotate_2", - "node_position": { - "x": -1198.5, - "y": 580 - }, - "parameters": { - "cx": 0, - "cy": 0, - "rotate": -89.08 - }, - "seed_int": 0, - "type": "rotate" - }, { "name": "math", "node_position": { - "x": -939, - "y": 455 + "x": -1261.30004882812, + "y": 448.399993896484 }, "parameters": { "clamp": false, - "default_in1": 0, - "default_in2": 0, - "op": 2 + "default_in1": 0.0, + "default_in2": 0.0, + "op": 1 }, "seed_int": 0, "type": "math" @@ -331,14 +251,14 @@ { "name": "normal_map2", "node_position": { - "x": -221.561737, - "y": 545.807861 + "x": -221.561737060547, + "y": 545.807861328125 }, "parameters": { - "buffer": 1, - "param2": 0, - "size": 10, - "strength": 1 + "buffer": 1.0, + "param2": 0.0, + "size": 10.0, + "strength": 1.0 }, "seed_int": 0, "type": "normal_map2" @@ -346,14 +266,14 @@ { "name": "shape_4", "node_position": { - "x": -881.154663, - "y": 762.272461 + "x": -881.154663085938, + "y": 762.2724609375 }, "parameters": { "edge": 1.1, "radius": 0.51, - "shape": 0, - "sides": 6 + "shape": 0.0, + "sides": 6.0 }, "seed_int": 0, "type": "shape" @@ -361,14 +281,14 @@ { "name": "math_2", "node_position": { - "x": -702.654663, - "y": 738.272461 + "x": -702.654663085938, + "y": 738.2724609375 }, "parameters": { "clamp": false, - "default_in1": 0, + "default_in1": 0.0, "default_in2": 0.71, - "op": 6 + "op": 6.0 }, "seed_int": 0, "type": "math" @@ -376,14 +296,77 @@ { "name": "math_3", "node_position": { - "x": -447.654663, - "y": 549.272461 + "x": -447.654663085938, + "y": 549.2724609375 }, "parameters": { "clamp": true, - "default_in1": 0, - "default_in2": 0, - "op": 1 + "default_in1": 0.0, + "default_in2": 0.0, + "op": 1.0 + }, + "seed_int": 0, + "type": "math" + }, + { + "name": "shape_5", + "node_position": { + "x": -1481.72143554688, + "y": 345.668853759766 + }, + "parameters": { + "edge": 0.46, + "radius": 0.81, + "shape": 0.0, + "sides": 2.0 + }, + "seed_int": 0, + "type": "shape" + }, + { + "name": "fbm4", + "node_position": { + "x": -1513.64855957031, + "y": 593.0234375 + }, + "parameters": { + "folds": 0.0, + "iterations": 5.0, + "lacunarity": 2.0, + "noise": 12, + "offset": 0.0, + "persistence": 0.5, + "scale_x": 5.0, + "scale_y": 5.0 + }, + "seed_int": 1553869440, + "type": "fbm4" + }, + { + "name": "tones_step", + "node_position": { + "x": -977.348510742188, + "y": 384.023406982422 + }, + "parameters": { + "invert": false, + "value": 0.26, + "width": 0.3 + }, + "seed_int": 0, + "type": "tones_step" + }, + { + "name": "math_4", + "node_position": { + "x": -306.172393798828, + "y": 379.6630859375 + }, + "parameters": { + "clamp": true, + "default_in1": 0.0, + "default_in2": 0.0, + "op": 0.0 }, "seed_int": 0, "type": "math" diff --git a/assets/materials/bullet_impact.ptex.mmcr b/assets/materials/bullet_impact.ptex.mmcr new file mode 100644 index 00000000..405b40eb --- /dev/null +++ b/assets/materials/bullet_impact.ptex.mmcr @@ -0,0 +1 @@ +{"connections":[{"from":"shape","from_port":0,"to":"colorize","to_port":0},{"from":"uniform","from_port":0,"to":"blend2_2","to_port":0},{"from":"fbm2","from_port":0,"to":"blend2_2","to_port":1},{"from":"normal_map2","from_port":0,"to":"Material","to_port":4},{"from":"shape_4","from_port":0,"to":"math_2","to_port":0},{"from":"fbm2","from_port":0,"to":"math_3","to_port":0},{"from":"math_2","from_port":0,"to":"math_3","to_port":1},{"from":"math_3","from_port":0,"to":"normal_map2","to_port":0},{"from":"shape_5","from_port":0,"to":"math","to_port":0},{"from":"fbm4","from_port":0,"to":"math","to_port":1},{"from":"math","from_port":0,"to":"tones_step","to_port":0},{"from":"tones_step","from_port":0,"to":"blend2_2","to_port":2},{"from":"math","from_port":0,"to":"math_4","to_port":0},{"from":"shape","from_port":0,"to":"math_4","to_port":1},{"from":"math_4","from_port":0,"to":"Material","to_port":7},{"from":"blend2_2","from_port":0,"to":"Material","to_port":0}],"label":"Graph","longdesc":"","name":"__369","node_position":{"x":0.0,"y":0.0},"nodes":[{"export_last_target":"Blender","export_paths":{"Blender":"/home/sara/Documents/gd-projects/wave-survival-fps/project/assets/materials/effects/bullet_impact","Godot/Godot 4 Standard":"/home/sara/Documents/gd-projects/wave-survival-fps/project/assets/materials/bullet_impact"},"name":"Material","node_position":{"x":35.0,"y":206.0},"parameters":{"albedo_color":{"a":1.0,"b":1.0,"g":1.0,"r":1.0,"type":"Color"},"ao":1.0,"depth_scale":0.5,"emission_energy":1.0,"flags_transparent":true,"metallic":0.0,"normal":1.0,"roughness":1.0,"size":11.0,"sss":1.0},"seed_int":0,"type":"material"},{"name":"shape","node_position":{"x":-884.0,"y":617.0},"parameters":{"edge":0.69,"radius":0.54,"shape":0.0,"sides":6.0},"seed_int":0,"type":"shape"},{"name":"fbm2","node_position":{"x":-1161.09094238281,"y":157.363647460938},"parameters":{"folds":0.0,"iterations":8.0,"noise":1.0,"offset":0.0,"persistence":1.0,"scale_x":1.0,"scale_y":1.0},"seed_int":453903360,"type":"fbm2"},{"name":"colorize","node_position":{"x":-619.326904296875,"y":349.070281982422},"parameters":{"gradient":{"interpolation":1,"points":[{"a":0.0,"b":0.0,"g":0.0,"pos":0.0,"r":0.0},{"a":1.0,"b":0.453125,"g":0.453125,"pos":1.0,"r":0.453125}],"type":"Gradient"}},"seed_int":0,"type":"colorize"},{"generic_size":1,"name":"blend2_2","node_position":{"x":-612.5,"y":189.0},"parameters":{"amount1":1.0,"blend_type1":0.0},"seed_int":0,"type":"blend2"},{"name":"uniform","node_position":{"x":-874.454528808594,"y":62.6363716125488},"parameters":{"color":{"a":0.0,"b":0.0,"g":0.0,"r":0.0,"type":"Color"}},"seed_int":0,"type":"uniform"},{"name":"math","node_position":{"x":-1261.30004882812,"y":448.399993896484},"parameters":{"clamp":false,"default_in1":0.0,"default_in2":0.0,"op":1},"seed_int":0,"type":"math"},{"name":"normal_map2","node_position":{"x":-221.561737060547,"y":545.807861328125},"parameters":{"buffer":1.0,"param2":0.0,"size":10.0,"strength":1.0},"seed_int":0,"type":"normal_map2"},{"name":"shape_4","node_position":{"x":-881.154663085938,"y":762.2724609375},"parameters":{"edge":1.1,"radius":0.51,"shape":0.0,"sides":6.0},"seed_int":0,"type":"shape"},{"name":"math_2","node_position":{"x":-702.654663085938,"y":738.2724609375},"parameters":{"clamp":false,"default_in1":0.0,"default_in2":0.71,"op":6.0},"seed_int":0,"type":"math"},{"name":"math_3","node_position":{"x":-447.654663085938,"y":549.2724609375},"parameters":{"clamp":true,"default_in1":0.0,"default_in2":0.0,"op":1.0},"seed_int":0,"type":"math"},{"name":"shape_5","node_position":{"x":-1481.72143554688,"y":345.668853759766},"parameters":{"edge":0.46,"radius":0.81,"shape":0.0,"sides":2.0},"seed_int":0,"type":"shape"},{"name":"fbm4","node_position":{"x":-1513.64855957031,"y":593.0234375},"parameters":{"folds":0.0,"iterations":5.0,"lacunarity":2.0,"noise":12,"offset":0.0,"persistence":0.5,"scale_x":5.0,"scale_y":5.0},"seed_int":1553869440,"type":"fbm4"},{"name":"tones_step","node_position":{"x":-977.348510742188,"y":384.023406982422},"parameters":{"invert":false,"value":0.26,"width":0.3},"seed_int":0,"type":"tones_step"},{"name":"math_4","node_position":{"x":-306.172393798828,"y":379.6630859375},"parameters":{"clamp":true,"default_in1":0.0,"default_in2":0.0,"op":0.0},"seed_int":0,"type":"math"}],"parameters":{},"seed_int":0,"shortdesc":"","type":"graph"} \ No newline at end of file diff --git a/project/assets/materials/environment/artificial/stone_brick.tres b/project/assets/materials/environment/artificial/stone_brick.tres new file mode 100644 index 00000000..38eeba81 --- /dev/null +++ b/project/assets/materials/environment/artificial/stone_brick.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://dyfnk7scn5y77"] + +[ext_resource type="Texture2D" uid="uid://8016yerrvk5j" path="res://assets/materials/environment/artificial/stone_brick_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cerk85l315h85" path="res://assets/materials/environment/artificial/stone_brick_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://cawrtw3bjcbpq" path="res://assets/materials/environment/artificial/stone_brick_heightmap.png" id="4"] + +[resource] +albedo_texture = ExtResource("1") +normal_enabled = true +normal_texture = ExtResource("3") +heightmap_enabled = true +heightmap_scale = 12.5 +heightmap_deep_parallax = true +heightmap_min_layers = 8 +heightmap_max_layers = 32 +heightmap_texture = ExtResource("4") diff --git a/project/assets/materials/environment/artificial/stone_brick_albedo.png b/project/assets/materials/environment/artificial/stone_brick_albedo.png new file mode 100644 index 00000000..9ca51bc2 Binary files /dev/null and b/project/assets/materials/environment/artificial/stone_brick_albedo.png differ diff --git a/project/assets/materials/environment/artificial/stone_brick_albedo.png.import b/project/assets/materials/environment/artificial/stone_brick_albedo.png.import new file mode 100644 index 00000000..977c4cf9 --- /dev/null +++ b/project/assets/materials/environment/artificial/stone_brick_albedo.png.import @@ -0,0 +1,42 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8016yerrvk5j" +path.s3tc="res://.godot/imported/stone_brick_albedo.png-cffb199f4fadce43b8810ec3a37b2bd7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/environment/artificial/stone_brick_albedo.png" +dest_files=["res://.godot/imported/stone_brick_albedo.png-cffb199f4fadce43b8810ec3a37b2bd7.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/high_quality_mode=0 +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/materials/environment/artificial/stone_brick_heightmap.png b/project/assets/materials/environment/artificial/stone_brick_heightmap.png new file mode 100644 index 00000000..196e34e0 Binary files /dev/null and b/project/assets/materials/environment/artificial/stone_brick_heightmap.png differ diff --git a/project/assets/materials/environment/artificial/stone_brick_heightmap.png.import b/project/assets/materials/environment/artificial/stone_brick_heightmap.png.import new file mode 100644 index 00000000..2ed979fa --- /dev/null +++ b/project/assets/materials/environment/artificial/stone_brick_heightmap.png.import @@ -0,0 +1,42 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cawrtw3bjcbpq" +path.s3tc="res://.godot/imported/stone_brick_heightmap.png-441fe768b32ddd37a9ff2baa90d63414.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/environment/artificial/stone_brick_heightmap.png" +dest_files=["res://.godot/imported/stone_brick_heightmap.png-441fe768b32ddd37a9ff2baa90d63414.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/high_quality_mode=0 +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=7 +roughness/src_normal="res://assets/materials/environment/artificial/stone_brick_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/materials/environment/artificial/stone_brick_normal.png b/project/assets/materials/environment/artificial/stone_brick_normal.png new file mode 100644 index 00000000..1f0fc6ca Binary files /dev/null and b/project/assets/materials/environment/artificial/stone_brick_normal.png differ diff --git a/project/assets/materials/environment/artificial/stone_brick_normal.png.import b/project/assets/materials/environment/artificial/stone_brick_normal.png.import new file mode 100644 index 00000000..d5364dca --- /dev/null +++ b/project/assets/materials/environment/artificial/stone_brick_normal.png.import @@ -0,0 +1,42 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cerk85l315h85" +path.s3tc="res://.godot/imported/stone_brick_normal.png-bc3d2ef610e57a22d6bdafe07a480935.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/environment/artificial/stone_brick_normal.png" +dest_files=["res://.godot/imported/stone_brick_normal.png-bc3d2ef610e57a22d6bdafe07a480935.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/high_quality_mode=0 +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/materials/environment/artificial/stone_brick_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/models/environment/wall_2x1.blend b/project/assets/models/environment/wall_2x1.blend index 6c1989d2..6f892b95 100644 Binary files a/project/assets/models/environment/wall_2x1.blend and b/project/assets/models/environment/wall_2x1.blend differ diff --git a/project/assets/models/environment/wall_2x1.blend.import b/project/assets/models/environment/wall_2x1.blend.import index 71de356b..62cefe7b 100644 --- a/project/assets/models/environment/wall_2x1.blend.import +++ b/project/assets/models/environment/wall_2x1.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_2x1.blend-e7534a7f93b927af343e4f58a61605 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_2x1_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_2x1_wall_brick_stone_center.png.import index f1254e68..76940ef8 100644 --- a/project/assets/models/environment/wall_2x1_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_2x1_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_2x1_wall_brick_stone_center.png-12e1876e compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/models/environment/wall_2x3.blend b/project/assets/models/environment/wall_2x3.blend index 39d16bd9..a68ebf44 100644 Binary files a/project/assets/models/environment/wall_2x3.blend and b/project/assets/models/environment/wall_2x3.blend differ diff --git a/project/assets/models/environment/wall_2x3.blend.import b/project/assets/models/environment/wall_2x3.blend.import index 1179c18d..f7b34401 100644 --- a/project/assets/models/environment/wall_2x3.blend.import +++ b/project/assets/models/environment/wall_2x3.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_2x3.blend-bfb96cb602fda5056c610c29bafe8e nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -38,6 +40,13 @@ materials/extract=0 materials/extract_format=0 materials/extract_path="" _subresources={ +"materials": { +"BrickWall": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/materials/environment/artificial/stone_brick.tres", +"use_external/path": "res://assets/materials/environment/artificial/stone_brick.tres" +} +}, "nodes": { "PATH:Wall2x3": { "physics/layer": 3, @@ -51,7 +60,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -65,3 +74,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_2x3_cracked.blend b/project/assets/models/environment/wall_2x3_cracked.blend index cfb5fb4e..95339cac 100644 Binary files a/project/assets/models/environment/wall_2x3_cracked.blend and b/project/assets/models/environment/wall_2x3_cracked.blend differ diff --git a/project/assets/models/environment/wall_2x3_cracked.blend.import b/project/assets/models/environment/wall_2x3_cracked.blend.import index 61ead596..7613fb57 100644 --- a/project/assets/models/environment/wall_2x3_cracked.blend.import +++ b/project/assets/models/environment/wall_2x3_cracked.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_2x3_cracked.blend-15a0f62b967c1731f48bc2 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_2x3_cracked_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_2x3_cracked_wall_brick_stone_center.png.import index b759cfab..f56c3a22 100644 --- a/project/assets/models/environment/wall_2x3_cracked_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_2x3_cracked_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_2x3_cracked_wall_brick_stone_center.png- compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/models/environment/wall_2x3_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_2x3_wall_brick_stone_center.png.import index e342769d..c518da2f 100644 --- a/project/assets/models/environment/wall_2x3_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_2x3_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_2x3_wall_brick_stone_center.png-24a919a6 compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/models/environment/wall_broken_left_2x1.blend b/project/assets/models/environment/wall_broken_left_2x1.blend index a495fede..885898a5 100644 Binary files a/project/assets/models/environment/wall_broken_left_2x1.blend and b/project/assets/models/environment/wall_broken_left_2x1.blend differ diff --git a/project/assets/models/environment/wall_broken_left_2x1.blend.import b/project/assets/models/environment/wall_broken_left_2x1.blend.import index 5d15bf06..56cfb897 100644 --- a/project/assets/models/environment/wall_broken_left_2x1.blend.import +++ b/project/assets/models/environment/wall_broken_left_2x1.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_broken_left_2x1.blend-81839bf1e4b95e5b39 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_broken_left_2x1_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_broken_left_2x1_wall_brick_stone_center.png.import index 145fb1d7..b51c3cfd 100644 --- a/project/assets/models/environment/wall_broken_left_2x1_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_broken_left_2x1_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_broken_left_2x1_wall_brick_stone_center. compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/models/environment/wall_top_half_slope.blend b/project/assets/models/environment/wall_top_half_slope.blend index 7c14c266..801663bd 100644 Binary files a/project/assets/models/environment/wall_top_half_slope.blend and b/project/assets/models/environment/wall_top_half_slope.blend differ diff --git a/project/assets/models/environment/wall_top_half_slope.blend.import b/project/assets/models/environment/wall_top_half_slope.blend.import index 4f82ddfc..adaafef4 100644 --- a/project/assets/models/environment/wall_top_half_slope.blend.import +++ b/project/assets/models/environment/wall_top_half_slope.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_top_half_slope.blend-cf8d005b027941ca739 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_top_half_slope_top.blend b/project/assets/models/environment/wall_top_half_slope_top.blend index b708a827..6ecb90c7 100644 Binary files a/project/assets/models/environment/wall_top_half_slope_top.blend and b/project/assets/models/environment/wall_top_half_slope_top.blend differ diff --git a/project/assets/models/environment/wall_top_half_slope_top.blend.import b/project/assets/models/environment/wall_top_half_slope_top.blend.import index 80fd1a82..2e45f9d4 100644 --- a/project/assets/models/environment/wall_top_half_slope_top.blend.import +++ b/project/assets/models/environment/wall_top_half_slope_top.blend.import @@ -16,6 +16,8 @@ dest_files=["res://.godot/imported/wall_top_half_slope_top.blend-65bf76a6782b321 nodes/root_type="" nodes/root_name="" nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -44,7 +46,7 @@ blender/nodes/punctual_lights=true blender/nodes/cameras=true blender/nodes/custom_properties=true blender/nodes/modifiers=1 -blender/meshes/colors=false +blender/meshes/vertex_colors=2 blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false @@ -58,3 +60,4 @@ blender/animation/limit_playback=true blender/animation/always_sample=true blender/animation/group_tracks=true gltf/naming_version=2 +gltf/texture_map_mode=0 diff --git a/project/assets/models/environment/wall_top_half_slope_top_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_top_half_slope_top_wall_brick_stone_center.png.import index 1e7baf40..e0c635df 100644 --- a/project/assets/models/environment/wall_top_half_slope_top_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_top_half_slope_top_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_top_half_slope_top_wall_brick_stone_cent compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/models/environment/wall_top_half_slope_wall_brick_stone_center.png.import b/project/assets/models/environment/wall_top_half_slope_wall_brick_stone_center.png.import index ec54f79d..f9e58bee 100644 --- a/project/assets/models/environment/wall_top_half_slope_wall_brick_stone_center.png.import +++ b/project/assets/models/environment/wall_top_half_slope_wall_brick_stone_center.png.import @@ -21,6 +21,7 @@ dest_files=["res://.godot/imported/wall_top_half_slope_wall_brick_stone_center.p compress/mode=2 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/textures/effects/bullet_impact_albedo.png b/project/assets/textures/effects/bullet_impact_albedo.png index fc5a4fa7..fc0db83b 100644 Binary files a/project/assets/textures/effects/bullet_impact_albedo.png and b/project/assets/textures/effects/bullet_impact_albedo.png differ diff --git a/project/assets/textures/effects/bullet_impact_albedo.png.import b/project/assets/textures/effects/bullet_impact_albedo.png.import index f30fa9b5..698c3e5d 100644 --- a/project/assets/textures/effects/bullet_impact_albedo.png.import +++ b/project/assets/textures/effects/bullet_impact_albedo.png.import @@ -17,6 +17,7 @@ dest_files=["res://.godot/imported/bullet_impact_albedo.png-a285c5d1917287b07f88 compress/mode=0 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/assets/textures/effects/bullet_impact_normal.png b/project/assets/textures/effects/bullet_impact_normal.png index 0fd1aa50..2a2bc7a3 100644 Binary files a/project/assets/textures/effects/bullet_impact_normal.png and b/project/assets/textures/effects/bullet_impact_normal.png differ diff --git a/project/assets/textures/effects/bullet_impact_normal.png.import b/project/assets/textures/effects/bullet_impact_normal.png.import index 1b970700..08d32d6d 100644 --- a/project/assets/textures/effects/bullet_impact_normal.png.import +++ b/project/assets/textures/effects/bullet_impact_normal.png.import @@ -17,6 +17,7 @@ dest_files=["res://.godot/imported/bullet_impact_normal.png-5bf99cdbe81296319f48 compress/mode=0 compress/high_quality=false +compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 diff --git a/project/maps/game.scn b/project/maps/game.scn index e6b42fe2..e57a8334 100644 Binary files a/project/maps/game.scn and b/project/maps/game.scn differ diff --git a/project/maps/industrial_area_map.scn b/project/maps/industrial_area_map.scn index cbaa211a..1579d33d 100644 Binary files a/project/maps/industrial_area_map.scn and b/project/maps/industrial_area_map.scn differ diff --git a/project/objects/buildings/maintenance_building.tscn b/project/objects/buildings/maintenance_building.tscn index 2ec13c1b..68443ccd 100644 --- a/project/objects/buildings/maintenance_building.tscn +++ b/project/objects/buildings/maintenance_building.tscn @@ -205,18 +205,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 5, 2) [node name="roof_half_slope11" parent="." unique_id=1304523768 instance=ExtResource("7_eo7g8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 5, 2) -[node name="roof_half_slope12" parent="." unique_id=1928404570 instance=ExtResource("7_eo7g8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 5, 2) +[node name="roof_half_slope14" parent="." unique_id=1881714649 instance=ExtResource("7_eo7g8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 5, 2) [node name="roof_half_slope13" parent="." unique_id=1854305347 instance=ExtResource("7_eo7g8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 5, 2) -[node name="roof_half_slope14" parent="." unique_id=1881714649 instance=ExtResource("7_eo7g8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 5, 2) - [node name="roof_half_slope15" parent="." unique_id=347633788 instance=ExtResource("7_eo7g8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 5, 2) +[node name="roof_half_slope12" parent="." unique_id=1928404570 instance=ExtResource("7_eo7g8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 5, 2) + [node name="roof_half_slope16" parent="." unique_id=621841440 instance=ExtResource("7_eo7g8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 5, 2) @@ -253,12 +253,6 @@ transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 5, 4 [node name="roof_half_slope19" parent="." unique_id=74288884 instance=ExtResource("7_eo7g8")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3, 4, -4) -[node name="roof_half_slope20" parent="." unique_id=913379909 instance=ExtResource("7_eo7g8")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 1, 4, -4) - -[node name="roof_half_slope21" parent="." unique_id=1363457159 instance=ExtResource("7_eo7g8")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1, 4, -4) - [node name="roof_half_slope22" parent="." unique_id=1354674576 instance=ExtResource("7_eo7g8")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -3, 4, -4) @@ -277,12 +271,6 @@ transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 5, 5 [node name="roof_half_slope27" parent="." unique_id=1190482605 instance=ExtResource("7_eo7g8")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3, 5, -1.9999998) -[node name="roof_half_slope28" parent="." unique_id=2124557308 instance=ExtResource("7_eo7g8")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 1, 5, -2) - -[node name="roof_half_slope29" parent="." unique_id=655401325 instance=ExtResource("7_eo7g8")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1, 5, -2) - [node name="roof_half_slope30" parent="." unique_id=1887345372 instance=ExtResource("7_eo7g8")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -3, 5, -2) diff --git a/project/objects/effects/bullet_impact.tscn b/project/objects/effects/bullet_impact.tscn index cc3a3cbf..00ff2e0b 100644 --- a/project/objects/effects/bullet_impact.tscn +++ b/project/objects/effects/bullet_impact.tscn @@ -1,11 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://me2saxnylpfa"] +[gd_scene format=3 uid="uid://me2saxnylpfa"] [ext_resource type="Texture2D" uid="uid://da2nhu26lshix" path="res://assets/textures/effects/bullet_impact_albedo.png" id="1_dkdib"] [ext_resource type="Texture2D" uid="uid://duj1snmy7lk1l" path="res://assets/textures/effects/bullet_impact_normal.png" id="2_drixv"] -[node name="BulletImpact" type="Node3D"] +[node name="BulletImpact" type="Node3D" unique_id=1787529737] -[node name="Decal" type="Decal" parent="."] +[node name="Decal" type="Decal" parent="." unique_id=1911231502] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 0, 0) size = Vector3(0.1, 0.1, 0.1) texture_albedo = ExtResource("1_dkdib") diff --git a/project/project.godot b/project/project.godot index 103515c0..bc2dd71c 100644 --- a/project/project.godot +++ b/project/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="wave_survival" run/main_scene="uid://dti7d1rslmhgp" -config/features=PackedStringArray("4.7", "Forward Plus") +config/features=PackedStringArray("4.8", "Forward Plus") run/max_fps=120 config/icon="res://icon.svg" @@ -113,6 +113,7 @@ lights_and_shadows/use_physical_light_units=true lights_and_shadows/directional_shadow/size=8192 lights_and_shadows/directional_shadow/soft_shadow_filter_quality=4 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=5 +global_illumination/gi/use_half_resolution=true global_illumination/voxel_gi/quality=1 anti_aliasing/quality/msaa_2d=1 anti_aliasing/quality/msaa_3d=2