From 9064b84e65ebf377f4bd8d2b8b0d457ab21531dc Mon Sep 17 00:00:00 2001 From: betalars Date: Wed, 5 Jul 2023 23:18:18 +0200 Subject: [PATCH] room lighting overhaul --- .../youth_room/youth_room.tscn | 40 ++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 41d336c..8e9ae1f 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_foj4y"] [ext_resource type="AudioStream" uid="uid://bbpo1hu35yer8" path="res://base-environments/youth_room/import/sounds/thunder.mp3" id="3_wcypa"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_xqd4w"] -[ext_resource type="PackedScene" uid="uid://yt8bbsc1n4el" path="res://base-environments/youth_room/import/starlight-mesh.glb" id="6_adj52"] +[ext_resource type="ArrayMesh" uid="uid://wuxbl6u3s8yo" path="res://base-environments/youth_room/shaders/starlight-mesh.res" id="6_gy6jv"] [ext_resource type="AudioStream" uid="uid://cudna8k7fw06t" path="res://base-environments/youth_room/audio/Moving Loop.wav" id="8_egnow"] [ext_resource type="AudioStream" uid="uid://bwh60165c3saj" path="res://base-environments/youth_room/audio/lisa_youth_voice.ogg" id="9_dqdgk"] [ext_resource type="AudioStream" uid="uid://cl74a68tjwinh" path="res://base-environments/youth_room/audio/Youth Loop.wav" id="9_i8mqk"] @@ -844,6 +844,13 @@ max_distance = 5.0 size = Vector3(2, 2, 2) interior = true +[node name="ReflectionProbe4" type="ReflectionProbe" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.587879, 1.13451, -0.159134) +max_distance = 5.0 +size = Vector3(3.31181, 2.47509, 3.8628) +box_projection = true +enable_shadows = true + [node name="ReflectionProbe3" type="ReflectionProbe" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539355, 1.28256, 1.24151) max_distance = 5.0 @@ -878,6 +885,7 @@ script = SubResource("GDScript_wb8kg") [node name="desk_light" type="SpotLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.30009, 0.953911, 0, -0.953911, 0.30009, -0.599038, 1.39757, 1.64821) +layers = 2 light_color = Color(0.94902, 0.737255, 0.627451, 1) light_energy = 8.0 light_size = 0.1 @@ -889,32 +897,46 @@ spot_angle_attenuation = 0.812252 script = SubResource("GDScript_35dmj") [node name="OmniLight3D" type="OmniLight3D" parent="desk_light"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.127422, -0.00326544, -0.389614) +transform = Transform3D(1, 0, 0, 0, 1, -2.98023e-08, 0, 2.98023e-08, 1, 0.160493, 0.104551, -0.292101) light_color = Color(0.952941, 0.662745, 0.54902, 1) light_energy = 0.5 light_size = 0.499 light_specular = 0.0 shadow_enabled = true shadow_blur = 0.5 -omni_range = 5.48365 -omni_attenuation = 0.90125 +omni_range = 4.0 +omni_attenuation = 1.51572 [node name="OmniLight3D2" type="OmniLight3D" parent="desk_light"] light_color = Color(0.94902, 0.737255, 0.627451, 1) light_energy = 0.5 omni_range = 0.147682 -[node name="OmniLight3D" type="OmniLight3D" parent="."] +[node name="starlight_mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) +layers = 2 +mesh = ExtResource("6_gy6jv") + +[node name="OmniLight3D" type="OmniLight3D" parent="starlight_mesh"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.644969, 2.60833, -0.247641) light_color = Color(0.0313726, 0, 1, 1) light_energy = 0.2 light_volumetric_fog_energy = 0.0 light_specular = 0.0 +light_cull_mask = 4294967293 shadow_blur = 1.277 omni_range = 3.99198 omni_attenuation = 0.287175 -[node name="starlight-mesh" parent="." instance=ExtResource("6_adj52")] +[node name="SpotLight3D" type="SpotLight3D" parent="starlight_mesh/OmniLight3D"] +transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.047661, -0.717185, 0.461917, 0.734845, 0.496624, 1.11932, -2.35411, 1.18807) +light_color = Color(0, 1, 1, 1) +light_energy = 2.0 +light_cull_mask = 4293918722 +spot_range = 3.85757 +spot_attenuation = 0.732044 +spot_angle = 27.6108 +spot_angle_attenuation = 1.18921 [node name="SpotLight3D2" type="SpotLight3D" parent="."] transform = Transform3D(0.48804, 0.744707, 0.455224, -0.0721277, 0.554181, -0.829266, -0.869836, 0.371881, 0.324176, 1.66111, 0.0754915, 0.437063) @@ -1009,7 +1031,7 @@ transform = Transform3D(0.629683, 0.289502, 0, -0.297919, 0.611894, 0, 0, 0, 1.8 size = Vector3(0.180483, 1.62661, 0.160638) [node name="OmniLight3D2" type="OmniLight3D" parent="."] -transform = Transform3D(-0.477862, -0.663484, 0.575705, -0.860239, 0.220753, -0.459626, 0.177866, -0.714882, -0.676245, 3.15688, 0.480778, 0.0648447) +transform = Transform3D(-0.477862, -0.663484, 0.575705, -0.860239, 0.220753, -0.459627, 0.177866, -0.714882, -0.676245, 3.15688, 0.480778, 0.0648447) light_size = 0.1 shadow_enabled = true omni_range = 2.17653 @@ -1258,8 +1280,8 @@ omni_attenuation = 0.659754 transform = Transform3D(0.488743, 0, -0.872428, 0, 1, 0, 0.872428, 0, 0.488743, 3.1041, 1.15956, 2.21157) [node name="ReflectionProbe" type="ReflectionProbe" parent="Node3D"] -transform = Transform3D(0.866853, 0, -0.498563, 0, 1, 0, 0.498563, 0, 0.866853, 0.017488, -0.175361, -0.000113606) -max_distance = 5.0 +transform = Transform3D(0.866853, 0, -0.498563, 0, 1, 0, 0.498563, 0, 0.866853, -0.0356357, -0.154967, 0.020328) +max_distance = 7.0 size = Vector3(2, 2, 2) interior = true