room lighting updates

This commit is contained in:
betalars 2023-07-08 22:06:34 +02:00
parent 2ae327339b
commit 1e7866b5f5
2 changed files with 20 additions and 22 deletions

View File

@ -1,10 +1,9 @@
[gd_scene load_steps=55 format=3 uid="uid://b3b0gyvklqn50"] [gd_scene load_steps=54 format=3 uid="uid://b3b0gyvklqn50"]
[ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [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"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"]
[ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] [ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"]
[ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_21x33"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_21x33"]
[ext_resource type="Texture2D" uid="uid://cs6gtn285a4al" path="res://dev-util/logo_background.png" id="3_1mw2j"]
[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_foj4y"] [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="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="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_xqd4w"]
@ -20,7 +19,7 @@
[ext_resource type="Texture2D" uid="uid://d005qvnbnishb" path="res://import/interface-elements/cursor_grab.png" id="13_lqj71"] [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="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="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://base-environments/youth_room/lava-lamp.tscn" id="21_0k2gr"] [ext_resource type="PackedScene" uid="uid://dwtxjvprjyx8p" path="res://base-environments/youth_room/lava-lamp.tscn" id="21_0k2gr"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_kcdrx"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_kcdrx"]
sky_top_color = Color(0, 0, 1, 1) sky_top_color = Color(0, 0, 1, 1)
@ -123,13 +122,6 @@ func switch_off():
tween.tween_property(self, \"litnes\", 0, 1) tween.tween_property(self, \"litnes\", 0, 1)
" "
[sub_resource type="GDScript" id="GDScript_xqa3d"]
script/source = "extends SpotLight3D
func _process(delta):
rotate(transform.basis.z, delta/10 )
"
[sub_resource type="Animation" id="Animation_hqls1"] [sub_resource type="Animation" id="Animation_hqls1"]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
@ -835,6 +827,20 @@ func reset(_discard):
[sub_resource type="BoxShape3D" id="BoxShape3D_gim5a"] [sub_resource type="BoxShape3D" id="BoxShape3D_gim5a"]
size = Vector3(1, 0.305693, 0.775269) size = Vector3(1, 0.305693, 0.775269)
[sub_resource type="GDScript" id="GDScript_yn0pl"]
script/source = "extends SpotLight3D
@export var flicker_strength:float = 0.7
@export var speed:float = 4
var noise = FastNoiseLite.new()
var light_spot:float = randf()
var base_energy = light_energy
func _process(delta):
light_spot += speed*delta
light_energy = base_energy * (1 + noise.get_noise_1d(light_spot) * flicker_strength)
"
[node name="youth room" type="Node3D"] [node name="youth room" type="Node3D"]
script = ExtResource("1_aitp0") script = ExtResource("1_aitp0")
@ -938,15 +944,6 @@ spot_attenuation = 0.732044
spot_angle = 27.6108 spot_angle = 27.6108
spot_angle_attenuation = 1.18921 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)
visible = false
light_energy = 15.0
light_projector = ExtResource("3_1mw2j")
shadow_enabled = true
spot_angle = 42.8718
script = SubResource("GDScript_xqa3d")
[node name="Blockout" type="CSGCombiner3D" parent="."] [node name="Blockout" type="CSGCombiner3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.811571, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.811571, 0, 0)
visible = false visible = false
@ -1276,17 +1273,17 @@ light_specular = 0.0
omni_range = 0.457129 omni_range = 0.457129
omni_attenuation = 0.659754 omni_attenuation = 0.659754
[node name="Lava-metal" parent="." instance=ExtResource("21_0k2gr")] [node name="lava-lamp2" parent="." instance=ExtResource("21_0k2gr")]
transform = Transform3D(0.488743, 0, -0.872428, 0, 1, 0, 0.872428, 0, 0.488743, 3.1041, 0.962981, 2.21157) transform = Transform3D(0.488743, 0, -0.872428, 0, 1, 0, 0.872428, 0, 0.488743, 3.1041, 0.962981, 2.21157)
skeleton = NodePath("") skeleton = NodePath("")
[node name="ReflectionProbe" type="ReflectionProbe" parent="Lava-metal"] [node name="ReflectionProbe" type="ReflectionProbe" parent="lava-lamp2"]
transform = Transform3D(0.866853, 0, -0.498563, 0, 1, 0, 0.498563, 0, 0.866853, -0.0356357, 0.0416123, 0.020328) transform = Transform3D(0.866853, 0, -0.498563, 0, 1, 0, 0.498563, 0, 0.866853, -0.0356357, 0.0416123, 0.020328)
max_distance = 7.0 max_distance = 7.0
size = Vector3(2, 2, 2) size = Vector3(2, 2, 2)
interior = true interior = true
[node name="OmniLight3D" type="SpotLight3D" parent="Lava-metal"] [node name="OmniLight3D" type="SpotLight3D" parent="lava-lamp2"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.0113046, 0.199004, -0.00212491) transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.0113046, 0.199004, -0.00212491)
light_color = Color(0.282353, 0.45098, 0.258824, 1) light_color = Color(0.282353, 0.45098, 0.258824, 1)
light_energy = 1.5 light_energy = 1.5
@ -1296,6 +1293,7 @@ spot_range = 1.5
spot_attenuation = 1.1487 spot_attenuation = 1.1487
spot_angle = 126.18 spot_angle = 126.18
spot_angle_attenuation = 0.68302 spot_angle_attenuation = 0.68302
script = SubResource("GDScript_yn0pl")
[connection signal="ui_entered" from="PlayerController" to="SceneUI" method="show"] [connection signal="ui_entered" from="PlayerController" to="SceneUI" method="show"]
[connection signal="ui_exited" from="PlayerController" to="SceneUI" method="hide"] [connection signal="ui_exited" from="PlayerController" to="SceneUI" method="hide"]