Merge pull request 'disabled SSIL to workaround weird lighting glitch' (#4) from environment into main
Reviewed-on: #4
This commit was merged in pull request #4.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=25 format=3 uid="uid://cqtabc6coc58l"]
|
[gd_scene load_steps=23 format=3 uid="uid://cqtabc6coc58l"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dmtpstry0o0a3" path="res://Assets/Scripts/Player Controls/player_movement.gd" id="1_48dl1"]
|
[ext_resource type="Script" uid="uid://dmtpstry0o0a3" path="res://Assets/Scripts/Player Controls/player_movement.gd" id="1_48dl1"]
|
||||||
[ext_resource type="PackedScene" uid="uid://b2mhoeubwtkuo" path="res://Scenes/UI/fade_in_transition.tscn" id="2_cx0fw"]
|
[ext_resource type="PackedScene" uid="uid://b2mhoeubwtkuo" path="res://Scenes/UI/fade_in_transition.tscn" id="2_cx0fw"]
|
||||||
@@ -7,24 +7,26 @@
|
|||||||
[ext_resource type="PackedScene" uid="uid://b54u8nvjd4p6l" path="res://Scenes/UI/pause_menu.tscn" id="3_cx0fw"]
|
[ext_resource type="PackedScene" uid="uid://b54u8nvjd4p6l" path="res://Scenes/UI/pause_menu.tscn" id="3_cx0fw"]
|
||||||
[ext_resource type="Script" uid="uid://chb1dyhl7cyg1" path="res://Assets/Scripts/UI/crosshair.gd" id="3_vwrhx"]
|
[ext_resource type="Script" uid="uid://chb1dyhl7cyg1" path="res://Assets/Scripts/UI/crosshair.gd" id="3_vwrhx"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cmyf6lhbn1x6p" path="res://Scenes/Models/Interior/security_office_model.tscn" id="4_vwrhx"]
|
[ext_resource type="PackedScene" uid="uid://cmyf6lhbn1x6p" path="res://Scenes/Models/Interior/security_office_model.tscn" id="4_vwrhx"]
|
||||||
[ext_resource type="Shader" uid="uid://xinbgyk6acog" path="res://Assets/Scripts/Shaders/grayscale.gdshader" id="5_bn2ya"]
|
|
||||||
[ext_resource type="Script" uid="uid://bfsaxhnb0qpuk" path="res://Assets/Scripts/Misc/flickering_light.gd" id="5_nmbs0"]
|
[ext_resource type="Script" uid="uid://bfsaxhnb0qpuk" path="res://Assets/Scripts/Misc/flickering_light.gd" id="5_nmbs0"]
|
||||||
[ext_resource type="Texture2D" uid="uid://c0qenaw8wxlbv" path="res://Assets/MISC_Textures/DustMote.png" id="6_ayt7b"]
|
[ext_resource type="Texture2D" uid="uid://c0qenaw8wxlbv" path="res://Assets/MISC_Textures/DustMote.png" id="6_ayt7b"]
|
||||||
[ext_resource type="Script" uid="uid://ckagscjkf3iiu" path="res://Assets/Scripts/UI/terminal/terminal_controls.gd" id="10_gba58"]
|
[ext_resource type="Script" uid="uid://ckagscjkf3iiu" path="res://Assets/Scripts/UI/terminal/terminal_controls.gd" id="10_gba58"]
|
||||||
|
|
||||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_bn2ya"]
|
|
||||||
resource_local_to_scene = true
|
|
||||||
shader = ExtResource("5_bn2ya")
|
|
||||||
shader_parameter/saturation = 0.0
|
|
||||||
|
|
||||||
[sub_resource type="Environment" id="Environment_cumm5"]
|
[sub_resource type="Environment" id="Environment_cumm5"]
|
||||||
background_mode = 1
|
background_mode = 1
|
||||||
background_color = Color(0.680932, 0.369129, 0.248985, 1)
|
background_color = Color(0.680932, 0.369129, 0.248985, 1)
|
||||||
background_energy_multiplier = 0.04
|
background_energy_multiplier = 0.04
|
||||||
ssr_enabled = true
|
ssr_enabled = true
|
||||||
ssao_enabled = true
|
ssao_enabled = true
|
||||||
ssil_enabled = true
|
ssao_radius = 6.6
|
||||||
|
ssao_intensity = 5.34
|
||||||
|
ssao_detail = 1.12
|
||||||
|
ssao_horizon = 0.27
|
||||||
|
ssao_light_affect = 0.41
|
||||||
|
ssao_ao_channel_affect = 0.51
|
||||||
|
ssil_radius = 16.0
|
||||||
|
sdfgi_enabled = true
|
||||||
sdfgi_use_occlusion = true
|
sdfgi_use_occlusion = true
|
||||||
|
glow_enabled = true
|
||||||
glow_normalized = true
|
glow_normalized = true
|
||||||
fog_light_energy = 15.32
|
fog_light_energy = 15.32
|
||||||
volumetric_fog_density = 0.1974
|
volumetric_fog_density = 0.1974
|
||||||
@@ -130,14 +132,6 @@ grow_horizontal = 2
|
|||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
script = ExtResource("3_vwrhx")
|
script = ExtResource("3_vwrhx")
|
||||||
|
|
||||||
[node name="ColorRect" type="ColorRect" parent="PlayerController/Camera3D/CanvasLayer"]
|
|
||||||
material = SubResource("ShaderMaterial_bn2ya")
|
|
||||||
anchors_preset = 15
|
|
||||||
anchor_right = 1.0
|
|
||||||
anchor_bottom = 1.0
|
|
||||||
grow_horizontal = 2
|
|
||||||
grow_vertical = 2
|
|
||||||
|
|
||||||
[node name="PauseMenu" type="CanvasLayer" parent="."]
|
[node name="PauseMenu" type="CanvasLayer" parent="."]
|
||||||
|
|
||||||
[node name="Transition" parent="PauseMenu" instance=ExtResource("2_cx0fw")]
|
[node name="Transition" parent="PauseMenu" instance=ExtResource("2_cx0fw")]
|
||||||
|
|||||||
Reference in New Issue
Block a user