Skip to content

Commit eb9bfdd

Browse files
committed
(Skydome) Small tuning
1 parent 4a566bb commit eb9bfdd

2 files changed

Lines changed: 59 additions & 79 deletions

File tree

addons/libmaszyna/scenery/maszyna_include.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var _scenery:MaszynaSceneryNode
2828
func _ready() -> void:
2929
var node = self
3030

31-
if autoload:
31+
if Engine.is_editor_hint() and autoload:
3232
self.load()
3333

3434
set_process(true)

demo/demo_scenery_loading.tscn

Lines changed: 58 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,31 @@
77
[ext_resource type="Script" uid="uid://m0t4e4uurpbc" path="res://addons/libmaszyna/scenery/maszyna_scenery.gd" id="3_fraxg"]
88
[ext_resource type="PackedScene" uid="uid://cggqb75a8w8r" path="res://addons/debug_menu/debug_menu.tscn" id="4_f81ma"]
99
[ext_resource type="Shader" uid="uid://ck1w2pkpwin11" path="res://addons/gnd_skydome/filmic_procedural_sky.gdshader" id="4_uccxj"]
10-
[ext_resource type="Script" uid="uid://pw1ljvn4g7cy" path="res://addons/gnd_skydome/SunShaftsCompositorEffect.gd" id="5_uccxj"]
1110
[ext_resource type="PackedScene" uid="uid://bbq6b2v2678h0" path="res://hud/user_settings_panel.tscn" id="6_whf3y"]
1211

13-
[sub_resource type="FastNoiseLite" id="FastNoiseLite_4xg7h"]
12+
[sub_resource type="FastNoiseLite" id="FastNoiseLite_uccxj"]
1413
seed = 10
1514

16-
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_3ymqn"]
17-
noise = SubResource("FastNoiseLite_4xg7h")
15+
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_4xg7h"]
16+
noise = SubResource("FastNoiseLite_uccxj")
1817
seamless = true
1918

20-
[sub_resource type="FastNoiseLite" id="FastNoiseLite_xuex3"]
19+
[sub_resource type="FastNoiseLite" id="FastNoiseLite_3ymqn"]
2120
seed = 100
2221
frequency = 0.008
2322

24-
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_2mlfg"]
25-
noise = SubResource("FastNoiseLite_xuex3")
23+
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_xuex3"]
24+
noise = SubResource("FastNoiseLite_3ymqn")
2625
seamless = true
2726

