From 5f16a4e55596e2c856512b429fa065bc1e8a0006 Mon Sep 17 00:00:00 2001 From: betalars Date: Sat, 1 Jul 2023 19:12:48 +0200 Subject: [PATCH] updating room lighting, wip --- .../youth_room/youth_room.tscn | 46 +++++++++++++++++-- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 0c6614f..41d336c 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=55 format=3 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] @@ -8,6 +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="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"] @@ -19,6 +20,7 @@ [ext_resource type="Texture2D" uid="uid://d005qvnbnishb" path="res://import/interface-elements/cursor_grab.png" id="13_lqj71"] [ext_resource type="PackedScene" uid="uid://brk4hjdf2x81a" path="res://logic-scenes/card_picker/card_picker.tscn" id="19_a4n1o"] [ext_resource type="ArrayMesh" uid="uid://bfc3d4g40n0wy" path="res://logic-scenes/collectable/import/old-mask.res" id="19_jr2bb"] +[ext_resource type="PackedScene" uid="uid://bigr0lnen1xdh" path="res://dev-util/testing.tscn" id="20_k2657"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_kcdrx"] sky_top_color = Color(0, 0, 1, 1) @@ -836,6 +838,19 @@ size = Vector3(1, 0.305693, 0.775269) [node name="youth room" type="Node3D"] script = ExtResource("1_aitp0") +[node name="ReflectionProbe2" type="ReflectionProbe" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3601, 0.545583, 2.48498) +max_distance = 5.0 +size = Vector3(2, 2, 2) +interior = 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 +size = Vector3(1.22007, 1.24704, 2) +origin_offset = Vector3(0, -0.438, 0) +interior = true + [node name="picker" parent="." instance=ExtResource("19_a4n1o")] visible = false @@ -878,7 +893,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.127422, -0.00326544, -0.38 light_color = Color(0.952941, 0.662745, 0.54902, 1) light_energy = 0.5 light_size = 0.499 -light_specular = 0.1 +light_specular = 0.0 shadow_enabled = true shadow_blur = 0.5 omni_range = 5.48365 @@ -890,17 +905,20 @@ light_energy = 0.5 omni_range = 0.147682 [node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.59004, 3.42699, -0.247641) +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 shadow_blur = 1.277 -omni_range = 5.43334 +omni_range = 3.99198 omni_attenuation = 0.287175 +[node name="starlight-mesh" parent="." instance=ExtResource("6_adj52")] + [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) +visible = false light_energy = 15.0 light_projector = ExtResource("3_1mw2j") shadow_enabled = true @@ -1236,6 +1254,26 @@ light_specular = 0.0 omni_range = 0.457129 omni_attenuation = 0.659754 +[node name="Node3D" parent="." instance=ExtResource("20_k2657")] +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 +size = Vector3(2, 2, 2) +interior = true + +[node name="OmniLight3D" type="SpotLight3D" parent="Node3D"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.0113046, 0.00242448, -0.00212491) +light_color = Color(0.282353, 0.45098, 0.258824, 1) +light_energy = 1.5 +light_size = 0.2 +light_specular = 0.1 +spot_range = 1.5 +spot_attenuation = 1.1487 +spot_angle = 126.18 +spot_angle_attenuation = 0.68302 + [connection signal="ui_entered" from="PlayerController" to="SceneUI" method="show"] [connection signal="ui_exited" from="PlayerController" to="SceneUI" method="hide"] [connection signal="animation_finished" from="AudioPlayer" to="PlayerController" method="_on_childhood_done"]