feat: overhauled wall texture&environment colours

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

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

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

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

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

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

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

project/assets/test_materials/materials/test_material_green.tres

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

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

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]

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"