28-
[sub_resource type="ShaderMaterial" id="ShaderMaterial_72ctq"]
27+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_2mlfg"]
2928
shader = ExtResource("4_uccxj")
30-
shader_parameter/cloud_tex_a = SubResource("NoiseTexture2D_3ymqn")
31-
shader_parameter/cloud_tex_b = SubResource("NoiseTexture2D_2mlfg")
29+
shader_parameter/cloud_tex_a = SubResource("NoiseTexture2D_4xg7h")
30+
shader_parameter/cloud_tex_b = SubResource("NoiseTexture2D_xuex3")
3231
shader_parameter/lower_sky_color = Color(0.655, 0.706, 0.79, 1)
3332
shader_parameter/horizon_color = Color(0.832, 0.86, 0.886, 1)
3433
shader_parameter/zenith_color = Color(0.2373352, 0.4190016, 0.7890625, 1)
35-
shader_parameter/sky_energy = 0.80542
34+
shader_parameter/sky_energy = 0.79392
3635
shader_parameter/horizon_height = 0.05
3736
shader_parameter/horizon_softness = 0.24
3837
shader_parameter/zenith_curve = 0.405
@@ -52,14 +51,14 @@ shader_parameter/sunset_sun_color = Color(1, 0.4, 0.1, 1)
5251
shader_parameter/night_lower_sky_color = Color(0.173913, 0.22636217, 0.32845804, 1)
5352
shader_parameter/night_horizon_color = Color(0.21958375, 0.26231927, 0.3549303, 1)
5453
shader_parameter/night_zenith_color = Color(0.23138326, 0.24876946, 0.31804258, 1)
55-
shader_parameter/night_sky_energy = 0.2611349
54+
shader_parameter/night_sky_energy = 0.2585424
5655
shader_parameter/stars_color = Color(1, 1, 1, 1)
5756
shader_parameter/stars_energy = 2.0
5857
shader_parameter/stars_size_min = 0.01
5958
shader_parameter/stars_size_max = 0.03
6059
shader_parameter/stars_edge_softness = 0.25
61-
shader_parameter/gi_tint = Color(0.7772239, 0.7367139, 0.703796, 1)
62-
shader_parameter/gi_energy_multiplier = 0.9245653653108998
60+
shader_parameter/gi_tint = Color(0.34744364, 0.4860088, 0.7754261, 1)
61+
shader_parameter/gi_energy_multiplier = 2.0125084146134036
6362
shader_parameter/sun_color = Color(1, 0.98, 0.9, 1)
6463
shader_parameter/sun_disk_size = 0.04
6564
shader_parameter/sun_disk_softness = 0.6
@@ -83,39 +82,39 @@ shader_parameter/cloud_scale_b = Vector2(0.082, 0.125)
8382
shader_parameter/cloud_plane_height = 0.187
8483
shader_parameter/cloud_plane_curve = 0.595
8584
shader_parameter/cloud_warp_strength = 0.053
86-
shader_parameter/cloud_coverage = 0.423
85+
shader_parameter/cloud_coverage = 0.448
8786
shader_parameter/cloud_softness = 0.2
88-
shader_parameter/cloud_opacity = 0.8219099999999999
87+
shader_parameter/cloud_opacity = 0.823064
8988
shader_parameter/cloud_horizon_fade = 0.481
9089
shader_parameter/cloud_top_fade = 0.118
91-
shader_parameter/cloud_light_color = Color(0.949663, 0.938546, 0.9248315, 1)
90+
shader_parameter/cloud_light_color = Color(0.946688, 0.936096, 0.92334396, 1)
9291
shader_parameter/cloud_shadow_color = Color(0.7213096, 0.75538087, 0.82624775, 1)
9392
shader_parameter/cloud_forward_scatter = 1.5
9493
shader_parameter/cloud_backscatter = 0.39
95-
shader_parameter/sun_cloud_occlusion = 0.5836600000000001
96-
shader_parameter/custom_sun_dir = Vector3(0.9547786, 0.24142224, -0.17353134)
97-
shader_parameter/custom_moon_dir = Vector3(-0.6425772, -0.7247968, -0.24852419)
98-
shader_parameter/celestial_matrix = Basis(-0.9989135, -0.029955218, 0.03569924, 0, 0.76604444, 0.6427876, -0.046602048, 0.6420892, -0.7652122)
94+
shader_parameter/sun_cloud_occlusion = 0.59416
95+
shader_parameter/custom_sun_dir = Vector3(-0.8586799, -0.03844324, -0.51106846)
96+
shader_parameter/custom_moon_dir = Vector3(0.4125069, 0.21591161, 0.8849973)
97+
shader_parameter/celestial_matrix = Basis(-0.6195282, -0.5045718, 0.6013253, 0, 0.76604444, 0.6427876, -0.7849744, 0.398225, -0.4745861)
9998
shader_parameter/rendered_day_of_year = 129.0
100-
shader_parameter/rendered_time_of_day = 6.088999999999942
99+
shader_parameter/rendered_time_of_day = 19.72400000000016
101100
shader_parameter/observer_latitude_deg = 50.0
102-
shader_parameter/cloud_time = 18468.534
101+
shader_parameter/cloud_time = 18550.344
103102
shader_parameter/cloud_wind_direction = Vector2(0.9363292, 0.35112345)
104103
shader_parameter/cloud_wind_speed = 1.0
105-
shader_parameter/cloud_motion_time = 1340102.448
104+
shader_parameter/cloud_motion_time = 1345992.7680000009
106105
shader_parameter/cloud_motion_scale = 0.12
107-
shader_parameter/cloud_evolution_time = 446700.81600000005
106+
shader_parameter/cloud_evolution_time = 448664.2560000003
108107
shader_parameter/cloud_evolution_strength = 0.18
109108
shader_parameter/cloud_evolution_scale = 0.018
110109

