diff options
| author | tpart <tpart120@proton.me> | 2024-07-27 14:02:21 +0200 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2024-07-27 14:02:21 +0200 |
| commit | 9e677dcc116aa06debd3e9188830f15f79d2bdbe (patch) | |
| tree | 6be5b0123f2b93a4fffb01a72f3bd5c09d550aaa /client/map | |
| parent | fcaa22b8e6a8636c19fa0420d6f88528ed7971c8 (diff) | |
| download | hurrycurry-9e677dcc116aa06debd3e9188830f15f79d2bdbe.tar hurrycurry-9e677dcc116aa06debd3e9188830f15f79d2bdbe.tar.bz2 hurrycurry-9e677dcc116aa06debd3e9188830f15f79d2bdbe.tar.zst | |
Combine world environment code into single scene
Diffstat (limited to 'client/map')
| -rw-r--r-- | client/map/auto_setup/environment_setup.gd | 2 | ||||
| -rw-r--r-- | client/map/environment.gd | 2 | ||||
| -rw-r--r-- | client/map/environment.tscn | 5 | ||||
| -rw-r--r-- | client/map/world_environment.tscn | 21 |
4 files changed, 29 insertions, 1 deletions
diff --git a/client/map/auto_setup/environment_setup.gd b/client/map/auto_setup/environment_setup.gd index 75dc900f..3e6049b3 100644 --- a/client/map/auto_setup/environment_setup.gd +++ b/client/map/auto_setup/environment_setup.gd @@ -26,4 +26,6 @@ func apply_settings(): environment.ssao_enabled = Global.get_setting("ssao") environment.sdfgi_enabled = Global.get_setting("sdfgi") and allow_sdfgi environment.glow_enabled = Global.get_setting("glow") + if !Global.on_vulkan(): + environment.environment.tonemap_exposure = 0.5 diff --git a/client/map/environment.gd b/client/map/environment.gd index abe8ed6c..5fcfc53d 100644 --- a/client/map/environment.gd +++ b/client/map/environment.gd @@ -1,6 +1,8 @@ extends Node3D func update(active: Array): + if active.has("night"): + pass $Wind.emitting = active.has("wind") var a: ParticleProcessMaterial = $Wind.process_material diff --git a/client/map/environment.tscn b/client/map/environment.tscn index ee51b490..b254f468 100644 --- a/client/map/environment.tscn +++ b/client/map/environment.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=10 format=3 uid="uid://nroo08m5og0"] +[gd_scene load_steps=11 format=3 uid="uid://nroo08m5og0"] [ext_resource type="Script" path="res://map/environment.gd" id="1_qy481"] +[ext_resource type="PackedScene" uid="uid://cb4ic3ssk4r8r" path="res://map/world_environment.tscn" id="2_68o16"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_fyrr8"] emission_shape_offset = Vector3(0, 5, 0) @@ -71,3 +72,5 @@ amount = 150 lifetime = 5.0 process_material = SubResource("ParticleProcessMaterial_pyn6b") draw_pass_1 = SubResource("SphereMesh_4trvf") + +[node name="WorldEnvironment" parent="." instance=ExtResource("2_68o16")] diff --git a/client/map/world_environment.tscn b/client/map/world_environment.tscn new file mode 100644 index 00000000..4ca96f37 --- /dev/null +++ b/client/map/world_environment.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=5 format=3 uid="uid://cb4ic3ssk4r8r"] + +[ext_resource type="Script" path="res://map/auto_setup/environment_setup.gd" id="1_iatcp"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py7px"] +ground_bottom_color = Color(0.0826605, 0.065772, 0.0461518, 1) + +[sub_resource type="Sky" id="Sky_ultpf"] +sky_material = SubResource("ProceduralSkyMaterial_py7px") + +[sub_resource type="Environment" id="Environment_m4dli"] +background_mode = 2 +sky = SubResource("Sky_ultpf") +tonemap_mode = 2 +ssao_enabled = true +sdfgi_use_occlusion = true +sdfgi_energy = 2.0 + +[node name="WorldEnvironment" type="WorldEnvironment"] +environment = SubResource("Environment_m4dli") +script = ExtResource("1_iatcp") |