From 24d0894cde091306d538bb6f0c5c9c3941003d63 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sun, 16 Mar 2025 16:49:31 -0600 Subject: [PATCH] Environment refinement & variation --- levels/ghost_ship/environment_1.tres | 20 +++++++++++++ levels/ghost_ship/environment_2.tres | 33 ++++++++++++++++++++ levels/ghost_ship/environment_3.tres | 33 ++++++++++++++++++++ levels/ghost_ship/ghost_ship.tscn | 38 +++++++----------------- src/equipment/laser_cast/laser_cast.tscn | 2 ++ src/player/player.tscn | 8 +++++ 6 files changed, 107 insertions(+), 27 deletions(-) create mode 100644 levels/ghost_ship/environment_1.tres create mode 100644 levels/ghost_ship/environment_2.tres create mode 100644 levels/ghost_ship/environment_3.tres diff --git a/levels/ghost_ship/environment_1.tres b/levels/ghost_ship/environment_1.tres new file mode 100644 index 0000000..d5158f0 --- /dev/null +++ b/levels/ghost_ship/environment_1.tres @@ -0,0 +1,20 @@ +[gd_resource type="Environment" load_steps=3 format=3 uid="uid://c10dt0cebs6bo"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_aj2m7"] + +[sub_resource type="Sky" id="Sky_6fwow"] +sky_material = SubResource("ProceduralSkyMaterial_aj2m7") + +[resource] +background_mode = 1 +sky = SubResource("Sky_6fwow") +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) +ambient_light_energy = 0.06 +tonemap_mode = 3 +glow_enabled = true +glow_bloom = 0.1 +fog_enabled = true +fog_light_color = Color(0, 0, 0, 1) +fog_density = 0.2 +fog_depth_begin = 0.0 diff --git a/levels/ghost_ship/environment_2.tres b/levels/ghost_ship/environment_2.tres new file mode 100644 index 0000000..28494f3 --- /dev/null +++ b/levels/ghost_ship/environment_2.tres @@ -0,0 +1,33 @@ +[gd_resource type="Environment" load_steps=3 format=3 uid="uid://cwgih2p57fsen"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_aj2m7"] + +[sub_resource type="Sky" id="Sky_6fwow"] +sky_material = SubResource("ProceduralSkyMaterial_aj2m7") + +[resource] +background_mode = 1 +sky = SubResource("Sky_6fwow") +ambient_light_source = 2 +ambient_light_color = Color(0.427493, 0.427493, 0.427493, 1) +ambient_light_energy = 0.4 +tonemap_mode = 4 +tonemap_white = 8.0 +ssao_enabled = true +ssao_intensity = 2.5 +sdfgi_use_occlusion = true +glow_enabled = true +glow_strength = 0.7 +glow_blend_mode = 0 +fog_light_color = Color(0, 0, 0, 1) +fog_density = 0.2 +fog_depth_begin = 0.0 +volumetric_fog_enabled = true +volumetric_fog_density = 0.1618 +volumetric_fog_albedo = Color(0, 0.0313726, 0.101961, 1) +volumetric_fog_emission = Color(0.2244, 0.262933, 0.34, 1) +volumetric_fog_emission_energy = 0.3 +volumetric_fog_sky_affect = 0.5 +adjustment_enabled = true +adjustment_contrast = 1.2 +adjustment_saturation = 1.3 diff --git a/levels/ghost_ship/environment_3.tres b/levels/ghost_ship/environment_3.tres new file mode 100644 index 0000000..4243005 --- /dev/null +++ b/levels/ghost_ship/environment_3.tres @@ -0,0 +1,33 @@ +[gd_resource type="Environment" load_steps=3 format=3 uid="uid://bkvij3ljl5ox3"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_hhk8i"] + +[sub_resource type="Sky" id="Sky_7hdi4"] +sky_material = SubResource("ProceduralSkyMaterial_hhk8i") + +[resource] +background_mode = 1 +sky = SubResource("Sky_7hdi4") +ambient_light_source = 2 +ambient_light_color = Color(0.427493, 0.427493, 0.427493, 1) +tonemap_mode = 4 +tonemap_white = 8.0 +ssao_enabled = true +ssao_intensity = 2.5 +sdfgi_enabled = true +sdfgi_use_occlusion = true +glow_enabled = true +glow_strength = 0.7 +glow_blend_mode = 0 +fog_light_color = Color(0, 0, 0, 1) +fog_density = 0.2 +fog_depth_begin = 0.0 +volumetric_fog_enabled = true +volumetric_fog_density = 0.1 +volumetric_fog_albedo = Color(0.101961, 0.0666667, 0, 1) +volumetric_fog_emission = Color(0.101961, 0.0156863, 0, 1) +volumetric_fog_emission_energy = 0.3 +volumetric_fog_sky_affect = 0.1 +adjustment_enabled = true +adjustment_contrast = 1.1 +adjustment_saturation = 1.3 diff --git a/levels/ghost_ship/ghost_ship.tscn b/levels/ghost_ship/ghost_ship.tscn index 6edd80e..5327f78 100644 --- a/levels/ghost_ship/ghost_ship.tscn +++ b/levels/ghost_ship/ghost_ship.tscn @@ -1,31 +1,13 @@ -[gd_scene load_steps=6 format=3 uid="uid://bov4ok76woyc"] +[gd_scene load_steps=4 format=3 uid="uid://bov4ok76woyc"] [ext_resource type="PackedScene" uid="uid://crydi5cjgfwe5" path="res://levels/ghost_ship/ghost_ship_level.tscn" id="1_aj2m7"] +[ext_resource type="Environment" uid="uid://bkvij3ljl5ox3" path="res://levels/ghost_ship/environment_3.tres" id="1_wwgrl"] [ext_resource type="PackedScene" uid="uid://bwe2jdmvinhqd" path="res://src/player/player.tscn" id="2_0ef5p"] -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_aj2m7"] - -[sub_resource type="Sky" id="Sky_6fwow"] -sky_material = SubResource("ProceduralSkyMaterial_aj2m7") - -[sub_resource type="Environment" id="Environment_0ef5p"] -background_mode = 1 -sky = SubResource("Sky_6fwow") -ambient_light_source = 2 -ambient_light_color = Color(1, 1, 1, 1) -ambient_light_energy = 0.06 -tonemap_mode = 3 -glow_enabled = true -glow_bloom = 0.1 -fog_enabled = true -fog_light_color = Color(0, 0, 0, 1) -fog_density = 0.2 -fog_depth_begin = 0.0 - [node name="GhostShip" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_0ef5p") +environment = ExtResource("1_wwgrl") [node name="GhostShipLevel" parent="." instance=ExtResource("1_aj2m7")] @@ -41,32 +23,34 @@ omni_range = 10.0 [node name="OmniLight3D3" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0.1, -10.6) -light_energy = 8.0 +light_energy = 1.6 omni_range = 10.0 [node name="OmniLight3D4" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0.1, -10.6) -light_energy = 8.0 +light_energy = 1.6 omni_range = 10.0 [node name="OmniLight3D5" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0.1, -28.6) -light_energy = 8.0 +light_energy = 1.6 omni_range = 10.0 [node name="OmniLight3D6" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0.1, -31.6) -light_energy = 8.0 +light_energy = 1.6 omni_range = 10.0 [node name="OmniLight3D7" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24, 0.1, -31.6) -light_energy = 8.0 +visible = false +light_energy = 1.6 omni_range = 10.0 [node name="OmniLight3D8" type="OmniLight3D" parent="GhostShipLevel"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24, 0.1, -28.6) -light_energy = 8.0 +visible = false +light_energy = 1.6 omni_range = 10.0 [node name="Player" parent="." instance=ExtResource("2_0ef5p")] diff --git a/src/equipment/laser_cast/laser_cast.tscn b/src/equipment/laser_cast/laser_cast.tscn index 769f3b9..ad3858a 100644 --- a/src/equipment/laser_cast/laser_cast.tscn +++ b/src/equipment/laser_cast/laser_cast.tscn @@ -20,4 +20,6 @@ light_energy = 0.3 light_cull_mask = 4294967293 shadow_enabled = true shadow_caster_mask = 4294967293 +omni_range = 1.0 +omni_attenuation = 0.7 script = ExtResource("3_bkg64") diff --git a/src/player/player.tscn b/src/player/player.tscn index 21a2331..973047c 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -44,6 +44,14 @@ unique_name_in_owner = true target_position = Vector3(0, 0, -1.5) collision_mask = 2 +[node name="OmniLight3D" type="OmniLight3D" parent="CameraPivot/Camera3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.1) +light_energy = 0.3 +light_specular = 0.01 +light_cull_mask = 4294967293 +omni_range = 60.0 +omni_attenuation = 0.6 + [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0) shape = SubResource("CapsuleShape3D_s7f0r")