111-
[sub_resource type="Sky" id="Sky_0f3d1"]
112-
sky_material = SubResource("ShaderMaterial_72ctq")
110+
[sub_resource type="Sky" id="Sky_72ctq"]
111+
sky_material = SubResource("ShaderMaterial_2mlfg")
113112

114113
[sub_resource type="Environment" id="Environment_nd35h"]
115114
background_mode = 2
116-
sky = SubResource("Sky_0f3d1")
117-
ambient_light_color = Color(0.7430768, 0.70977545, 0.61228067, 1)
118-
ambient_light_energy = 1.7156086
115+
sky = SubResource("Sky_72ctq")
116+
ambient_light_color = Color(0.3008219, 0.31226274, 0.3230078, 1)
117+
ambient_light_energy = 1.2650267
119118
tonemap_mode = 4
120119
tonemap_white = 6.44
121120
tonemap_agx_white = 9.19
@@ -127,19 +126,19 @@ sdfgi_enabled = true
127126
glow_enabled = true
128127
glow_bloom = 0.2
129128
fog_enabled = true
130-
fog_light_color = Color(0.97898203, 0.7951599, 0.6871357, 1)
131-
fog_density = 0.006708211
129+
fog_light_color = Color(0.6311693, 0.43603623, 0.3480004, 1)
130+
fog_density = 0.038941726
132131
fog_aerial_perspective = 1.0
133-
fog_sky_affect = 0.17467415
134-
fog_depth_begin = 19.392635
135-
fog_depth_end = 977.2239
132+
fog_sky_affect = 0.6402694
133+
fog_depth_begin = 7.931831
134+
fog_depth_end = 547.44366
136135
volumetric_fog_enabled = true
137-
volumetric_fog_density = 0.0028600516
138-
volumetric_fog_albedo = Color(0.7951498, 0.68186295, 0.60197294, 1)
139-
volumetric_fog_length = 8.265721
136+
volumetric_fog_density = 0.037958767
137+
volumetric_fog_albedo = Color(0.58959824, 0.47441214, 0.42453235, 1)
138+
volumetric_fog_length = 13.279824
140139
volumetric_fog_detail_spread = 2.0490615
141-
volumetric_fog_ambient_inject = 0.058410715
142-
volumetric_fog_sky_affect = 0.499051
140+
volumetric_fog_ambient_inject = 0.40581638
141+
volumetric_fog_sky_affect = 0.48114347
143142
adjustment_enabled = true
144143
adjustment_contrast = 1.02
145144

@@ -149,28 +148,7 @@ auto_exposure_scale = 0.3
149148
auto_exposure_min_sensitivity = 329.33
150149
auto_exposure_max_sensitivity = 500.0
151150

152-
[sub_resource type="CompositorEffect" id="CompositorEffect_211oo"]
153-
resource_local_to_scene = false
154-
resource_name = ""
155-
enabled = true
156-
effect_callback_type = 4
157-
needs_motion_vectors = false
158-
needs_normal_roughness = false
159-
script = ExtResource("5_uccxj")
160-
sun_screen_uv = Vector2(0.6080189, 0.29110244)
161-
sun_visible = true
162-
shaft_color = Color(0.68676966, 0.6723826, 0.6173381, 1)
163-
density = 0.28020373146723176
164-
bright_threshold = 0.182
165-
weight = 0.02644633722650608
166-
decay = 0.93
167-
exposure = 1.1180249525094876
168-
max_radius = 1.377
169-
sample_count = 8
170-
dither_strength = 1.4
171-
172-
[sub_resource type="Compositor" id="Compositor_212em"]
173-
compositor_effects = Array[CompositorEffect]([SubResource("CompositorEffect_211oo")])
151+
[sub_resource type="Compositor" id="Compositor_0f3d1"]
174152

