From 7b94c75bb4a77677dfe04aac0d768f24856b2cef Mon Sep 17 00:00:00 2001 From: Sara Date: Sun, 17 May 2026 14:36:46 +0200 Subject: [PATCH] chore: attempt at clarifying intended path through station --- project/assets/materials/concrete_albedo.png | 4 +- project/assets/materials/concrete_normal.png | 4 +- project/assets/materials/concrete_orm.png | 4 +- project/levels/station.tscn | 45 +++++++++++++++++--- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/project/assets/materials/concrete_albedo.png b/project/assets/materials/concrete_albedo.png index b055dfb3..3813b089 100644 --- a/project/assets/materials/concrete_albedo.png +++ b/project/assets/materials/concrete_albedo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c7750dbb5005e3e923b4c976ad9d5781ac2ef36ff88255a34c1032bd013471d -size 904366 +oid sha256:1e3a09f3a569116aba242e686a0af0efa64b75499befd0fa8634711a379571bb +size 85155 diff --git a/project/assets/materials/concrete_normal.png b/project/assets/materials/concrete_normal.png index 5e86cbf7..e8fb8fbd 100644 --- a/project/assets/materials/concrete_normal.png +++ b/project/assets/materials/concrete_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15a603c045077f42308faa05bbffd5a259e86f8358d1c9434438ee718d6bae68 -size 4346350 +oid sha256:deed7d5f53b0c3f2e4e1b04122031f4d912f0aa5c0275f8316671eba216d2834 +size 213905 diff --git a/project/assets/materials/concrete_orm.png b/project/assets/materials/concrete_orm.png index e323585f..904b9f61 100644 --- a/project/assets/materials/concrete_orm.png +++ b/project/assets/materials/concrete_orm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c1e5e4b5e1f5b27996270de3b078ebf4760e7d4538ef90df9e3b7c65d6a4edc -size 1119276 +oid sha256:5d56ed2f84e8232f5e5ed1f0ef27890a44d6c0df93b2654dad4ef3dfe317dd91 +size 315440 diff --git a/project/levels/station.tscn b/project/levels/station.tscn index 1237f5d6..415747e0 100644 --- a/project/levels/station.tscn +++ b/project/levels/station.tscn @@ -4,6 +4,7 @@ [ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_mo284"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="3_mo284"] [ext_resource type="PackedScene" uid="uid://ckyx3uv0ttjbl" path="res://assets/environment/walls/metro_back.blend" id="4_ue8rc"] +[ext_resource type="PackedScene" uid="uid://b6vnp6u3i5u47" path="res://objects/effects/kaleidoscope_omni_projector.tscn" id="5_s6lbc"] [sub_resource type="Gradient" id="Gradient_ue8rc"] colors = PackedColorArray(0.0224, 0.03970667, 0.04, 1, 1, 0.912, 0.89, 1) @@ -12,12 +13,12 @@ colors = PackedColorArray(0.0224, 0.03970667, 0.04, 1, 1, 0.912, 0.89, 1) gradient = SubResource("Gradient_ue8rc") [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mo284"] -sky_top_color = Color(0.50243366, 0.63148725, 0.86914206, 1) -sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) -sky_curve = 6.9814385e-05 -ground_bottom_color = Color(0.1554, 0.17723998, 0.21, 1) -ground_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) -ground_curve = 1e-05 +sky_top_color = Color(0.0932704, 0.113856174, 0.18609053, 1) +sky_horizon_color = Color(0, 0, 0, 1) +sky_curve = 0.0022626824 +ground_bottom_color = Color(0.106522344, 0.12159938, 0.1487411, 1) +ground_horizon_color = Color(0, 0, 0, 1) +ground_curve = 0.08415828 [sub_resource type="Sky" id="Sky_ue8rc"] sky_material = SubResource("ProceduralSkyMaterial_mo284") @@ -213,7 +214,7 @@ size = Vector3(0.91259766, 4.9582176, 1.0712891) material = ExtResource("2_mo284") [node name="PlatformBalconyRailing" type="CSGBox3D" parent="CSGCombiner3D" unique_id=520844932] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.046093, 2.4282284, -18.719105) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.044086, 2.4282284, -18.716358) size = Vector3(5.845459, 4.9231176, 0.7626343) material = ExtResource("2_mo284") @@ -343,3 +344,33 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.95 [node name="metro_back9" parent="." unique_id=794696718 instance=ExtResource("4_ue8rc")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -26.042463) + +[node name="OmniLight3D" parent="." unique_id=388804586 instance=ExtResource("5_s6lbc")] +transform = Transform3D(-0.45079836, 0.81186604, 0.37101814, -0.5955859, 0.03602414, -0.8024835, -0.6648747, -0.58273137, 0.46729633, -2.6842768, 1.9526056, -15.171796) +light_energy = 2.086 +omni_range = 2.641 + +[node name="OmniLight3D2" parent="." unique_id=779918029 instance=ExtResource("5_s6lbc")] +transform = Transform3D(0.7092167, -0.47455093, -0.521357, 0.70499057, 0.4773957, 0.5244823, 0, -0.73952335, 0.6731309, -2.6499035, 4.9902787, -17.749857) +light_energy = 2.086 +omni_range = 2.641 + +[node name="OmniLight3D3" parent="." unique_id=118388089 instance=ExtResource("5_s6lbc")] +transform = Transform3D(0.8244043, 0.06913145, 0.56176364, -0.56600136, 0.10069281, 0.81823194, 0, -0.99251294, 0.12214008, -1.966706, 6.301402, -35.983635) +light_energy = 2.086 +omni_range = 2.641 + +[node name="OmniLight3D4" parent="." unique_id=1629760581 instance=ExtResource("5_s6lbc")] +transform = Transform3D(0.8244043, 0.06913145, 0.56176364, -0.56600136, 0.10069281, 0.81823194, 0, -0.99251294, 0.12214007, 15.127914, 8.425544, -23.167887) +light_energy = 2.086 +omni_range = 2.641 + +[node name="OmniLight3D5" parent="." unique_id=1528397531 instance=ExtResource("5_s6lbc")] +transform = Transform3D(0.8244043, 0.06913145, 0.56176364, -0.56600136, 0.10069281, 0.81823194, 0, -0.99251294, 0.12214007, 15.839307, 10.652011, -21.219952) +light_energy = 2.086 +omni_range = 2.641 + +[node name="OmniLight3D6" parent="." unique_id=264628514 instance=ExtResource("5_s6lbc")] +transform = Transform3D(0.80324996, 0.56932276, -0.1751034, 0.42614233, -0.34388492, 0.8367472, 0.41616386, -0.7467361, -0.51883805, -2.2273438, 8.263727, -33.896797) +light_energy = 2.086 +omni_range = 2.641