From a66f4c95cc782450da9fb7ee4c1410893953099c Mon Sep 17 00:00:00 2001 From: Brazly Date: Sun, 1 Feb 2026 01:43:11 +0000 Subject: [PATCH] tweaked lighting changes --- Scenes/Levels/office.tscn | 86 +++++++++---------- .../Interior/security_office_model.tscn | 4 +- project.godot | 6 +- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/Scenes/Levels/office.tscn b/Scenes/Levels/office.tscn index 6d3bc8c..0149edd 100644 --- a/Scenes/Levels/office.tscn +++ b/Scenes/Levels/office.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://cqtabc6coc58l"] +[gd_scene format=3 uid="uid://cqtabc6coc58l"] [ext_resource type="Script" uid="uid://dmtpstry0o0a3" path="res://Assets/Scripts/Player Controls/player_movement.gd" id="1_48dl1"] [ext_resource type="PackedScene" uid="uid://cbpsnsta7u3wl" path="res://Scenes/Special_Effects/PSX_style.tscn" id="2_gba58"] @@ -14,7 +14,6 @@ background_mode = 1 background_color = Color(0.680932, 0.369129, 0.248985, 1) background_energy_multiplier = 0.04 -ssr_enabled = true ssao_enabled = true ssao_radius = 6.6 ssao_intensity = 5.34 @@ -33,7 +32,6 @@ fog_sun_scatter = 1.95 fog_density = 0.015 fog_height = -22.02 fog_height_density = 0.0195 -volumetric_fog_enabled = true volumetric_fog_density = 0.1974 volumetric_fog_emission_energy = 13.8 adjustment_enabled = true @@ -58,13 +56,13 @@ emission_shape = 3 emission_box_extents = Vector3(1.49, 1.73, 2.42) initial_velocity_min = 1.0 initial_velocity_max = 2.0 -angular_velocity_min = 30.0 -angular_velocity_max = 60.0 +angular_velocity_min = 49.99998 +angular_velocity_max = 49.99998 gravity = Vector3(0, 0, 0) scale_curve = SubResource("CurveTexture_nmbs0") color_ramp = SubResource("GradientTexture1D_cx0fw") turbulence_enabled = true -turbulence_noise_scale = 1.85 +turbulence_noise_scale = 0.375 collision_mode = 1 collision_friction = 1.0 collision_bounce = 0.0 @@ -98,25 +96,25 @@ font_color = Color(0, 0, 0, 1) [sub_resource type="Theme" id="Theme_nmbs0"] default_font_size = 42 -[node name="Node3D" type="Node3D"] +[node name="Node3D" type="Node3D" unique_id=1638198756] -[node name="PlayerController" type="Node3D" parent="."] +[node name="PlayerController" type="Node3D" parent="." unique_id=1986808415] process_mode = 1 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.370835, 0, 0) script = ExtResource("1_48dl1") psxScene = ExtResource("2_gba58") -[node name="Camera3D" type="Camera3D" parent="PlayerController" node_paths=PackedStringArray("terminal")] +[node name="Camera3D" type="Camera3D" parent="PlayerController" unique_id=160035236 node_paths=PackedStringArray("terminal")] transform = Transform3D(0.0188834, 0, -0.999822, 0, 1, 0, 0.999822, 0, 0.0188834, -0.0640411, 1.42725, 1.30117) fov = 45.2 near = 0.001 script = ExtResource("2_vwrhx") terminal = NodePath("../../Interactables/PC/Sprite3D/SubViewport") -[node name="CanvasLayer" type="CanvasLayer" parent="PlayerController/Camera3D"] +[node name="CanvasLayer" type="CanvasLayer" parent="PlayerController/Camera3D" unique_id=672407600] layer = 2 -[node name="Control" type="Control" parent="PlayerController/Camera3D/CanvasLayer"] +[node name="Control" type="Control" parent="PlayerController/Camera3D/CanvasLayer" unique_id=462631869] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -126,7 +124,7 @@ grow_vertical = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -[node name="CrosshairCenter" type="CenterContainer" parent="PlayerController/Camera3D/CanvasLayer/Control"] +[node name="CrosshairCenter" type="CenterContainer" parent="PlayerController/Camera3D/CanvasLayer/Control" unique_id=1304360326] unique_name_in_owner = true layout_mode = 1 anchors_preset = 8 @@ -142,40 +140,40 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("3_vwrhx") -[node name="PauseMenu" type="CanvasLayer" parent="."] +[node name="PauseMenu" type="CanvasLayer" parent="." unique_id=1877883325] -[node name="CanvasLayer" type="CanvasLayer" parent="PauseMenu"] +[node name="CanvasLayer" type="CanvasLayer" parent="PauseMenu" unique_id=1881425996] layer = 5 -[node name="PauseMenu" parent="PauseMenu/CanvasLayer" instance=ExtResource("3_cx0fw")] +[node name="PauseMenu" parent="PauseMenu/CanvasLayer" unique_id=854219268 instance=ExtResource("3_cx0fw")] process_mode = 3 z_index = 5 -[node name="security office_UwU" parent="." instance=ExtResource("4_vwrhx")] +[node name="security office_UwU" parent="." unique_id=1463044162 instance=ExtResource("4_vwrhx")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -6.54) -[node name="Lighting" type="Node3D" parent="."] +[node name="Lighting" type="Node3D" parent="." unique_id=1400238474] -[node name="OmniLight3D" type="OmniLight3D" parent="Lighting"] +[node name="OmniLight3D" type="OmniLight3D" parent="Lighting" unique_id=1346598309] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.894977, 0.0786453, 0.971773) light_color = Color(0.558852, 0.138576, 0.131343, 1) light_energy = 0.048 -[node name="OmniLight3D2" type="OmniLight3D" parent="Lighting"] +[node name="OmniLight3D2" type="OmniLight3D" parent="Lighting" unique_id=1151573255] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.982613, 0.0786453, 1.15155) light_color = Color(0.558852, 0.138576, 0.131343, 1) light_energy = 0.048 -[node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] +[node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting" unique_id=720032518] environment = SubResource("Environment_cumm5") -[node name="SpotLight3D" type="SpotLight3D" parent="Lighting"] -transform = Transform3D(0.313684, -0.884661, -0.344931, -0.446955, -0.458073, 0.768376, -0.837755, -0.0868584, -0.539093, 0.388222, 1.32097, 0.177619) +[node name="SpotLight3D" type="SpotLight3D" parent="Lighting" unique_id=140986413] +transform = Transform3D(0.31368402, -0.8846609, -0.34493113, -0.44695503, -0.4580729, 0.7683752, -0.8377551, -0.08685833, -0.5390938, 0.388222, 1.2932032, 0.21602583) light_color = Color(1, 0.733333, 0.690196, 1) light_energy = 0.543 shadow_enabled = true -[node name="OmniLight3D3" type="OmniLight3D" parent="Lighting"] +[node name="OmniLight3D3" type="OmniLight3D" parent="Lighting" unique_id=942914936] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.520964, 3.19324, 0.238268) light_color = Color(0.101961, 0.054902, 0.0431373, 1) light_energy = 2.111 @@ -183,62 +181,62 @@ light_indirect_energy = 3.59 shadow_enabled = true script = ExtResource("5_nmbs0") -[node name="Timer" type="Timer" parent="Lighting/OmniLight3D3"] +[node name="Timer" type="Timer" parent="Lighting/OmniLight3D3" unique_id=1125547548] wait_time = 0.5 autostart = true -[node name="VFX" type="Node3D" parent="Lighting"] +[node name="VFX" type="Node3D" parent="Lighting" unique_id=2114940519] -[node name="GPUParticles3D" type="GPUParticles3D" parent="Lighting/VFX"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.72499, 0.354899) +[node name="GPUParticles3D" type="GPUParticles3D" parent="Lighting/VFX" unique_id=538377545] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.1867385, 1.4605813, 0.354899) amount = 800 lifetime = 20.0 randomness = 1.0 +visibility_aabb = AABB(-0.105, -0.43, -0.4, 0.56, 0.32, 0.935) process_material = SubResource("ParticleProcessMaterial_cx0fw") draw_pass_1 = SubResource("QuadMesh_nmbs0") -[node name="GPUParticlesCollisionHeightField3D" type="GPUParticlesCollisionHeightField3D" parent="Lighting/VFX"] +[node name="GPUParticlesCollisionHeightField3D" type="GPUParticlesCollisionHeightField3D" parent="Lighting/VFX" unique_id=1642546253] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0385742, -0.168518, 0.386719) size = Vector3(2.96582, 0.391724, 4.91016) -[node name="GPUParticlesCollisionHeightField3D2" type="GPUParticlesCollisionHeightField3D" parent="Lighting/VFX"] +[node name="GPUParticlesCollisionHeightField3D2" type="GPUParticlesCollisionHeightField3D" parent="Lighting/VFX" unique_id=1170671609] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.794207, 0.898239, 1.10249) size = Vector3(1.29651, 0.0705109, 2.49951) -[node name="GPUParticlesAttractorSphere3D" type="GPUParticlesAttractorSphere3D" parent="Lighting/VFX"] +[node name="GPUParticlesAttractorSphere3D" type="GPUParticlesAttractorSphere3D" parent="Lighting/VFX" unique_id=77874923] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.447443, 1.25731, 0.393826) -strength = 3.0 radius = 0.409208 -[node name="GPUParticlesAttractorSphere3D2" type="GPUParticlesAttractorSphere3D" parent="Lighting/VFX"] +[node name="GPUParticlesAttractorSphere3D2" type="GPUParticlesAttractorSphere3D" parent="Lighting/VFX" unique_id=1702502091] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.569778, 3.12136, 0.370614) strength = 3.0 radius = 1.01 -[node name="Interactables" type="Node3D" parent="."] +[node name="Interactables" type="Node3D" parent="." unique_id=1770190637] -[node name="PC" type="StaticBody3D" parent="Interactables"] +[node name="PC" type="StaticBody3D" parent="Interactables" unique_id=1312421362] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.521656, 1.06554, 1.25256) physics_material_override = SubResource("PhysicsMaterial_vwrhx") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Interactables/PC"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="Interactables/PC" unique_id=1917188444] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0478516, 0.229821, 0.0582275) shape = SubResource("BoxShape3D_nmbs0") -[node name="Sprite3D" type="Sprite3D" parent="Interactables/PC"] +[node name="Sprite3D" type="Sprite3D" parent="Interactables/PC" unique_id=1343884150] transform = Transform3D(0.024902493, 0.0022058422, 0, -0.0022058422, 0.024902493, 0, 0, 0, 0.024999999, 0.053893626, 0.32362998, 0.038876176) layers = 2 flip_h = true axis = 0 texture = SubResource("ViewportTexture_vwrhx") -[node name="SubViewport" type="SubViewport" parent="Interactables/PC/Sprite3D" node_paths=PackedStringArray("terminalLine")] +[node name="SubViewport" type="SubViewport" parent="Interactables/PC/Sprite3D" unique_id=969845837 node_paths=PackedStringArray("terminalLine")] transparent_bg = true size = Vector2i(1830, 1400) script = ExtResource("10_gba58") terminalLine = NodePath("MarginContainer/ScrollContainer/VBoxContainer/Label") -[node name="caret-ruler" type="Label" parent="Interactables/PC/Sprite3D/SubViewport"] +[node name="caret-ruler" type="Label" parent="Interactables/PC/Sprite3D/SubViewport" unique_id=1978172905] clip_contents = true custom_minimum_size = Vector2(1800, 0) offset_right = 1800.0 @@ -247,23 +245,23 @@ text = "a0ifjaojkfna" label_settings = SubResource("LabelSettings_nmbs0") autowrap_mode = 3 -[node name="MarginContainer" type="MarginContainer" parent="Interactables/PC/Sprite3D/SubViewport"] +[node name="MarginContainer" type="MarginContainer" parent="Interactables/PC/Sprite3D/SubViewport" unique_id=1395914383] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="ScrollContainer" type="ScrollContainer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer"] +[node name="ScrollContainer" type="ScrollContainer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer" unique_id=1077906655] layout_mode = 2 scroll_horizontal_custom_step = 0.001 scroll_vertical_custom_step = 0.001 -[node name="VBoxContainer" type="VBoxContainer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer" unique_id=1160436627] custom_minimum_size = Vector2(1800, 0) layout_mode = 2 -[node name="Label" type="RichTextLabel" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer"] +[node name="Label" type="RichTextLabel" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer" unique_id=1332732238] clip_contents = false layout_mode = 2 size_flags_vertical = 0 @@ -272,13 +270,13 @@ bbcode_enabled = true text = "afafafafafafa" fit_content = true -[node name="Caret" type="ColorRect" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer/Label"] +[node name="Caret" type="ColorRect" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer/Label" unique_id=568444873] layout_mode = 0 offset_top = -62.0 offset_right = 24.0 offset_bottom = -20.0 -[node name="CaretTimer" type="Timer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer/Label"] +[node name="CaretTimer" type="Timer" parent="Interactables/PC/Sprite3D/SubViewport/MarginContainer/ScrollContainer/VBoxContainer/Label" unique_id=1438556533] wait_time = 0.5 autostart = true diff --git a/Scenes/Models/Interior/security_office_model.tscn b/Scenes/Models/Interior/security_office_model.tscn index 0fdc4cb..025f9e3 100644 --- a/Scenes/Models/Interior/security_office_model.tscn +++ b/Scenes/Models/Interior/security_office_model.tscn @@ -1,5 +1,5 @@ -[gd_scene load_steps=2 format=3 uid="uid://cmyf6lhbn1x6p"] +[gd_scene format=3 uid="uid://cmyf6lhbn1x6p"] [ext_resource type="PackedScene" uid="uid://b56h0sioa3yax" path="res://Assets/Model/Interior/Security_Office/security office.UwU.glb" id="1_o43w0"] -[node name="security office_UwU" instance=ExtResource("1_o43w0")] +[node name="security office_UwU" unique_id=696635579 instance=ExtResource("1_o43w0")] diff --git a/project.godot b/project.godot index 455d1db..8ad29c7 100644 --- a/project.godot +++ b/project.godot @@ -8,11 +8,15 @@ config_version=5 +[animation] + +compatibility/default_parent_skeleton_in_mesh_instance_3d=true + [application] config/name="FNaF Game Show Project" run/main_scene="uid://dq5ojxx2ytfwv" -config/features=PackedStringArray("4.5", "Forward Plus") +config/features=PackedStringArray("4.6", "Forward Plus") run/max_fps=60 config/icon="res://icon.svg"