From 55e61b6718fe5fa277876f8da443c1a7e34f6f90 Mon Sep 17 00:00:00 2001 From: Sara Date: Sat, 16 May 2026 23:08:00 +0200 Subject: [PATCH] feat: overhauled wall texture&environment colours --- .../assets/environment/walls/metro_back.blend | 4 +- .../environment/walls/metro_back.blend.import | 10 ++++- project/assets/materials/concrete.tres | 17 ++++++++ project/assets/materials/concrete_albedo.png | 3 ++ .../materials/concrete_albedo.png.import | 41 +++++++++++++++++++ project/assets/materials/concrete_normal.png | 3 ++ .../materials/concrete_normal.png.import | 41 +++++++++++++++++++ project/assets/materials/concrete_orm.png | 3 ++ .../assets/materials/concrete_orm.png.import | 41 +++++++++++++++++++ .../assets/materials/kaleidoscope_mosaic.tres | 31 ++++++-------- .../materials/kaleidoscope_mosaic_albedo.png | 4 +- .../kaleidoscope_mosaic_emission.png | 4 +- .../kaleidoscope_mosaic_heightmap.png | 4 +- .../materials/kaleidoscope_mosaic_normal.png | 4 +- .../materials/gray_concrete.tres | 16 ++++++++ .../materials/test_material_green.tres | 8 ---- .../{test_material_red.tres => tiles.tres} | 0 project/levels/core.tscn | 4 +- project/levels/station.tscn | 24 ++++++++--- project/levels/test_room.tscn | 4 +- 20 files changed, 219 insertions(+), 47 deletions(-) create mode 100644 project/assets/materials/concrete.tres create mode 100644 project/assets/materials/concrete_albedo.png create mode 100644 project/assets/materials/concrete_albedo.png.import create mode 100644 project/assets/materials/concrete_normal.png create mode 100644 project/assets/materials/concrete_normal.png.import create mode 100644 project/assets/materials/concrete_orm.png create mode 100644 project/assets/materials/concrete_orm.png.import create mode 100644 project/assets/test_materials/materials/gray_concrete.tres delete mode 100644 project/assets/test_materials/materials/test_material_green.tres rename project/assets/test_materials/materials/{test_material_red.tres => tiles.tres} (100%) diff --git a/project/assets/environment/walls/metro_back.blend b/project/assets/environment/walls/metro_back.blend index 23fdd799..d73e7fb3 100644 --- a/project/assets/environment/walls/metro_back.blend +++ b/project/assets/environment/walls/metro_back.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83aee08b555344abedd73075215f7dbf05fb052c09f9f5e338ed03c523bc7cc4 -size 95054 +oid sha256:3fe0bfe96dc549977340ee78f19318c9276e482dead0fed09cb741e0a945cc2e +size 95535 diff --git a/project/assets/environment/walls/metro_back.blend.import b/project/assets/environment/walls/metro_back.blend.import index 7ad1f73a..18078348 100644 --- a/project/assets/environment/walls/metro_back.blend.import +++ b/project/assets/environment/walls/metro_back.blend.import @@ -39,7 +39,15 @@ import_script/path="" materials/extract=0 materials/extract_format=0 materials/extract_path="" -_subresources={} +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/test_materials/materials/tiles.tres", +"use_external/path": "uid://diprpexdcxpja" +} +} +} blender/nodes/visible=0 blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true diff --git a/project/assets/materials/concrete.tres b/project/assets/materials/concrete.tres new file mode 100644 index 00000000..7c6f0238 --- /dev/null +++ b/project/assets/materials/concrete.tres @@ -0,0 +1,17 @@ +[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[ext_resource path="concrete_albedo.png" type="Texture" id=1] +[ext_resource path="concrete_orm.png" type="Texture" id=2] +[ext_resource path="concrete_normal.png" type="Texture" id=3] +[resource] +albedo_color = Color(1.0, 1.0, 1.0, 1.0) +albedo_texture = ExtResource( 1 ) +metallic = 0.0 +roughness = 1.0 +roughness_texture = ExtResource( 2 ) +roughness_texture_channel = 1 +normal_enabled = true +normal_scale = 1.0 +normal_texture = ExtResource( 3 ) + + + diff --git a/project/assets/materials/concrete_albedo.png b/project/assets/materials/concrete_albedo.png new file mode 100644 index 00000000..b055dfb3 --- /dev/null +++ b/project/assets/materials/concrete_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c7750dbb5005e3e923b4c976ad9d5781ac2ef36ff88255a34c1032bd013471d +size 904366 diff --git a/project/assets/materials/concrete_albedo.png.import b/project/assets/materials/concrete_albedo.png.import new file mode 100644 index 00000000..ce9f1fd4 --- /dev/null +++ b/project/assets/materials/concrete_albedo.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dpnptsyu3ocu7" +path.s3tc="res://.godot/imported/concrete_albedo.png-15a1127288a7a508fb3045a5b3ec6b0e.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/concrete_albedo.png" +dest_files=["res://.godot/imported/concrete_albedo.png-15a1127288a7a508fb3045a5b3ec6b0e.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/materials/concrete_normal.png b/project/assets/materials/concrete_normal.png new file mode 100644 index 00000000..5e86cbf7 --- /dev/null +++ b/project/assets/materials/concrete_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15a603c045077f42308faa05bbffd5a259e86f8358d1c9434438ee718d6bae68 +size 4346350 diff --git a/project/assets/materials/concrete_normal.png.import b/project/assets/materials/concrete_normal.png.import new file mode 100644 index 00000000..0894cc35 --- /dev/null +++ b/project/assets/materials/concrete_normal.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d13uhlvb8t1qs" +path.s3tc="res://.godot/imported/concrete_normal.png-2f21227745893f0bf57e261e33db21d9.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/concrete_normal.png" +dest_files=["res://.godot/imported/concrete_normal.png-2f21227745893f0bf57e261e33db21d9.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/materials/concrete_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/concrete_orm.png b/project/assets/materials/concrete_orm.png new file mode 100644 index 00000000..e323585f --- /dev/null +++ b/project/assets/materials/concrete_orm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c1e5e4b5e1f5b27996270de3b078ebf4760e7d4538ef90df9e3b7c65d6a4edc +size 1119276 diff --git a/project/assets/materials/concrete_orm.png.import b/project/assets/materials/concrete_orm.png.import new file mode 100644 index 00000000..83d2f8c4 --- /dev/null +++ b/project/assets/materials/concrete_orm.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://i13rlv77akwp" +path.s3tc="res://.godot/imported/concrete_orm.png-b4d8f7ddf3427d3e44747b879d1e3275.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/materials/concrete_orm.png" +dest_files=["res://.godot/imported/concrete_orm.png-b4d8f7ddf3427d3e44747b879d1e3275.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/materials/kaleidoscope_mosaic.tres b/project/assets/materials/kaleidoscope_mosaic.tres index 53e4b2aa..fec60f37 100644 --- a/project/assets/materials/kaleidoscope_mosaic.tres +++ b/project/assets/materials/kaleidoscope_mosaic.tres @@ -1,27 +1,22 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] -[ext_resource path="kaleidoscope_mosaic_albedo.png" type="Texture" id=1] -[ext_resource path="kaleidoscope_mosaic_normal.png" type="Texture" id=3] -[ext_resource path="kaleidoscope_mosaic_heightmap.png" type="Texture" id=4] -[ext_resource path="kaleidoscope_mosaic_emission.png" type="Texture" id=5] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cwydayswyairg"] + +[ext_resource type="Texture2D" uid="uid://ddaso2y8ooove" path="res://assets/materials/kaleidoscope_mosaic_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dwskfat6ut10d" path="res://assets/materials/kaleidoscope_mosaic_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://b0yi45ldkax5s" path="res://assets/materials/kaleidoscope_mosaic_heightmap.png" id="4"] +[ext_resource type="Texture2D" uid="uid://34f1swwafqoa" path="res://assets/materials/kaleidoscope_mosaic_emission.png" id="5"] + [resource] -albedo_color = Color(1.0, 1.0, 1.0, 1.0) -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 1.0 roughness = 0.19 -normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 0.03 -emission_operator = 0 -emission_texture = ExtResource( 5 ) +emission_energy_multiplier = 0.03 +emission_texture = ExtResource("5") +normal_enabled = true +normal_texture = ExtResource("3") heightmap_enabled = true heightmap_scale = 25.0 heightmap_deep_parallax = true heightmap_min_layers = 8 heightmap_max_layers = 32 -heightmap_texture = ExtResource( 4 ) - - - +heightmap_texture = ExtResource("4") diff --git a/project/assets/materials/kaleidoscope_mosaic_albedo.png b/project/assets/materials/kaleidoscope_mosaic_albedo.png index 7420008e..0a2c0db4 100644 --- a/project/assets/materials/kaleidoscope_mosaic_albedo.png +++ b/project/assets/materials/kaleidoscope_mosaic_albedo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46940fcac597d042f55e90fa52257bfe3600e30b41a0f248cacce4f724422ad1 -size 63407 +oid sha256:33a768d4fcabf43ff4a94d2fadda50dc6e65623cdf945e9af33ce752d58fb663 +size 63210 diff --git a/project/assets/materials/kaleidoscope_mosaic_emission.png b/project/assets/materials/kaleidoscope_mosaic_emission.png index 7420008e..0a2c0db4 100644 --- a/project/assets/materials/kaleidoscope_mosaic_emission.png +++ b/project/assets/materials/kaleidoscope_mosaic_emission.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46940fcac597d042f55e90fa52257bfe3600e30b41a0f248cacce4f724422ad1 -size 63407 +oid sha256:33a768d4fcabf43ff4a94d2fadda50dc6e65623cdf945e9af33ce752d58fb663 +size 63210 diff --git a/project/assets/materials/kaleidoscope_mosaic_heightmap.png b/project/assets/materials/kaleidoscope_mosaic_heightmap.png index 690d5b74..6749a663 100644 --- a/project/assets/materials/kaleidoscope_mosaic_heightmap.png +++ b/project/assets/materials/kaleidoscope_mosaic_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ab90e6173233c20fe57770a2aa36355c2aff66406519d5d3dd449b3c4812529 -size 320700 +oid sha256:59f273d3ebde8744d0ba91a58d4990743b980228226cae7438a3e23ad0403c95 +size 366765 diff --git a/project/assets/materials/kaleidoscope_mosaic_normal.png b/project/assets/materials/kaleidoscope_mosaic_normal.png index c75b3d27..114dd794 100644 --- a/project/assets/materials/kaleidoscope_mosaic_normal.png +++ b/project/assets/materials/kaleidoscope_mosaic_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2396ff6654e5a7e8a7b2ab72057ac463d56859255818d270aec9908746027dc -size 1165853 +oid sha256:0bf21277c4fdfe5b82c72a563c742920abd6994c47e38591b203bb4d1c481023 +size 1400861 diff --git a/project/assets/test_materials/materials/gray_concrete.tres b/project/assets/test_materials/materials/gray_concrete.tres new file mode 100644 index 00000000..1bceee81 --- /dev/null +++ b/project/assets/test_materials/materials/gray_concrete.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://c6uf0ckexrkxk"] + +[ext_resource type="Texture2D" uid="uid://dpnptsyu3ocu7" path="res://assets/materials/concrete_albedo.png" id="1_7gv1g"] +[ext_resource type="Texture2D" uid="uid://d13uhlvb8t1qs" path="res://assets/materials/concrete_normal.png" id="2_k08ce"] + +[resource] +diffuse_mode = 3 +specular_mode = 2 +albedo_color = Color(0.4313402, 0.43134028, 0.43134007, 1) +albedo_texture = ExtResource("1_7gv1g") +metallic_specular = 0.0 +roughness = 0.0 +normal_enabled = true +normal_scale = 0.0 +normal_texture = ExtResource("2_k08ce") +uv1_triplanar = true diff --git a/project/assets/test_materials/materials/test_material_green.tres b/project/assets/test_materials/materials/test_material_green.tres deleted file mode 100644 index 205d58dd..00000000 --- a/project/assets/test_materials/materials/test_material_green.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://c6uf0ckexrkxk"] - -[ext_resource type="Texture2D" uid="uid://b0upds1s0qy3i" path="res://assets/test_materials/textures/Light/texture_07.png" id="1_os1b1"] - -[resource] -albedo_color = Color(0.69218254, 0.6921825, 0.6921825, 1) -albedo_texture = ExtResource("1_os1b1") -uv1_triplanar = true diff --git a/project/assets/test_materials/materials/test_material_red.tres b/project/assets/test_materials/materials/tiles.tres similarity index 100% rename from project/assets/test_materials/materials/test_material_red.tres rename to project/assets/test_materials/materials/tiles.tres diff --git a/project/levels/core.tscn b/project/levels/core.tscn index 13ad241f..e14fbbd3 100644 --- a/project/levels/core.tscn +++ b/project/levels/core.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://c8lrrlkhctu75"] -[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/test_material_red.tres" id="1_pys30"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/test_material_green.tres" id="2_mrdo8"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/tiles.tres" id="1_pys30"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_mrdo8"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="3_7ksv2"] [ext_resource type="PackedScene" uid="uid://b6vnp6u3i5u47" path="res://objects/effects/kaleidoscope_omni_projector.tscn" id="4_x2n25"] diff --git a/project/levels/station.tscn b/project/levels/station.tscn index e42021a3..320b8cab 100644 --- a/project/levels/station.tscn +++ b/project/levels/station.tscn @@ -1,10 +1,16 @@ [gd_scene format=3 uid="uid://bfp1mwjt0cvo8"] -[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/test_material_red.tres" id="1_skip2"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/test_material_green.tres" id="2_mo284"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/tiles.tres" id="1_skip2"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_mo284"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="3_mo284"] [ext_resource type="PackedScene" uid="uid://ckyx3uv0ttjbl" path="res://assets/environment/walls/metro_back.blend" id="4_ue8rc"] +[sub_resource type="Gradient" id="Gradient_ue8rc"] +colors = PackedColorArray(0.0224, 0.03970667, 0.04, 1, 1, 0.912, 0.89, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_s6lbc"] +gradient = SubResource("Gradient_ue8rc") + [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mo284"] sky_top_color = Color(0.50243366, 0.63148725, 0.86914206, 1) sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) @@ -23,7 +29,13 @@ sky = SubResource("Sky_ue8rc") ambient_light_source = 2 ambient_light_color = Color(0.5219292, 0.52192914, 0.5219292, 1) tonemap_mode = 2 +ssao_enabled = true +ssao_horizon = 0.53 glow_enabled = true +adjustment_enabled = true +adjustment_brightness = 1.16 +adjustment_contrast = 1.25 +adjustment_color_correction = SubResource("GradientTexture1D_s6lbc") [node name="Station" type="Node3D" unique_id=1977494771] @@ -85,8 +97,8 @@ size = Vector3(1.5527191, 2.5620298, 2.3671875) material = ExtResource("2_mo284") [node name="CSGBox3D31" type="CSGBox3D" parent="CSGCombiner3D" unique_id=495027195] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.299171, 7.7491403, -35.144173) -size = Vector3(3.4569092, 7.3527746, 5.268944) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.165174, 7.7491403, -35.144173) +size = Vector3(3.4569092, 7.3527746, 5.5369377) material = ExtResource("2_mo284") [node name="CSGBox3D35" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1633037668] @@ -205,9 +217,9 @@ size = Vector3(15.676254, 0.09698486, 5.879883) material = ExtResource("1_skip2") [node name="CSGBox3D34" type="CSGBox3D" parent="CSGCombiner3D" unique_id=528831191] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.3207889, 9.010315, -35.01783) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.1217685, 9.010315, -35.01783) operation = 2 -size = Vector3(2.4245815, 9.953438, 4.6257935) +size = Vector3(2.4245815, 9.953438, 5.023834) material = ExtResource("2_mo284") [node name="CSGBox3D4" type="CSGBox3D" parent="CSGCombiner3D" unique_id=74370443] diff --git a/project/levels/test_room.tscn b/project/levels/test_room.tscn index f1730b52..1144f48b 100644 --- a/project/levels/test_room.tscn +++ b/project/levels/test_room.tscn @@ -1,9 +1,9 @@ [gd_scene format=3 uid="uid://d38nedywn8cfc"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="1_ctiq7"] -[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/test_material_red.tres" id="1_nlfnm"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/tiles.tres" id="1_nlfnm"] [ext_resource type="Material" path="res://assets/materials/kaleidoscope_mosaic.tres" id="2_hw6vf"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/test_material_green.tres" id="2_x4mbn"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_x4mbn"] [sub_resource type="GDScript" id="GDScript_x4mbn"] resource_name = "TestRoom"