From 5e35fff70cda3c6d4b6da91c9521e12194ae3639 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 26 Jul 2026 18:50:10 +0300 Subject: [PATCH] Split environments to be map specific --- godot/maps/diner/diner.tscn | 20 +++++++++++++++-- godot/maps/two_towers/two_towers.tscn | 27 +++++++++++++++++++++-- godot/scenes/player/local_player.tscn | 2 -- godot/scenes/player/local_player_env.tres | 4 ---- 4 files changed, 43 insertions(+), 10 deletions(-) delete mode 100644 godot/scenes/player/local_player_env.tres diff --git a/godot/maps/diner/diner.tscn b/godot/maps/diner/diner.tscn index 3369d26..8a52e81 100644 --- a/godot/maps/diner/diner.tscn +++ b/godot/maps/diner/diner.tscn @@ -13,7 +13,6 @@ [ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="11_1d2sd"] [ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn_entity.gd" id="12_v6ly3"] [ext_resource type="Material" uid="uid://duhcpuu670mxw" path="res://maps/materials/str_blood_large.tres" id="13_1sdvq"] -[ext_resource type="Environment" uid="uid://dy2rpg3tdiiv5" path="res://scenes/player/local_player_env.tres" id="14_1sdvq"] [sub_resource type="ArrayMesh" id="ArrayMesh_1d2sd"] lightmap_size_hint = Vector2i(298, 302) @@ -258,6 +257,23 @@ _surfaces = [{ [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_41emq"] points = PackedVector3Array(208, 1, 200, 208, -1, 200, -208, 1, 200, -208, -1, 200, 208, 1, -200, 208, -1, -200, -208, 1, -200, -208, -1, -200) +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ap2uw"] + +[sub_resource type="Sky" id="Sky_h4ywl"] +sky_material = SubResource("ProceduralSkyMaterial_ap2uw") + +[sub_resource type="Environment" id="Environment_1d2sd"] +background_mode = 2 +sky = SubResource("Sky_h4ywl") +tonemap_mode = 4 +ssao_enabled = true +ssao_radius = 2.0 +glow_enabled = true +fog_enabled = true +fog_density = 0.0 +fog_height = 10.0 +fog_height_density = 0.005 + [node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawners", "ball_spawner")] spawners = [NodePath("func_godot_map/entity_3_info_spawn_point"), NodePath("func_godot_map/entity_4_info_spawn_point")] ball_spawner = NodePath("func_godot_map/entity_5_info_spawn_point") @@ -492,4 +508,4 @@ transform = Transform3D(0.8660254, -0.43301272, 0.25, 0.1294095, 0.6770772, 0.72 shadow_enabled = true [node name="world_environment" type="WorldEnvironment" parent="." unique_id=842016761] -environment = ExtResource("14_1sdvq") +environment = SubResource("Environment_1d2sd") diff --git a/godot/maps/two_towers/two_towers.tscn b/godot/maps/two_towers/two_towers.tscn index 29f5bfa..c5431ee 100644 --- a/godot/maps/two_towers/two_towers.tscn +++ b/godot/maps/two_towers/two_towers.tscn @@ -13,7 +13,6 @@ [ext_resource type="Script" uid="uid://chhq2pb2quwg6" path="res://maps/entities/spawn_entity.gd" id="11_26faa"] [ext_resource type="Material" uid="uid://1a350wgaavgt" path="res://maps/materials/str_stoneflr1.tres" id="11_mw7l8"] [ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="12_2spb1"] -[ext_resource type="Environment" uid="uid://dy2rpg3tdiiv5" path="res://scenes/player/local_player_env.tres" id="14_ldmbn"] [sub_resource type="ArrayMesh" id="ArrayMesh_mw7l8"] _surfaces = [{ @@ -368,6 +367,30 @@ points = PackedVector3Array(24, 0, -16, 24, -2, -16, -48, 0, -16, -48, -2, -16, [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_8ugwd"] points = PackedVector3Array(268, 1, 320, 268, -1, 320, -268, 1, 320, -268, -1, 320, 268, 1, -320, 268, -1, -320, -268, 1, -320, -268, -1, -320) +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ap2uw"] + +[sub_resource type="Sky" id="Sky_h4ywl"] +sky_material = SubResource("ProceduralSkyMaterial_ap2uw") + +[sub_resource type="Environment" id="Environment_mw7l8"] +background_mode = 2 +sky = SubResource("Sky_h4ywl") +ambient_light_sky_contribution = 0.5 +tonemap_mode = 4 +tonemap_exposure = 1.2 +ssao_enabled = true +ssao_radius = 2.0 +glow_enabled = true +fog_enabled = true +fog_light_color = Color(0.61, 0.556625, 0.51850003, 1) +fog_density = 0.002 +fog_height = 7.0 +fog_height_density = 0.006 +adjustment_enabled = true +adjustment_brightness = 1.05 +adjustment_contrast = 1.02 +adjustment_saturation = 1.1 + [node name="two_towers" type="Map" unique_id=590524284 node_paths=PackedStringArray("spawners", "ball_spawner")] spawners = [NodePath("func_godot_map/entity_2_info_spawn_point"), NodePath("func_godot_map/entity_1_info_spawn_point")] ball_spawner = NodePath("func_godot_map/entity_3_info_spawn_point") @@ -716,4 +739,4 @@ transform = Transform3D(0.99328005, -0.09338135, 0.068372406, 0.019120537, 0.715 shadow_enabled = true [node name="world_environment" type="WorldEnvironment" parent="." unique_id=850026555] -environment = ExtResource("14_ldmbn") +environment = SubResource("Environment_mw7l8") diff --git a/godot/scenes/player/local_player.tscn b/godot/scenes/player/local_player.tscn index 38d4d37..55c5512 100644 --- a/godot/scenes/player/local_player.tscn +++ b/godot/scenes/player/local_player.tscn @@ -1,6 +1,5 @@ [gd_scene format=3 uid="uid://ct70bpbca8one"] -[ext_resource type="Environment" uid="uid://dy2rpg3tdiiv5" path="res://scenes/player/local_player_env.tres" id="1_3nqsm"] [ext_resource type="PackedScene" uid="uid://bod6b3befmyt5" path="res://scenes/player/soldier_m.tscn" id="1_jd651"] [ext_resource type="PackedScene" uid="uid://cl66unms2gim0" path="res://scenes/player/effects.tscn" id="2_ywmwa"] [ext_resource type="PackedScene" uid="uid://n3u0jr4wiib1" path="res://scenes/ui/settings.tscn" id="3_beej8"] @@ -41,7 +40,6 @@ collision_mask = 4 [node name="camera_3d" type="Camera3D" parent="." unique_id=1773137418] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8724979, -0.2644562) -environment = ExtResource("1_3nqsm") current = true fov = 90.0 diff --git a/godot/scenes/player/local_player_env.tres b/godot/scenes/player/local_player_env.tres deleted file mode 100644 index 88363a4..0000000 --- a/godot/scenes/player/local_player_env.tres +++ /dev/null @@ -1,4 +0,0 @@ -[gd_resource type="Environment" format=3 uid="uid://dy2rpg3tdiiv5"] - -[resource] -glow_enabled = true