175153
[node name="DemoSceneryLoading" type="Node3D" unique_id=1784067886]
176154
script = ExtResource("1_nk4av")
@@ -181,7 +159,7 @@ directional_light_path = NodePath("../DirectionalLight3D")
181159
world_environment_path = NodePath("../WorldEnvironment")
182160
use_system_time = true
183161
day_of_year = 129
184-
time_of_day = 6.089
162+
time_of_day = 19.724
185163
day_light_energy = 4.0
186164
day_light_color = Color(0.97154576, 0.9127411, 0.77206504, 1)
187165
day_fog_distance_begin = 20.0
@@ -203,45 +181,47 @@ night_vol_fog_albedo = Color(0.3827457, 0.39669132, 0.43383864, 1)
203181
night_vol_fog_ambient_inject = 0.525
204182
night_vol_fog_sky_affect = 0.475
205183
night_vol_fog_length = 15.0
206-
clouds_coverage = 0.423
207-
clouds_opacity = 0.75
184+
clouds_coverage = 0.448
185+
clouds_opacity = 0.745
186+
clouds_light_energy_overcast = 0.315
208187
clouds_color_shadow = Color(0.7213096, 0.75538087, 0.82624775, 1)
188+
clouds_shadow_angular_distance_clear = 0.01
189+
clouds_shadow_angular_distance_overcast = 1.0
209190
moon_texture = ExtResource("3_4xg7h")
210191
moon_color = Color(0.8602561, 0.8906728, 0.9238627, 1)
211192
moon_glow_strength = 0.099
212193
moon_eclipse_size = 0.355
213194
moon_glow_size = 0.865
214-
moon_phase_debug = 0.37703042104074935
195+
moon_phase_debug = 0.3962693306242233
215196
metadata/_custom_type_script = "uid://blkilnimp0sck"
216197

217198
[node name="Player" parent="." unique_id=1819896729 instance=ExtResource("2_f81ma")]
218199
transform = Transform3D(-0.543175, 0, 0.83962, 0, 1, 0, -0.83962, 0, -0.543175, 21.04, 1.959, -18.089)
219200

220201
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=1934821577]
221-
transform = Transform3D(-0.17882082, -0.2375309, 0.9547786, 0, 0.9704202, 0.24142224, -0.98388165, 0.04317132, -0.17353134, 5.83027, -6.14961, 0)
222-
light_color = Color(0.860766, 0.6486606, 0.5105588, 1)
223-
light_energy = 4.0
224-
light_indirect_energy = 2.0
202+
transform = Transform3D(0.9063761, -0.091216564, 0.4125069, 0, 0.97641295, 0.21591161, -0.4224718, -0.19569713, 0.8849973, 5.83027, -6.14961, 0)
203+
light_color = Color(0.50584126, 0.5531878, 0.6066819, 1)
204+
light_energy = 0.23081493
205+
light_indirect_energy = 3.0
225206
light_volumetric_fog_energy = 4.197
226-
light_angular_distance = 2.4582572
207+
light_angular_distance = 0.18867494
227208
shadow_enabled = true
228-
shadow_opacity = 0.97298956
229-
directional_shadow_split_1 = 0.032
230-
directional_shadow_split_2 = 0.1
231-
directional_shadow_split_3 = 0.3
209+
shadow_opacity = 0.963904
210+
shadow_blur = 1.2
232211
directional_shadow_blend_splits = true
233-
directional_shadow_max_distance = 300.0
212+
directional_shadow_max_distance = 500.0
234213

235214
[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=2008332412]
236215
environment = SubResource("Environment_nd35h")
237216
camera_attributes = SubResource("CameraAttributesPractical_uccxj")
238-
compositor = SubResource("Compositor_212em")
217+
compositor = SubResource("Compositor_0f3d1")
239218

240219
[node name="MaszynaSceneryNode" type="Node3D" parent="." unique_id=2029493538]
241220
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1461792, 5.782898, -0.9614258)
242221
script = ExtResource("3_fraxg")
243222
use_cache = true
244-
filename = "zwierzyniec_sm42.scn"
223+
filename = "td.scn"
224+
autoload = false
245225
metadata/_custom_type_script = "uid://m0t4e4uurpbc"
246226

247227
[node name="CanvasLayer" parent="." unique_id=28357571 instance=ExtResource("4_f81ma")]

0 commit comments

Comments
 (0)