Combine world environment code into single scene

6 files changed, 30 insertions, 25 deletions

diff --git a/client/game.gd b/client/game.gd
index 790caf5b..06e3a934 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -42,16 +42,12 @@ var players := {}
 @onready var camera: FollowCamera = $FollowCamera
 @onready var mp: Multiplayer = $Multiplayer
 @onready var map: Map = $Map
-@onready var environment: WorldEnvironment = $WorldEnvironment
 @onready var lobby: Lobby = $"../Lobby"
 @onready var overlay: Overlay = $"../Overlay"
 @onready var popup_message: PopupMessage = $"../PopupMessage"
 @onready var menu: GameMenu = $".."
 
 func _ready():
-	if !Global.on_vulkan():
-		environment.environment.tonemap_exposure = 0.5
-
 	mp.replay_start.connect(func(): is_replay = true)
 	mp.connection_closed.connect(func(reason: String):
 		Global.error_message = reason;
diff --git a/client/game.tscn b/client/game.tscn
index a30e5fe2..86851ded 100644
--- a/client/game.tscn
+++ b/client/game.tscn
@@ -1,27 +1,12 @@
-[gd_scene load_steps=11 format=3 uid="uid://c6krh36hoqfg8"]
+[gd_scene load_steps=7 format=3 uid="uid://c6krh36hoqfg8"]
 
 [ext_resource type="Script" path="res://game.gd" id="1_sftfn"]
 [ext_resource type="PackedScene" uid="uid://b31mlnao6ybt8" path="res://player/follow_camera.tscn" id="2_s8y6o"]
-[ext_resource type="Script" path="res://map/auto_setup/environment_setup.gd" id="4_hixq3"]
 [ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="5_6fpff"]
 [ext_resource type="Script" path="res://multiplayer.gd" id="6_fbxu8"]
 [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="6_prg6t"]
 [ext_resource type="PackedScene" uid="uid://nroo08m5og0" path="res://map/environment.tscn" id="7_v2apt"]
 
-[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="Game" type="Node3D"]
 script = ExtResource("1_sftfn")
 
@@ -34,10 +19,6 @@ current = true
 far = 150.0
 target = NodePath("../Center")
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_m4dli")
-script = ExtResource("4_hixq3")
-
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(-0.412548, 0.834939, -0.364255, 4.90703e-08, 0.399869, 0.916572, 0.910936, 0.37813, -0.164965, 0, 0, 0)
 shadow_enabled = true
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")