diff --git a/Game/Assets/Maps/DM1/DM1.exr b/Game/Assets/Maps/DM1/DM1.exr index 13306b4..f5adaf0 100644 Binary files a/Game/Assets/Maps/DM1/DM1.exr and b/Game/Assets/Maps/DM1/DM1.exr differ diff --git a/Game/Assets/Maps/DM1/DM1.lmbake b/Game/Assets/Maps/DM1/DM1.lmbake index 707385a..7e99fef 100644 Binary files a/Game/Assets/Maps/DM1/DM1.lmbake and b/Game/Assets/Maps/DM1/DM1.lmbake differ diff --git a/Game/Assets/Maps/DM1/DM1.tscn b/Game/Assets/Maps/DM1/DM1.tscn index b7365e6..8d797cd 100644 --- a/Game/Assets/Maps/DM1/DM1.tscn +++ b/Game/Assets/Maps/DM1/DM1.tscn @@ -21,10 +21,24 @@ [sub_resource type="Environment" id=2] background_mode = 2 background_sky = SubResource( 1 ) +tonemap_mode = 3 +tonemap_white = 1.5 ss_reflections_max_steps = 256 ss_reflections_fade_in = 0.14489 ss_reflections_fade_out = 1.10957 +ssao_intensity = 8.0 glow_enabled = true +glow_levels/1 = true +glow_levels/2 = true +glow_levels/4 = true +glow_intensity = 0.1 +glow_strength = 0.93 +glow_blend_mode = 1 +glow_hdr_threshold = 0.3 +glow_bicubic_upscale = true +adjustment_brightness = 1.06 +adjustment_contrast = 1.13 +adjustment_saturation = 1.03 [sub_resource type="Shader" id=3] code = "shader_type spatial; @@ -307,7 +321,7 @@ ALPHA = vec3(o349717_0_1_f).r * color.a * density; [sub_resource type="ShaderMaterial" id=4] shader = SubResource( 3 ) -shader_param/density = 1.0 +shader_param/density = 0.379 shader_param/speed = 1.0 shader_param/offset = 0.0 shader_param/color = Color( 1, 1, 1, 1 ) @@ -889,7 +903,7 @@ ALPHA = vec3(o349717_0_1_f).r * color.a * density; [sub_resource type="ShaderMaterial" id=10] render_priority = -2 shader = SubResource( 9 ) -shader_param/density = 1.0 +shader_param/density = 0.279 shader_param/speed = 0.5 shader_param/offset = 2.0 shader_param/color = Color( 32.1216, 8.21569, 3.31765, 0.0156863 ) @@ -1493,6 +1507,7 @@ environment = SubResource( 2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 8.96912, 0 ) extents = Vector3( 34.8728, 15.8134, 29.1055 ) quality = 2 +environment_mode = 1 capture_quality = 2 light_data = ExtResource( 15 ) @@ -1616,16 +1631,19 @@ enable_shadows = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 14, 0 ) extents = Vector3( 15, 14, 17 ) box_projection = true +enable_shadows = true [node name="ReflectionProbe4" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 14, 0 ) extents = Vector3( 15, 14, 17 ) box_projection = true +enable_shadows = true [node name="ReflectionProbe3" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 14, 0 ) extents = Vector3( 11, 14, 22 ) box_projection = true +enable_shadows = true [node name="Lights" type="Spatial" parent="."] __meta__ = { @@ -1638,6 +1656,7 @@ light_color = Color( 0.894118, 0.392157, 0.117647, 1 ) light_energy = 15.0 light_indirect_energy = 2.0 light_specular = 0.98 +light_bake_mode = 2 shadow_enabled = true omni_range = 25.0 omni_attenuation = 2.54912 @@ -1649,6 +1668,7 @@ noise_amount = 10.0 transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 32.9591, 14.4, 0 ) light_color = Color( 0.294118, 0.900735, 1, 1 ) light_energy = 1.5 +light_bake_mode = 2 shadow_enabled = true shadow_bias = 0.03 shadow_contact = 6.48 @@ -1684,6 +1704,7 @@ transform = Transform( -1, -1.19608e-14, 2.98023e-08, -2.69128e-08, -0.42955, -0 light_color = Color( 1, 0, 0, 1 ) light_energy = 8.24 light_specular = 1.0 +light_bake_mode = 2 shadow_enabled = true shadow_bias = 0.0 shadow_contact = 2.86 @@ -1696,6 +1717,7 @@ transform = Transform( -1, -1.19608e-14, 2.98023e-08, -2.69128e-08, -0.42955, -0 light_color = Color( 1, 0, 0, 1 ) light_energy = 8.24 light_specular = 1.0 +light_bake_mode = 2 shadow_enabled = true shadow_bias = 0.0 shadow_contact = 2.86 @@ -1704,10 +1726,11 @@ spot_range = 16.0 spot_angle = 56.6429 [node name="SpotLight9" type="SpotLight" parent="Lights"] -transform = Transform( -1, -1.19608e-14, 2.98023e-08, -2.69128e-08, -0.42955, -0.903043, 1.28016e-08, -0.903043, 0.42955, 28.1051, 13.5114, -13.799 ) +transform = Transform( -1, -1.30266e-15, 2.98023e-08, -2.69128e-08, -0.42955, -0.903043, 1.28016e-08, -0.903043, 0.42955, 28.1051, 13.5114, -13.799 ) light_color = Color( 1, 0, 0, 1 ) light_energy = 8.24 light_specular = 1.0 +light_bake_mode = 2 shadow_enabled = true shadow_bias = 0.0 shadow_contact = 2.86 diff --git a/Game/Assets/Maps/Materials/SetA/Metal/Metal_Floor_01/Metal_Floor_01.tres b/Game/Assets/Maps/Materials/SetA/Metal/Metal_Floor_01/Metal_Floor_01.tres index cfbf8fb..5ff7a1a 100644 --- a/Game/Assets/Maps/Materials/SetA/Metal/Metal_Floor_01/Metal_Floor_01.tres +++ b/Game/Assets/Maps/Materials/SetA/Metal/Metal_Floor_01/Metal_Floor_01.tres @@ -6,10 +6,10 @@ [ext_resource path="res://Assets/Maps/Materials/SetA/Metal/Metal_Floor_01/Metal_Floor_01_depth.png" type="Texture" id=4] [resource] -albedo_color = Color( 0.611765, 0.611765, 0.611765, 1 ) +params_diffuse_mode = 1 +albedo_color = Color( 0.364706, 0.254902, 0.211765, 1 ) albedo_texture = ExtResource( 1 ) -metallic = 1.0 -metallic_specular = 1.0 +metallic = 0.22 metallic_texture = ExtResource( 2 ) metallic_texture_channel = 2 roughness_texture = ExtResource( 2 ) diff --git a/Game/default_environment.tres b/Game/default_environment.tres new file mode 100644 index 0000000..cb89a33 --- /dev/null +++ b/Game/default_environment.tres @@ -0,0 +1,12 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="ProceduralSky" id=1] +sun_longitude = 180.0 + +[resource] +background_mode = 2 +background_sky = SubResource( 1 ) +glow_enabled = true +glow_blend_mode = 1 +glow_hdr_threshold = 1.3 +glow_bicubic_upscale = true diff --git a/Game/project.godot b/Game/project.godot index d95d925..6e99cc3 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -128,9 +128,7 @@ PlayerZoom={ [rendering] quality/shadow_atlas/cubemap_size=1024 -quality/shadows/filter_mode=2 quality/voxel_cone_tracing/high_quality=true -quality/filters/msaa=2 quality/filters/use_fxaa=true quality/filters/use_debanding=true environment/default_environment="res://default_env.tres"